AI: address review on PR #461

backend/app/services/post_tag_search.rb

@@ -3,8 +3,8 @@ class PostTagSearch
   def self.literals(locale, raw)
     tokens = raw.split.reject { _1.downcase == 'type:or' }
     names = tokens.map { _1.sub(/\Anot:/i, '') }
-    registered = TagName.where(language_code: locale.language_code, name: names)
+    registered = matching_names(TagName.where(language_code: locale.language_code),
-        .pluck(:name, :tag_id).to_h
+        names, 'tag_names.name', :tag_id).to_h
     primary = TagName.where(language_code: locale.language_code,
         tag_id: registered.values, primary_flg: true).pluck(:tag_id, :name).to_h
     tokens.zip(names).map do |token, name|
@@ -19,12 +19,25 @@ class PostTagSearch
 
   def self.references_for(locale, literals)
     names = literals.map { _1[:name] }.uniq
-    internal = TagName.where(language_code: locale.language_code, name: names)
+    internal = matching_names(TagName.where(language_code: locale.language_code),
-        .pluck(:name, :tag_id).group_by(&:first)
+        names, 'tag_names.name', :tag_id).group_by(&:first)
-    external = names.empty? ? {} : ExternalTag.where(
+    external = matching_names(ExternalTag.all, names,
-        "CONCAT(platform, ':', name) IN (?)", names)
+        "CONCAT(external_tags.platform, ':', external_tags.name)", :id).group_by(&:first)
-        .pluck(Arel.sql("CONCAT(platform, ':', name)"), :id).group_by(&:first)
     names.to_h { |name| [name, [internal.fetch(name, []).map(&:last).uniq,
                               external.fetch(name, []).map(&:last).uniq]] }
   end
+
+  def self.matching_names(scope, names, expression, identifier)
+    return [] if names.empty?
+
+    queries = names.uniq.map do |name|
+      scope.klass.sanitize_sql_array(['SELECT ? AS name', name])
+    end
+    # Return the input spelling so Ruby does not recheck database equivalence.
+    scope.joins(<<~SQL).pluck(Arel.sql('search_names.name'), identifier)
+      INNER JOIN (#{ queries.join(' UNION ALL ') }) AS search_names
+        ON #{ expression } = search_names.name COLLATE utf8mb4_0900_ai_ci
+    SQL
+  end
+  private_class_method :matching_names
 end

backend/spec/requests/posts_spec.rb

@@ -206,6 +206,25 @@ RSpec.describe 'Posts API', type: :request do
     end
 
     context 'when q is provided' do
+      ['SPEC_TAG', 'SpEc_TaG', 'spec_tág', 'MANKO', 'MaNkO', 'mánko'].each do |name|
+        it "matches #{ name } using database collation" do
+          get '/posts', params: { locale: 'ja', tags: name }
+
+          expect(response).to have_http_status(:ok)
+          expect(json.fetch('count')).to eq(2)
+          expect(json.fetch('posts').map { _1.fetch('id') })
+              .to contain_exactly(post_record.id, hit_post.id)
+        end
+
+        it "excludes #{ name } using database collation" do
+          get '/posts', params: { locale: 'ja', tags: "not:#{ name }" }
+
+          expect(response).to have_http_status(:ok)
+          expect(json.fetch('count')).to eq(1)
+          expect(json.fetch('posts').map { _1.fetch('id') }).to eq([miss_post.id])
+        end
+      end
+
       it 'filters posts by q (hit case)' do
         get '/posts', params: { tags: 'spec_tag' }
 
@@ -266,6 +285,26 @@ RSpec.describe 'Posts API', type: :request do
         PostExternalTag.create!(post: miss_post, external_tag:)
       end
 
+      ['NICO:SEARCH_EXTERNAL', 'NiCo:SeArCh_ExTeRnAl', 'nico:séarch_external'].each do |name|
+        it "matches #{ name } using database collation" do
+          get '/posts', params: { locale: 'ja', tags: name }
+
+          expect(response).to have_http_status(:ok)
+          expect(json.fetch('count')).to eq(2)
+          expect(json.fetch('posts').map { _1.fetch('id') })
+              .to contain_exactly(miss_post.id, both_post.id)
+        end
+
+        it "excludes #{ name } using database collation" do
+          get '/posts', params: { locale: 'ja', tags: "not:#{ name }" }
+
+          expect(response).to have_http_status(:ok)
+          expect(json.fetch('count')).to eq(2)
+          expect(json.fetch('posts').map { _1.fetch('id') })
+              .to contain_exactly(post_record.id, hit_post.id)
+        end
+      end
+
       it 'keeps internal name searches independent of colliding external ids' do
         get '/posts', params: { tags: primary_tag_name_for(tag, 'ja').name }
 

frontend/src/components/PostFormTagsArea.tsx

@@ -36,13 +36,10 @@ const replaceToken = (value: string, start: number, end: number, text: string) =
 type Props = Omit<ComponentPropsWithoutRef<'textarea'>, 'value' | 'onChange' | 'onBlur'> & {
     tags:     string
     setTags:  (tags: string) => void
-    label?:   ReactNode
     errors?:  ReactNode[] }
 
 
-const PostFormTagsArea: FC<Props> = (
+const PostFormTagsArea: FC<Props> = ({ tags, setTags, errors, ...rest }) => {
-    { tags, setTags, label: fieldLabel, errors, ...rest },
-) => {
   const { label } = useUITranslation ('navigation')
   const locale = useLocale ()
   const ref = useRef<HTMLTextAreaElement> (null)
@@ -120,10 +117,7 @@ const PostFormTagsArea: FC<Props> = (
   }, [locale])
 
   return (
-      <FormField
+      <FormField className="relative w-full" label={label ('tags')} messages={errors}>
-	  className="relative w-full"
-	  label={fieldLabel ?? label ('tags')}
-	  messages={errors}>
 	{({ describedBy, invalid }) => (
 	    <>
 	      <TextArea

frontend/src/pages/tags/NicoTagListPage.test.tsx

@@ -162,13 +162,12 @@ describe ('NicoTagListPage', () => {
     })
   })
 
-  it ('saves links after completing the tag at the cursor', async () => {
+  it ('updates links from a tag card', async () => {
     api.apiGet
       .mockResolvedValueOnce ({
         tags:  [buildNicoTag ({ id: 7, name: 'nico:source' })],
         count: 1,
       })
-      .mockResolvedValueOnce ([buildTag ({ id: 8, name: '連携先', postCount: 3 })])
       .mockResolvedValueOnce ({
         tags: [
           buildNicoTag ({
@@ -184,24 +183,8 @@ describe ('NicoTagListPage', () => {
     renderPage ()
 
     fireEvent.click (await screen.findByRole ('button', { name: '編集' }))
-    const textarea = screen.getByLabelText ('連携する広場タグ')
+    fireEvent.change (screen.getByLabelText ('連携する広場タグ'), {
-    fireEvent.change (textarea, { target: { value: '既存 連携\n後続' } })
+      target: { value: '連携先' },
-    fireEvent.focus (textarea)
-    fireEvent.select (textarea, {
-	target: { selectionStart: 4, selectionEnd: 4 } })
-
-    await waitFor (() => {
-      expect (api.apiGet).toHaveBeenCalledWith (
-	  '/tags/autocomplete',
-	  { locale: 'ja', params: { q: '連携', nico: '0' },
-	    signal: expect.any (AbortSignal) })
-    })
-    fireEvent.mouseDown (await screen.findByText ('連携先'))
-
-    expect (textarea).toHaveValue ('既存 連携先 \n後続')
-    await waitFor (() => {
-      expect ((textarea as HTMLTextAreaElement).selectionStart).toBe (7)
-      expect ((textarea as HTMLTextAreaElement).selectionEnd).toBe (7)
     })
     fireEvent.click (screen.getByRole ('button', { name: '保存' }))
 
@@ -212,8 +195,6 @@ describe ('NicoTagListPage', () => {
           { locale: 'ja', headers: { 'Content-Type': 'multipart/form-data' } },
       )
     })
-    const payload = api.apiPut.mock.calls[0][1] as FormData
-    expect (payload.get ('tags')).toBe ('既存 連携先 \n後続')
     expect (await screen.findByText ('1 件')).toBeInTheDocument ()
   })
 

frontend/src/pages/tags/NicoTagListPage.tsx

@@ -6,10 +6,11 @@ import { useLocation } from 'react-router-dom'
 import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
 import TagLink from '@/components/TagLink'
 import SortHeader from '@/components/SortHeader'
-import PostFormTagsArea from '@/components/PostFormTagsArea'
+import FieldError from '@/components/common/FieldError'
 import FormField from '@/components/common/FormField'
 import PageTitle from '@/components/common/PageTitle'
 import Pagination from '@/components/common/Pagination'
+import TextArea from '@/components/common/TextArea'
 import useDialogue from '@/lib/dialogues/useDialogue'
 import MainArea from '@/components/layout/MainArea'
 import { toast } from '@/components/ui/use-toast'
@@ -356,18 +357,21 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
 					       dark:bg-rose-950/30">
 				  <td colSpan={editable ? 5 : 4} className="p-3">
 				    <div className="space-y-2">
-				      <PostFormTagsArea
+				      <label htmlFor={`nico-links-${ tag.id }`}
+					     className="block text-sm font-semibold">
+					{label ('nico.tagsToLink')}
+				      </label>
+				      <TextArea
 					  id={`nico-links-${ tag.id }`}
-					  label={label ('nico.tagsToLink')}
+					  value={rawTags[tag.id] ?? ''}
-					  aria-label={message ('nico.tagsToLink').text}
+					  invalid={(errorsByTagId[tag.id] ?? []).length > 0}
-					  tags={rawTags[tag.id] ?? ''}
-					  errors={errors}
 					  className="min-h-24 resize-y"
 					  placeholder={message ('nico.tagsPlaceholder').text}
 					  lang={message ('nico.tagsPlaceholder').language}
-					  setTags={value => setRawTags (rawTags => ({
+					  onChange={e => setRawTags (rawTags => ({
 					      ...rawTags,
-					      [tag.id]: value}))}/>
+					      [tag.id]: e.target.value}))}/>
+				      <FieldError messages={errors}/>
 				      <div className="flex justify-end gap-2">
 					<button
 					    type="button"