AI: address review on PR #461

backend/app/controllers/wiki_pages_controller.rb

@@ -6,11 +6,6 @@ class WikiPagesController < ApplicationController
   def index
     locale = resolve_locale!
 
-    resource_type = params[:resource_type]
-    unless resource_type.nil? || ['tag_description', 'tag_group'].include?(resource_type)
-      return head :bad_request
-    end
-
     title = params[:title].to_s.strip
     descriptions =
         HistoryAccess.current(TagDescription.all, TagDescriptionVersion)
@@ -19,8 +14,6 @@ class WikiPagesController < ApplicationController
 
     descriptions = descriptions.order(updated_at: :desc, id: :asc)
     tag_groups = HistoryAccess.current(TagGroup.all, TagGroupVersion).order(updated_at: :desc, id: :asc)
-    descriptions = descriptions.none if resource_type == 'tag_group'
-    tag_groups = tag_groups.none if resource_type == 'tag_description'
     if title.present?
       pattern = "%#{ ApplicationRecord.sanitize_sql_like(title) }%"
       descriptions =

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)
-        .pluck(:name, :tag_id).to_h
+    registered = matching_names(TagName.where(language_code: locale.language_code),
+        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)
-        .pluck(:name, :tag_id).group_by(&:first)
-    external = names.empty? ? {} : ExternalTag.where(
-        "CONCAT(platform, ':', name) IN (?)", names)
-        .pluck(Arel.sql("CONCAT(platform, ':', name)"), :id).group_by(&:first)
+    internal = matching_names(TagName.where(language_code: locale.language_code),
+        names, 'tag_names.name', :tag_id).group_by(&:first)
+    external = matching_names(ExternalTag.all, names,
+        "CONCAT(external_tags.platform, ':', external_tags.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/App.tsx

@@ -166,13 +166,7 @@ export const pageRoutes = (
 	    robots: 'noindex', authentication: 'user' } },
 	{ path: ':id', element: <MaterialDetailPage/>,
 	  handle: { preload: MaterialDetailPage.preload, sitemap: ['materials'] } }] },
-    { path: 'wiki', element: <LocaleRedirect to="/tag-descriptions"/>,
-      handle: { redirectTo: '/tag-descriptions' } },
-    { path: 'tag-descriptions',
-      element: <WikiSearchPage key="tag_description" resourceType="tag_description"/>,
-      handle: { preload: WikiSearchPage.preload, sitemap: ['static'] } },
-    { path: 'tag-groups',
-      element: <WikiSearchPage key="tag_group" resourceType="tag_group"/>,
+    { path: 'wiki', element: <WikiSearchPage/>,
       handle: { preload: WikiSearchPage.preload, sitemap: ['static'] } },
     { path: 'wiki/:title', element: <WikiDetailPage/>,
       handle: { preload: WikiDetailPage.preload, switchLocale: switchWikiLocale,

frontend/src/components/TopNav.tsx

@@ -29,7 +29,7 @@ import { fetchWikiPage } from '@/lib/wiki'
 import type { FC, MouseEvent } from 'react'
 
 import type { AvailableLocale, LocaleCode } from '@/lib/locales'
-import type { Material, Menu, MenuVisibleItem, Tag, User, WikiPage } from '@/types'
+import type { Material, Menu, MenuVisibleItem, Tag, User } from '@/types'
 
 type Props = {
     user: User | null
@@ -39,11 +39,10 @@ type NavDensity = 'auto' | 'comfortable' | 'compact'
 
 
 export const menuOutline = (
-    { tag, material, wikiId, wikiResourceType, user, pathName: fullPathname }: {
+    { tag, material, wikiId, user, pathName: fullPathname }: {
 	tag?: Tag | null
 	material?: Material | null
 	wikiId: number | null
-	wikiResourceType?: WikiPage['resourceType']
 	user: User | null
 	pathName: string },
 ): Menu => {
@@ -100,30 +99,17 @@ export const menuOutline = (
 	    visible: materialFlg && Boolean (material?.tag) },
 	  { ...message ('history'), to: `/materials/changes?material_id=${ material?.id }`,
 	    visible: materialFlg }] },
-      ...([
-	  { key: 'tagDescriptions', path: '/tag-descriptions', type: 'tag_description' },
-	  { key: 'tagGroups', path: '/tag-groups', type: 'tag_group' }] as const)
-	  .map (({ key, path, type }): MenuVisibleItem => {
-	    const current = (wikiResourceType ?? 'tag_description') === type
-	    const detailFlg = wikiPageFlg && current
-	    const creationPath =
-		type === 'tag_group'
-		? `/wiki/new?title=${ encodeURIComponent ('タググループ:') }` : '/wiki/new'
-	    return { ...message (key), to: path,
-		base: (pathName.startsWith ('/wiki') && current) ? '/wiki' : path,
-		subMenu: [
-		    { ...message ('search'), to: path },
-		    { ...message ('create'), to: creationPath, visible: editable },
-		    { ...message ('allHistory'), to: '/wiki/changes' },
-		    { ...message ('help'), to: '/wiki/ヘルプ:Wiki' },
-		    { component: <Separator/>, visible: detailFlg },
-		    { ...message ('postsWithCount', { count: postCount }),
-		      to: `/posts?tags=${ wikiTitle }`, visible: detailFlg },
-		    { ...message ('history'), to: `/wiki/changes?id=${ wikiId }`,
-		      visible: detailFlg },
-		    { ...message ('edit'), to: `/wiki/${ wikiId || wikiTitle }/edit`,
-		      visible: detailFlg && editable }] }
-	  }),
+      { ...message ('wiki'), to: '/wiki', subMenu: [
+	  { ...message ('search'), to: '/wiki' },
+	  { ...message ('create'), to: '/wiki/new', visible: editable },
+	  { ...message ('allHistory'), to: '/wiki/changes' },
+	  { ...message ('help'), to: '/wiki/ヘルプ:Wiki' },
+	  { component: <Separator/>, visible: wikiPageFlg },
+	  { ...message ('postsWithCount', { count: postCount }), to: `/posts?tags=${ wikiTitle }`,
+	    visible: wikiPageFlg },
+	  { ...message ('history'), to: `/wiki/changes?id=${ wikiId }`, visible: wikiPageFlg },
+	  { ...message ('edit'), to: `/wiki/${ wikiId || wikiTitle }/edit`,
+	    visible: wikiPageFlg && editable }] },
       { ...message ('help'), to: '/help/home', base: '/help', subMenu: [
 	  { ...message ('search'), to: '/help' },
 	  { ...message ('allHistory'), to: '/help/changes' },
@@ -243,8 +229,7 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
       queryKey: materialsKeys.show (effectiveTitle, locale),
       queryFn: () => fetchMaterial (effectiveTitle, locale) })
 
-  const menu = menuOutline ({ tag, material, wikiId,
-      wikiResourceType: wikiPage?.resourceType, user, pathName: location.pathname })
+  const menu = menuOutline ({ tag, material, wikiId, user, pathName: location.pathname })
   const visibleMenu = menu.filter ((item): item is MenuVisibleItem => item.visible ?? true)
   const menuLabels = visibleMenu.map (item => item.name).join ('\u0000')
   const moreMenu = menu.filter (item =>

frontend/src/lib/prefetchers.ts

@@ -100,11 +100,10 @@ const prefetchHelpDiff: Prefetcher = async (qc, url, locale) => {
 
 const prefetchWikiPagesIndex: Prefetcher = async (qc, url, locale) => {
   const title = url.searchParams.get ('title') ?? ''
-  const resourceType = url.pathname === '/tag-groups' ? 'tag_group' : 'tag_description'
 
   await qc.prefetchQuery ({
-      queryKey: wikiKeys.index ({ title, resourceType }, locale),
-      queryFn: () => fetchWikiPages ({ title, resourceType }, locale) })
+      queryKey: wikiKeys.index ({ title }, locale),
+      queryFn:  () => fetchWikiPages ({ title }, locale) })
 }
 
 
@@ -311,8 +310,7 @@ export const routePrefetchers: { test: (u: URL) => boolean; run: Prefetcher }[]
 		  && Boolean (mPost (u.pathname))),
       run: prefetchPostShow },
     { test: u => u.pathname === '/posts/changes', run: prefetchPostChanges },
-    { test: u => ['/wiki', '/tag-descriptions', '/tag-groups'].includes (u.pathname),
-      run: prefetchWikiPagesIndex },
+    { test: u => u.pathname === '/wiki', run: prefetchWikiPagesIndex },
     { test: u => (!(['/wiki/new', '/wiki/changes'].includes (u.pathname))
 		  && Boolean (mWiki (u.pathname))),
       run: prefetchWikiPageShow },

frontend/src/lib/queryKeys.ts

@@ -5,7 +5,6 @@ import type {
     FetchPostsParams,
     FetchTagsParams,
     MaterialFilter,
-    WikiPage,
     WikiTagReference } from '@/types'
 
 export const localesKeys = {
@@ -131,7 +130,7 @@ export const wikiKeys = {
     autolinkCandidates: (language: string, locale: LocaleCode) =>
 	['wiki', 'autolink', locale, language] as const,
     index:  (
-    p: { title?: string, resourceType?: WikiPage['resourceType'] },
+    p: { title?: string },
     locale: LocaleCode = 'ja',
 ) => ['wiki', locale, 'index', p] as const,
     show:   (

frontend/src/lib/wiki.ts

@@ -24,10 +24,10 @@ export const fetchWikiChanges = (
 
 
 export const fetchWikiPages = async (
-    { title, resourceType }: { title?: string, resourceType?: WikiPage['resourceType'] },
+    { title }:  { title?: string },
     locale: LocaleCode = 'ja',
 ): Promise<WikiPage[]> =>
-    await apiGet ('/wiki', { locale, params: { title, resource_type: resourceType } })
+    await apiGet ('/wiki', { locale, params: { title } })
 
 
 export const fetchWikiPage = async (

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

@@ -14,8 +14,6 @@
   "materials": "チカㇻペ",
   "suppressions": "アエアイカㇷ゚テㇷ゚",
   "wiki": "Wiki",
-  "tagDescriptions": "$t(counts:resources.tag_descriptions)",
-  "tagGroups": "$t(counts:resources.tag_groups)",
   "create": "アシㇼ",
   "edit": "イヌイェㇷ゚",
   "entertainment": "シノッ",

frontend/src/locales/ja/navigation.json

@@ -13,8 +13,6 @@
   "materials": "素材",
   "suppressions": "抑止",
   "wiki": "Wiki",
-  "tagDescriptions": "$t(counts:resources.tag_descriptions)",
-  "tagGroups": "$t(counts:resources.tag_groups)",
   "create": "新規",
   "edit": "編輯",
   "entertainment": "おたのしみ",

frontend/src/pages/materials/MaterialDetailPage.tsx

@@ -135,7 +135,7 @@ const MaterialDetailPage: FC = () => {
 
 	      <TabGroup>
 		{material.tag && (
-		    <Tab name={label ('navigation:tagDescriptions')}>
+		    <Tab name={label ('navigation:wiki')}>
 		      <WikiBody
 			  title={material.tag.name}
 			  language={localeLanguage (locale)}

frontend/src/pages/posts/PostListPage.tsx

@@ -176,7 +176,7 @@ const PostListPage: FC = () => {
 	      {loading && label ('common:loading')}
 	    </Tab>
 	    {tags.length === 1 && (
-		<Tab name={label ('navigation:tagDescriptions')}>
+		<Tab name={label ('navigation:wiki')}>
 		  <WikiBody title={tags[0]} body={wikiPage?.body}
 		      language={wikiPage?.languageCode ?? (wikiPage?.resourceType === 'tag_description'
 			  ? localeLanguage (locale) : 'und')}/>

frontend/src/pages/wiki/WikiDetailPage.tsx

@@ -51,8 +51,7 @@ const WikiDetailPage: FC = () => {
       queryKey: helpKeys.titles ('ja'),
       queryFn: () => getHelpTitleIndex ('ja'),
       staleTime: Infinity })
-  const lookupTitle = title.trim ().normalize ('NFKC').toLowerCase ()
-      .replace (/^(?:ヘルプ|手引):/, '')
+  const lookupTitle = title.trim ().normalize ('NFKC').toLowerCase ().replace (/^ヘルプ:/, '')
   const identifiers = useMemo (() => (
       (titleIndex != null && Object.hasOwn (titleIndex, lookupTitle))
       ? titleIndex[lookupTitle] : []), [titleIndex, lookupTitle])

frontend/src/pages/wiki/WikiSearchPage.tsx

@@ -8,7 +8,7 @@ import FormField from '@/components/common/FormField'
 import PageTitle from '@/components/common/PageTitle'
 import MainArea from '@/components/layout/MainArea'
 import PageHead from '@/components/common/PageHead'
-import { fetchWikiPages } from '@/lib/wiki'
+import { apiGet } from '@/lib/api'
 import { wikiKeys } from '@/lib/queryKeys'
 import { dateString, inputClass } from '@/lib/utils'
 
@@ -17,20 +17,16 @@ import type { FormEvent , FC } from 'react'
 import type { WikiPage } from '@/types'
 
 
-const WikiSearchPage: FC<{ resourceType?: WikiPage['resourceType'] }> = (
-    { resourceType = 'tag_description' },
-) => {
+const WikiSearchPage: FC = () => {
   const { message, label } = useUITranslation ('shared')
   const locale = useLocale ()
-  const heading =
-      resourceType === 'tag_group'
-      ? 'navigation:tagGroups' : 'navigation:tagDescriptions'
   const [title, setTitle] = useState ('')
   const [text, setText] = useState ('')
   const [submittedTitle, setSubmittedTitle] = useState ('')
   const { data: results = [], refetch } = useQuery ({
-      queryKey: wikiKeys.index ({ title: submittedTitle, resourceType }, locale),
-      queryFn: () => fetchWikiPages ({ title: submittedTitle, resourceType }, locale) })
+      queryKey: wikiKeys.index ({ title: submittedTitle }, locale),
+      queryFn: () => apiGet<WikiPage[]> ('/wiki', {
+	  locale, params: { title: submittedTitle } }) })
 
   const handleSearch = (ev: FormEvent) => {
     ev.preventDefault ()
@@ -46,10 +42,10 @@ const WikiSearchPage: FC<{ resourceType?: WikiPage['resourceType'] }> = (
 
   return (
       <MainArea>
-	<PageHead title={message (heading)}/>
+	<PageHead title={message ('navigation:wiki')}/>
 
 	<div className="max-w-xl">
-	  <PageTitle>{label (heading)}</PageTitle>
+	  <PageTitle>{label ('navigation:wiki')}</PageTitle>
 	  <form onSubmit={handleSearch} className="space-y-2">
 	    {/* タイトル */}
 	    <FormField label={label ('labels.title')}>