AI: address review on PR #460

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 = matching_names(TagName.where(language_code: locale.language_code),
+    registered = TagName.where(language_code: locale.language_code, name: names)
-        names, 'tag_names.name', :tag_id).to_h
+        .pluck(: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,25 +19,12 @@ class PostTagSearch
 
   def self.references_for(locale, literals)
     names = literals.map { _1[:name] }.uniq
-    internal = matching_names(TagName.where(language_code: locale.language_code),
+    internal = TagName.where(language_code: locale.language_code, name: names)
-        names, 'tag_names.name', :tag_id).group_by(&:first)
+        .pluck(:name, :tag_id).group_by(&:first)
-    external = matching_names(ExternalTag.all, names,
+    external = names.empty? ? {} : ExternalTag.where(
-        "CONCAT(external_tags.platform, ':', external_tags.name)", :id).group_by(&:first)
+        "CONCAT(platform, ':', name) IN (?)", names)
+        .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,25 +206,6 @@ 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' }
 
@@ -285,26 +266,6 @@ 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/server.ssr.test.mjs

@@ -2,6 +2,7 @@ import assert from 'node:assert/strict'
 import { createServer } from 'node:http'
 import { spawn } from 'node:child_process'
 import { after, before, test } from 'node:test'
+import { JSDOM } from 'jsdom'
 import { createServer as createViteServer } from 'vite'
 
 import { render } from './dist/server/entry-server.js'
@@ -402,6 +403,26 @@ test ('every canonical screen route returns page HTML without JavaScript', async
   }
 })
 
+test ('SSR HTML head includes reciprocal hreflang links with query parameters', async () => {
+  for (const locale of ['ja', 'ain-Kana']) {
+    const response = await fetch (`${httpOrigin}/${locale}/posts?page=2&limit=50`)
+    assert.equal (response.status, 200)
+    const dom = new JSDOM (await response.text ())
+    try
+    {
+      const links = [...dom.window.document.head.querySelectorAll ('link[rel="alternate"]')]
+      assert.deepEqual (links.map (link => ({
+        locale: link.getAttribute ('hreflang'), href: link.getAttribute ('href') })), [
+        { locale: 'ja', href: `${origin}/ja/posts?page=2&limit=50` },
+        { locale: 'ain-Kana', href: `${origin}/ain-Kana/posts?page=2&limit=50` }])
+    }
+    finally
+    {
+      dom.window.close ()
+    }
+  }
+})
+
 test ('YouTube posts return HTTP 200 with the embed rendered by SSR', async t => {
   for (const locale of ['ja', 'ain-Kana']) {
     await t.test (locale, async () => {

frontend/src/entry-server.tsx

@@ -1,6 +1,6 @@
 import { QueryClient, QueryClientProvider, dehydrate, skipToken } from '@tanstack/react-query'
 import { PassThrough } from 'node:stream'
-import { renderToPipeableStream } from 'react-dom/server'
+import { renderToPipeableStream, renderToStaticMarkup } from 'react-dom/server'
 import { HelmetProvider } from 'react-helmet-async'
 import { I18nextProvider } from 'react-i18next'
 import { createStaticHandler, createStaticRouter,
@@ -9,7 +9,7 @@ import { createStaticHandler, createStaticRouter,
 import { AppFrame, appRoutes, resolvePageRoute } from '@/App'
 import { apiGet, isApiError } from '@/lib/api'
 import { createUII18n } from '@/lib/i18n'
-import { fetchLocales, isLocaleCode, legacyLocalePath } from '@/lib/locales'
+import { fetchLocales, isLocaleCode, legacyLocalePath, switchLocalePath } from '@/lib/locales'
 import { localesKeys, sessionKeys } from '@/lib/queryKeys'
 import { withRenderContext } from '@/lib/renderContext.server'
 
@@ -171,8 +171,26 @@ export const render = async (
 	}))
       }
       const helmet = helmetContext.helmet!
+      const alternates = status === 200 && known != null
+	  ? await Promise.all (locales.locales.map (entry => entry.code)
+	      .filter (isLocaleCode)
+	      .filter (code => known.route.handle?.locale == null
+		  || known.route.handle.locale === code)
+	      .map (async targetLocale => {
+		const location = { pathname: url.pathname, search: url.search, hash: '' }
+		const path = targetLocale === locale
+		    ? url.pathname + url.search
+		    : (known.route.handle?.switchLocale != null
+		       ? await known.route.handle.switchLocale ({
+			   location, params: known.params, locale, targetLocale })
+		       : switchLocalePath (location, targetLocale))
+		return <link key={targetLocale} rel="alternate" hrefLang={targetLocale}
+		    href={new URL (path, origin).href}/>
+	      }))
+	  : []
       const head = [helmet.title, helmet.meta, helmet.link, helmet.style]
 	  .map (entry => entry.toString ()).join ('')
+	  + renderToStaticMarkup (<>{alternates}</>)
       const dehydrated = dehydrate (client, { shouldDehydrateQuery: query =>
 	  query.state.status !== 'pending'
 	  && query.meta?.clientOnly !== true