AI: address review on PR #462

backend/app/controllers/posts_controller.rb

@@ -37,7 +37,7 @@ class PostsController < ApplicationController
 
     offset = (page - 1) * limit
 
-    needs_history_join = order[0] == 'updated_at' || updated_between.any?(&:present?)
+    history_join_required = order[0] == 'updated_at' || updated_between.any?(&:present?)
 
     q =
         filtered_posts(locale)
@@ -57,8 +57,8 @@ class PostsController < ApplicationController
     q = q.where('posts.created_at >= ?', created_between[0]) if created_between[0]
     q = q.where('posts.created_at <= ?', created_between[1]) if created_between[1]
     count_scope = q
-    if needs_history_join
-      history_times = HistoryAccess.visible(PostVersion.all)
+    if history_join_required
+      history_times = PostVersion.all
           .select('post_id, MAX(created_at) AS latest_at').group(:post_id)
       q = q.joins("LEFT JOIN (#{ history_times.to_sql }) history_times " +
                   'ON history_times.post_id = posts.id')
@@ -72,7 +72,7 @@ class PostsController < ApplicationController
       q = q.where("#{ updated_at_all_sql } <= ?", updated_between[1])
     end
     count_scope = q if updated_between.any?(&:present?)
-    if needs_history_join
+    if history_join_required
       q = q.select('posts.*', "#{ updated_at_all_sql } AS updated_at")
     end
 
@@ -92,10 +92,10 @@ class PostsController < ApplicationController
              .offset(offset)
              .to_a
     latest_version_times =
-        if needs_history_join
+        if history_join_required
           { }
         else
-          HistoryAccess.visible(PostVersion.where(post_id: posts.map(&:id)))
+          PostVersion.where(post_id: posts.map(&:id))
               .group(:post_id).maximum(:created_at)
         end
 

backend/app/controllers/tag_descriptions_controller.rb

@@ -49,7 +49,6 @@ class TagDescriptionsController < ApplicationController
   private
 
   def representation description
-    HistoryAccess.require_current!(description, TagDescriptionVersion)
     description.as_json(only: [
         :tag_id,
         :language_code,

backend/app/controllers/tag_groups_controller.rb

@@ -1,7 +1,7 @@
 class TagGroupsController < ApplicationController
   def index
     locale = resolve_locale!
-    groups = HistoryAccess.current(TagGroup.all, TagGroupVersion).includes(:created_by_user, :updated_by_user).order(:id)
+    groups = TagGroup.includes(:created_by_user, :updated_by_user).order(:id)
     render json: TagGroupRepr.many(locale, groups.to_a)
   end
 

backend/app/controllers/wiki_pages_controller.rb

@@ -8,12 +8,11 @@ class WikiPagesController < ApplicationController
 
     title = params[:title].to_s.strip
     descriptions =
-        HistoryAccess.current(TagDescription.all, TagDescriptionVersion)
-        .where(language_code: locale.language_code)
+        TagDescription.where(language_code: locale.language_code)
         .includes(tag: :tag_names)
 
     descriptions = descriptions.order(updated_at: :desc, id: :asc)
-    tag_groups = HistoryAccess.current(TagGroup.all, TagGroupVersion).order(updated_at: :desc, id: :asc)
+    tag_groups = TagGroup.order(updated_at: :desc, id: :asc)
     if title.present?
       pattern = "%#{ ApplicationRecord.sanitize_sql_like(title) }%"
       descriptions =
@@ -41,13 +40,13 @@ class WikiPagesController < ApplicationController
     return head :not_found unless language.is_a?(String)
     return head :not_found unless Language.exists?(code: language)
 
-    names = HistoryAccess.current(TagDescription.all, TagDescriptionVersion).joins(tag: :tag_names)
+    names = TagDescription.joins(tag: :tag_names)
         .where(language_code: locale.language_code, tag_names: { language_code: language })
         .pluck('tag_descriptions.tag_id', 'tag_descriptions.id', 'tag_names.name')
     candidates = names.map do |tag_id, description_id, name|
       WikiPageRepr.autolink_tag(locale, tag_id:, description_id:, name:, language:)
     end
-    candidates.concat(HistoryAccess.current(TagGroup.all, TagGroupVersion).order(:id).pluck(:id, :name).map do |id, name|
+    candidates.concat(TagGroup.order(:id).pluck(:id, :name).map do |id, name|
       WikiPageRepr.autolink_group(locale, id:, name:, language:)
     end)
     render json: candidates
@@ -411,7 +410,7 @@ class WikiPagesController < ApplicationController
   end
 
   def tag_description_by_title locale, title
-    HistoryAccess.current(TagDescription.all, TagDescriptionVersion).joins(tag: :tag_names)
+    TagDescription.joins(tag: :tag_names)
         .find_by(language_code: locale.language_code,
                  tag_names: { language_code: locale.language_code, name: title })
   end

backend/app/models/history_access.rb

@@ -147,29 +147,6 @@ class HistoryAccess < ActiveSupport::CurrentAttributes
     scope.where(Arel.sql(sql(scope.klass, row)))
   end
 
-  def self.current(scope, version_model)
-    return scope if admin?
-
-    table = scope.klass.table_name
-    keys = KEYS.fetch(version_model.table_name)
-    matches = keys.map do |key|
-      column = scope.klass.column_names.include?(key) ? key : 'id'
-      "current_snapshot.#{ key } = #{ table }.#{ column }"
-    end.join(' AND ')
-    boundary = "#{ matches } AND current_snapshot.version_no >= #{ table }.version_no " +
-        "AND current_snapshot.event_type = 'discard'"
-    scope = scope.where(Arel.sql("NOT EXISTS (SELECT 1 FROM #{ version_model.table_name } " +
-        "current_snapshot WHERE #{ boundary })"))
-    condition = "#{ matches } AND current_snapshot.version_no = #{ table }.version_no"
-    scope.where(Arel.sql("NOT EXISTS (SELECT 1 FROM #{ version_model.table_name } " +
-        "current_snapshot WHERE #{ condition } AND NOT (#{ sql(version_model, 'current_snapshot') }))"))
-  end
-
-  def self.require_current!(record, version_model)
-    return if admin?
-    raise Forbidden unless current(record.class.where(id: record.id), version_model).exists?
-  end
-
   def self.blob_visible?(blob, seen = [])
     return true if admin?
     return false if seen.include?(blob.id)

backend/app/representations/tag_group_repr.rb

@@ -44,7 +44,6 @@ module TagGroupRepr
   end
 
   def one locale, group
-    HistoryAccess.require_current!(group, TagGroupVersion)
     many(locale, [group]).first
   end
 

backend/app/representations/wiki_page_repr.rb

@@ -5,7 +5,6 @@ module WikiPageRepr
   module_function
 
   def tag_description locale, description
-    HistoryAccess.require_current!(description, TagDescriptionVersion)
     tag = description.tag
 
     { 'id' => description.id,

backend/spec/requests/counts_history_boundaries_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe 'History boundaries shared with Counts', type: :request do
     end
   end
 
-  it 'denies the same discarded description through Counts, the facade and the ordinary API' do
+  it 'keeps discarded history private while exposing the current description' do
     get '/counts/query', params: { resource: 'tag_descriptions', definition: 'history',
         mode: 'details', locale: 'ja', execution_at: '2025-01-01T00:00:00Z' }
     expect(response).to have_http_status(:ok)
@@ -22,8 +22,8 @@ RSpec.describe 'History boundaries shared with Counts', type: :request do
         'excluded_count' => 2, 'versions' => [])
     ["/wiki/#{ description.id }", "/tags/#{ tag.id }/description"].each do |path|
       get path, params: { locale: 'ja' }
-      expect(response).to have_http_status(:not_found)
-      expect(response.body).not_to include('private body')
+      expect(response).to have_http_status(:ok)
+      expect(response.parsed_body.fetch('body')).to eq(description.body)
     end
     get '/sitemap_entries/descriptions', params: { locale: 'ja' }
     expect(response).to have_http_status(:ok)

backend/spec/requests/post_history_privacy_spec.rb

@@ -69,40 +69,38 @@ RSpec.describe 'Post history privacy', type: :request do
         sign_in_as(create(:user, role.to_sym)) unless role == 'anonymous'
       end
 
-      it 'uses only authorised history timestamps for display' do
+      it 'uses the latest version timestamp for display regardless of role' do
         get '/posts'
         expect(response).to have_http_status(:ok)
         row = response.parsed_body.fetch('posts').find { _1.fetch('id') == post_record.id }
-        expected = origin + (role == 'admin' ? 4 : 3).days
+        expected = origin + 4.days
         expect(Time.zone.parse(row.fetch('updated_at'))).to eq(expected)
       end
 
-      it 'uses the same visibility for date bounds and count' do
+      it 'uses the latest version timestamp for date bounds and count regardless of role' do
         get '/posts', params: { updated_from: (origin + 4.days).iso8601,
                                 updated_to: (origin + 4.days).iso8601 }
         expect(response).to have_http_status(:ok)
         ids = response.parsed_body.fetch('posts').pluck('id')
-        expect(ids).to eq(role == 'admin' ? [post_record.id] : [])
+        expect(ids).to eq([post_record.id])
         expect(response.parsed_body.fetch('count')).to eq(ids.length)
       end
 
-      it 'sorts using authorised timestamps in both directions' do
+      it 'sorts using the latest version timestamps in both directions regardless of role' do
         ['asc', 'desc'].each do |direction|
           get '/posts', params: { order: "updated_at:#{ direction }" }
           expect(response).to have_http_status(:ok)
-          expected = role == 'admin' ? [other_post.id, post_record.id] :
-              [post_record.id, other_post.id]
+          expected = [other_post.id, post_record.id]
           expected.reverse! if direction == 'desc'
           expect(response.parsed_body.fetch('posts').pluck('id')).to eq(expected)
         end
       end
 
-      it 'applies authorised timestamp ordering before pagination' do
+      it 'applies latest version timestamp ordering before pagination regardless of role' do
         get '/posts', params: { order: 'updated_at:desc', limit: 1 }
 
         expect(response).to have_http_status(:ok)
-        expected = role == 'admin' ? post_record.id : other_post.id
-        expect(response.parsed_body.fetch('posts').pluck('id')).to eq([expected])
+        expect(response.parsed_body.fetch('posts').pluck('id')).to eq([post_record.id])
         expect(response.parsed_body.fetch('count')).to eq(2)
       end
 

frontend/src/components/PostEditForm.tsx

@@ -1,8 +1,6 @@
-import { useQuery } from '@tanstack/react-query'
 import { useEffect, useMemo, useState } from 'react'
 
 import { useLocale } from '@/lib/useLocale'
-import PostList from '@/components/PostList'
 import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
 import FieldError from '@/components/common/FieldError'
 import PostDurationField from '@/components/posts/PostDurationField'
@@ -12,15 +10,14 @@ import { Button } from '@/components/ui/button'
 import { toast } from '@/components/ui/use-toast'
 import { isApiError } from '@/lib/api'
 import useDialogue from '@/lib/dialogues/useDialogue'
-import { fetchPosts, updatePost } from '@/lib/posts'
-import { postsKeys } from '@/lib/queryKeys'
+import { updatePost } from '@/lib/posts'
 import { msToTime } from '@/lib/utils'
 import { useValidationErrors } from '@/lib/useValidationErrors'
 import { useUITranslation } from '@/lib/useUITranslation'
 
 import type { FC, FormEvent } from 'react'
 
-import type { FetchPostsParams, Post, TagWithSections } from '@/types'
+import type { Post, TagWithSections } from '@/types'
 
 type PostFormField =
     'parentPostIds' | 'tags' | 'videoMs'
@@ -71,33 +68,6 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
   const [tags, setTags] = useState<string> (() => tagsToStr (post.tags))
   const [title, setTitle] = useState (post.title)
 
-  const [importVisible, setImportVisible] = useState (false)
-  const [sourceTitle, setSourceTitle] = useState ('')
-  const [sourcePage, setSourcePage] = useState (1)
-  const sourceParams: FetchPostsParams = {
-      title: sourceTitle, page: sourcePage, limit: 20,
-      url: '', tags: '', match: 'all', order: 'original_created_at:desc',
-      originalCreatedFrom: '', originalCreatedTo: '',
-      createdFrom: '', createdTo: '', updatedFrom: '', updatedTo: '' }
-  const { data: sources, isError: sourceError } = useQuery ({
-      queryKey: postsKeys.index (sourceParams, locale),
-      queryFn: () => fetchPosts (sourceParams, locale),
-      enabled: importVisible && !disabled })
-
-  const importTags = (source: Post) => {
-    if (disabled)
-      return
-    setTags (current => {
-      const existing = new Set (current.split (/\s+/))
-      const additions = tagsToStr (source.tags).split (/\s+/)
-	  .filter (tag => tag !== '' && !existing.has (tag))
-      return additions.length > 0
-	  ? `${current}${current.trim () === '' ? '' : ' '}${additions.join (' ')}`
-	  : current
-    })
-    setImportVisible (false)
-  }
-
   const videoFlg =
       useMemo (() => tags.split (/\s+/).some (tag => tag.replace (/\[.*\]$/, '') === '動画'),
 	       [tags])
@@ -222,48 +192,6 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
 	    setTags={setTags}
 	    errors={fieldErrors.tags}/>
 
-	<Button
-	    type="button"
-	    variant="outline"
-	    disabled={disabled}
-	    aria-expanded={importVisible}
-	    onClick={() => setImportVisible (visible => !visible)}>
-	  {label ('edit.import')}
-	</Button>
-	{importVisible && (
-	    <div className="space-y-2" onKeyDown={event => {
-	      if (event.key === 'Enter' && event.target instanceof HTMLInputElement)
-		event.preventDefault ()
-	    }}>
-	      <PostTextField
-		  label={label ('shared:labels.title')}
-		  type="search"
-		  value={sourceTitle}
-		  disabled={disabled}
-		  onChange={value => {
-		    setSourceTitle (value)
-		    setSourcePage (1)
-		  }}/>
-	      <FieldError messages={sourceError ? [label ('common:fetchError')] : []}/>
-	      {!disabled && <PostList posts={sources?.posts ?? []} onSelect={importTags}/>}
-	      <div className="flex flex-col gap-2 md:flex-row">
-		<Button
-		    type="button"
-		    variant="outline"
-		    disabled={disabled || sourcePage <= 1}
-		    onClick={() => setSourcePage (page => page - 1)}>
-		  {label ('common:pagination.previous')}
-		</Button>
-		<Button
-		    type="button"
-		    variant="outline"
-		    disabled={disabled || sourcePage * 20 >= (sources?.count ?? 0)}
-		    onClick={() => setSourcePage (page => page + 1)}>
-		  {label ('common:pagination.next')}
-		</Button>
-	      </div>
-	    </div>)}
-
 	{/* オリジナルの作成日時 */}
 	<PostOriginalCreatedTimeField
 	    disabled={disabled}

frontend/src/components/PostList.tsx

@@ -3,7 +3,6 @@ import { useRef } from 'react'
 import { useLocation } from 'react-router-dom'
 
 import PrefetchLink from '@/components/PrefetchLink'
-import { Button } from '@/components/ui/button'
 import { useUITranslation } from '@/lib/useUITranslation'
 import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
 import { cn } from '@/lib/utils'
@@ -14,11 +13,10 @@ import type { FC, MouseEvent } from 'react'
 import type { Post } from '@/types'
 
 type Props = { posts:     Post[]
-	       onSelect?: (post: Post) => void
 	       onClick?:  (event: MouseEvent<HTMLElement>) => void }
 
 
-const PostList: FC<Props> = ({ posts, onClick, onSelect }) => {
+const PostList: FC<Props> = ({ posts, onClick }) => {
   const { label } = useUITranslation ('shared')
   const location = useLocation ()
   const behaviourSettings = useClientBehaviourSettings ()
@@ -41,63 +39,7 @@ const PostList: FC<Props> = ({ posts, onClick, onSelect }) => {
 	  const sharedId = `page-${ post.id }`
 	  const layoutId = sharedId
 
-	  const card = (
-	      <motion.div
-		  ref={cardRef}
-		  layout={animationMode === 'off' ? false : true}
-		  layoutId={(onSelect || animationMode === 'off') ? undefined : layoutId}
-		  className={cn ('w-full h-full overflow-hidden rounded-xl shadow',
-				 'transform-gpu will-change-transform',
-				 (post.childPosts ?? []).length > 0 && 'ring-4 ring-green-500',
-				 (post.parentPosts ?? []).length > 0 && 'ring-4 ring-yellow-500')}
-		  whileHover={{ scale: 1.02 }}
-		  onLayoutAnimationStart={() => {
-		    if (!(cardRef.current))
-		      return
-
-		    cardRef.current.style.position = 'relative'
-		    cardRef.current.style.zIndex = '9999'
-		  }}
-		  onLayoutAnimationComplete={() => {
-		    if (!(cardRef.current))
-		      return
-
-		    cardRef.current.style.zIndex = ''
-		    cardRef.current.style.position = ''
-		  }}
-		  transition={{ layout: cardLayoutTransition }}>
-		{thumbnailMode === 'off'
-		 ? (
-		    <div className="flex h-full w-full items-center justify-center
-				    bg-muted text-center text-xs text-muted-foreground">
-		      {label ('labels.noThumbnail')}
-		    </div>)
-		 : (
-		    <img
-			src={post.thumbnail || post.thumbnailBase || undefined}
-			alt={post.title || post.url}
-			title={post.title || post.url || undefined}
-			loading={
-			    thumbnailMode === 'light'
-			    ? 'lazy'
-			    : (i < 12 ? 'eager' : 'lazy')
-			}
-			decoding="async"
-			className="object-cover w-full h-full"/>)}
-	      </motion.div>)
-
-	  return onSelect
-	  ? (
-	      <Button
-		  key={post.id}
-		  type="button"
-		  variant="ghost"
-		  className="w-40 h-40 p-0"
-		  aria-label={post.title || post.url}
-		  onClick={() => onSelect (post)}>
-		{card}
-	      </Button>)
-	  : (
+	  return (
 	      <PrefetchLink
 		  to={`/posts/${ post.id }`}
 		  key={post.id}
@@ -107,7 +49,51 @@ const PostList: FC<Props> = ({ posts, onClick, onSelect }) => {
 		    setForLocationKey (location.key, sharedId)
 		    onClick?.(e)
 		  }}>
-		{card}
+		<motion.div
+		    ref={cardRef}
+		    layout={animationMode === 'off' ? false : true}
+		    layoutId={animationMode === 'off' ? undefined : layoutId}
+		    className={cn ('w-full h-full overflow-hidden rounded-xl shadow',
+				   'transform-gpu will-change-transform',
+				   (post.childPosts ?? []).length > 0 && 'ring-4 ring-green-500',
+				   (post.parentPosts ?? []).length > 0 && 'ring-4 ring-yellow-500')}
+		    whileHover={{ scale: 1.02 }}
+		    onLayoutAnimationStart={() => {
+		      if (!(cardRef.current))
+			return
+
+		      cardRef.current.style.position = 'relative'
+		      cardRef.current.style.zIndex = '9999'
+		    }}
+		    onLayoutAnimationComplete={() => {
+		      if (!(cardRef.current))
+			return
+
+		      cardRef.current.style.zIndex = ''
+		      cardRef.current.style.position = ''
+		    }}
+		    transition={{ layout: cardLayoutTransition }}>
+		  {thumbnailMode === 'off'
+		   ? (
+		      <div className="flex h-full w-full items-center justify-center
+				      bg-muted text-center text-xs text-muted-foreground">
+			{label ('labels.noThumbnail')}
+		      </div>)
+		   : (
+		      <img
+			  src={post.thumbnail || post.thumbnailBase || undefined}
+			  alt={post.title || post.url}
+			  title={post.title || post.url || undefined}
+			  loading={
+			      thumbnailMode === 'light'
+			      ? 'lazy'
+			      : i < 12
+				? 'eager'
+				: 'lazy'
+			  }
+			  decoding="async"
+			  className="object-cover w-full h-full"/>)}
+		</motion.div>
 	      </PrefetchLink>)
 	})}
       </div>)

frontend/src/locales/ain-Kana/posts.json

@@ -1,5 +1,4 @@
 {
-  "_untranslated": ["edit.import"],
   "list": {
     "tagline": "{{brand}}",
     "empty": "ミンタㇻ　タ　ネン　カ　イサㇺ",
@@ -32,7 +31,6 @@
     "showExternal": "ソイタㇰ　ソㇱ　アヌカレ"
   },
   "edit": {
-    "import": "インポート",
     "validationFailed": "アシㇼ　カㇻ　カ　エアイカㇷ゚……",
     "conflictTitle": "モㇱマ　クㇽ　アシㇼ　カㇻ　ワ　アン！",
     "conflictDescription": "モㇱマ　イカㇻ　クㇽ　エエトコ　アシㇼ　カㇻ　ワ　アン。",

frontend/src/locales/ja/posts.json

@@ -22,7 +22,6 @@
     "question": "表示しますか?", "showExternal": "外部ページを表示"
   },
   "edit": {
-    "import": "インポート",
     "validationFailed": "更新はできなかったよ……",
     "conflictTitle": "競合が発生しました．",
     "conflictDescription": "ほかの耕作員が先に更新してゐます．",