コミットを比較

..
5 コミット
作成者 SHA1 メッセージ 日付
Codex Night Worker 24ccdae1c9 AI: address review on PR #456 2026-11-14 16:59:10 +09:00
Codex Night Worker 3663af3f48 AI: address review on PR #456 2026-11-14 16:27:36 +09:00
Codex Night Worker 97e44b84f8 AI: address review on PR #456 2026-11-14 16:07:49 +09:00
Codex Night Worker 1627450835 AI: address review on PR #456 2026-11-12 00:26:56 +09:00
Codex Night Worker ab0e28576d AI: address issue #454 2026-11-11 21:48:08 +09:00
5個のファイルの変更、27行の追加、62行の削除
+7 -20
ファイルの表示
@@ -3,8 +3,8 @@ class PostTagSearch
def self.literals(locale, raw) def self.literals(locale, raw)
tokens = raw.split.reject { _1.downcase == 'type:or' } tokens = raw.split.reject { _1.downcase == 'type:or' }
names = tokens.map { _1.sub(/\Anot:/i, '') } 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, primary = TagName.where(language_code: locale.language_code,
tag_id: registered.values, primary_flg: true).pluck(:tag_id, :name).to_h tag_id: registered.values, primary_flg: true).pluck(:tag_id, :name).to_h
tokens.zip(names).map do |token, name| tokens.zip(names).map do |token, name|
@@ -19,25 +19,12 @@ class PostTagSearch
def self.references_for(locale, literals) def self.references_for(locale, literals)
names = literals.map { _1[:name] }.uniq 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, names.to_h { |name| [name, [internal.fetch(name, []).map(&:last).uniq,
external.fetch(name, []).map(&:last).uniq]] } external.fetch(name, []).map(&:last).uniq]] }
end 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 end
-39
ファイルの表示
@@ -206,25 +206,6 @@ RSpec.describe 'Posts API', type: :request do
end end
context 'when q is provided' do 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 it 'filters posts by q (hit case)' do
get '/posts', params: { tags: 'spec_tag' } get '/posts', params: { tags: 'spec_tag' }
@@ -285,26 +266,6 @@ RSpec.describe 'Posts API', type: :request do
PostExternalTag.create!(post: miss_post, external_tag:) PostExternalTag.create!(post: miss_post, external_tag:)
end 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 it 'keeps internal name searches independent of colliding external ids' do
get '/posts', params: { tags: primary_tag_name_for(tag, 'ja').name } get '/posts', params: { tags: primary_tag_name_for(tag, 'ja').name }
+10
ファイルの表示
@@ -70,6 +70,16 @@ describe ('SidebarComponent', () => {
vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true) vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true)
}) })
it ('limits sidebar scrolling to desktop to avoid clipping mobile suggestions', () => {
renderSidebar ()
// jsdom has no layout; guard the responsive classes responsible for clipping.
const sidebar = screen.getByText ('Sidebar body')
expect (sidebar).not.toHaveClass ('overflow-y-auto')
expect (sidebar).toHaveClass ('md:overflow-y-auto')
})
it ('uses maxWidth without applying the container main-width reserve twice', async () => { it ('uses maxWidth without applying the container main-width reserve twice', async () => {
localStorage.setItem ('sidebar:test-sidebar:left:width', '700') localStorage.setItem ('sidebar:test-sidebar:left:width', '700')
const onWidthChange = vi.fn () const onWidthChange = vi.fn ()
+1 -1
ファイルの表示
@@ -339,7 +339,7 @@ const SidebarComponent: FC<Props> = ({
</style> </style>
</Helmet> </Helmet>
<div className="h-full overflow-y-auto p-4 sidebar"> <div className="h-full md:overflow-y-auto p-4 sidebar">
{children} {children}
</div> </div>
+9 -2
ファイルの表示
@@ -35,6 +35,10 @@ const renderPage = () =>
describe ('TagDetailPage', () => { describe ('TagDetailPage', () => {
beforeEach (() => { beforeEach (() => {
vi.clearAllMocks () vi.clearAllMocks ()
tagsApi.fetchTag.mockReset ()
api.apiPut.mockReset ()
api.isApiError.mockReset ()
toastApi.toast.mockReset ()
api.isApiError.mockReturnValue (false) api.isApiError.mockReturnValue (false)
}) })
@@ -51,8 +55,11 @@ describe ('TagDetailPage', () => {
}) })
it ('submits edited tag fields', async () => { it ('submits edited tag fields', async () => {
tagsApi.fetchTag.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' })) const updatedTag = buildTag ({ id: 7, name: 'new', aliases: ['alias'] })
api.apiPut.mockResolvedValueOnce (buildTag ({ id: 7, name: 'new', aliases: ['alias'] })) tagsApi.fetchTag
.mockResolvedValue (updatedTag)
.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
api.apiPut.mockResolvedValueOnce (updatedTag)
renderPage () renderPage ()