From f0065af00a123df1bd8a7b44447b5951eb19a028 Mon Sep 17 00:00:00 2001 From: miteruzo Date: Mon, 23 Mar 2026 12:19:16 +0900 Subject: [PATCH 1/7] #279 --- backend/app/controllers/tags_controller.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/backend/app/controllers/tags_controller.rb b/backend/app/controllers/tags_controller.rb index 9652f18..45a1e33 100644 --- a/backend/app/controllers/tags_controller.rb +++ b/backend/app/controllers/tags_controller.rb @@ -2,8 +2,8 @@ class TagsController < ApplicationController def index post_id = params[:post] - name = params[:name].presence - category = params[:category].presence + name = params[:name].to_s.strip.presence + category = params[:category].to_s.strip.presence post_count_between = (params[:post_count_gte].presence || -1).to_i, (params[:post_count_lte].presence || -1).to_i post_count_between[0] = nil if post_count_between[0] < 0 @@ -36,7 +36,9 @@ class TagsController < ApplicationController .includes(:tag_name, tag_name: :wiki_page) q = q.where(posts: { id: post_id }) if post_id.present? - q = q.where('tag_names.name LIKE ?', "%#{ name }%") if name + if name + q = q.where('tag_names.name LIKE ?', "%#{ ActiveRecord::Base.sanitize_sql_like(name) }%") + end q = q.where(category: category) if category q = q.where('tags.post_count >= ?', post_count_between[0]) if post_count_between[0] q = q.where('tags.post_count <= ?', post_count_between[1]) if post_count_between[1] @@ -77,7 +79,7 @@ class TagsController < ApplicationController alias_rows = TagName - .where('name LIKE ?', "#{ q }%") + .where('name LIKE ?', "#{ ActiveRecord::Base.sanitize_sql_like(q) }%") .where.not(canonical_id: nil) .pluck(:canonical_id, :name) @@ -97,7 +99,8 @@ class TagsController < ApplicationController base .where(((with_nico ? '(tags.category = ? AND tag_names.name LIKE ?) OR ' : '') + 'tag_names.name LIKE ?'), - *(with_nico ? ['nico', "nico:#{ q }%"] : []), "#{ q }%") + *(with_nico ? ['nico', "nico:#{ ActiveRecord::Base.sanitise_sql_like(q) }%"] : []), + "#{ ActiveRecord::Base.sanitise_sql_like(q) }%") tags = if canonical_ids.present? -- 2.53.0 From 2d455f691418e4011fb5060cba6cdfea4d21f0bd Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Mon, 16 Nov 2026 00:57:37 +0900 Subject: [PATCH 2/7] WIP: preserve failed Codex job issue-279-19j8bk0h --- backend/app/controllers/posts_controller.rb | 4 +-- backend/spec/requests/posts_spec.rb | 29 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/backend/app/controllers/posts_controller.rb b/backend/app/controllers/posts_controller.rb index 74d720c..5546f3c 100644 --- a/backend/app/controllers/posts_controller.rb +++ b/backend/app/controllers/posts_controller.rb @@ -47,8 +47,8 @@ class PostsController < ApplicationController .preload(tags: { tag_name: :wiki_page }) .with_attached_thumbnail - q = q.where('posts.url LIKE ?', "%#{ url }%") if url - q = q.where('posts.title LIKE ?', "%#{ title }%") if title + q = q.where('posts.url LIKE ?', "%#{ Post.sanitize_sql_like(url).tr('*?', '%_') }%") if url + q = q.where('posts.title LIKE ?', "%#{ Post.sanitize_sql_like(title).tr('*?', '%_') }%") if title if original_created_from q = q.where('posts.original_created_before > ?', original_created_from) end diff --git a/backend/spec/requests/posts_spec.rb b/backend/spec/requests/posts_spec.rb index 120a221..c5c0f04 100644 --- a/backend/spec/requests/posts_spec.rb +++ b/backend/spec/requests/posts_spec.rb @@ -287,6 +287,35 @@ RSpec.describe 'Posts API', type: :request do end end + [:title, :url].each do |field| + context "when #{field} contains wildcards" do + let!(:search_posts) do + ['needle%25end', 'needleX25end', 'needle_end', 'needleXend', 'needleABend'].map do |value| + Post.create!(uploaded_user: user, title: "prefix #{value} suffix", + url: "https://example.com/prefix-#{value}-suffix") + end + end + + { + 'needle%25end' => [0], + 'needle_end' => [2], + 'needle*end' => [0, 1, 2, 3, 4], + 'needle?end' => [2, 3], + 'needle%*end' => [0], + 'needle_?nd' => [2] + }.each do |query, expected_indices| + it "matches #{query.inspect} using only * and ? as wildcards" do + get '/posts', params: { field => query } + + expect(response).to have_http_status(:ok) + expected_ids = expected_indices.map { |i| search_posts[i].id } + expect(json.fetch('posts').map { |p| p['id'] }).to match_array(expected_ids) + expect(json.fetch('count')).to eq(expected_ids.size) + end + end + end + end + context 'when created_from/created_to are provided' do let(:t_created_hit) { Time.zone.local(2010, 1, 5, 12, 0, 0) } let(:t_created_miss) { Time.zone.local(2012, 1, 5, 12, 0, 0) } -- 2.53.0 From a1baaeb340e49a5ebd2b0af6476de480d5e632a6 Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Fri, 20 Nov 2026 00:03:36 +0900 Subject: [PATCH 3/7] WIP: preserve failed Codex job issue-279-kofyff8r --- backend/spec/requests/posts_spec.rb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/backend/spec/requests/posts_spec.rb b/backend/spec/requests/posts_spec.rb index c5c0f04..bdea3af 100644 --- a/backend/spec/requests/posts_spec.rb +++ b/backend/spec/requests/posts_spec.rb @@ -290,19 +290,23 @@ RSpec.describe 'Posts API', type: :request do [:title, :url].each do |field| context "when #{field} contains wildcards" do let!(:search_posts) do - ['needle%25end', 'needleX25end', 'needle_end', 'needleXend', 'needleABend'].map do |value| - Post.create!(uploaded_user: user, title: "prefix #{value} suffix", - url: "https://example.com/prefix-#{value}-suffix") + ['needle%25end', 'needleX25end', 'needle_end', 'needleXend', 'needleABend', 'needle%25_end'].map.with_index do |value, index| + Post.create!(uploaded_user: user, + title: field == :title ? "prefix #{value} suffix" : 'url search post', + url: field == :url ? "https://example.com/prefix-#{value}-suffix" : + "https://example.com/title-search-#{index}") end end { 'needle%25end' => [0], 'needle_end' => [2], - 'needle*end' => [0, 1, 2, 3, 4], + 'needle*end' => [0, 1, 2, 3, 4, 5], 'needle?end' => [2, 3], - 'needle%*end' => [0], - 'needle_?nd' => [2] + 'needle%*end' => [0, 5], + 'needle_?nd' => [2], + 'needle%25_end' => [5], + 'needle%25_*end' => [5] }.each do |query, expected_indices| it "matches #{query.inspect} using only * and ? as wildcards" do get '/posts', params: { field => query } -- 2.53.0 From d58c2177fc8a0e09bdd67bfa618ea85a870d54a3 Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Fri, 20 Nov 2026 00:42:07 +0900 Subject: [PATCH 4/7] WIP: unverified Codex job issue-279-zx1ujxvr --- backend/spec/requests/posts_spec.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/backend/spec/requests/posts_spec.rb b/backend/spec/requests/posts_spec.rb index 0428552..907e981 100644 --- a/backend/spec/requests/posts_spec.rb +++ b/backend/spec/requests/posts_spec.rb @@ -519,7 +519,10 @@ RSpec.describe 'Posts API', type: :request do [:title, :url].each do |field| context "when #{field} contains wildcards" do let!(:search_posts) do - ['needle%25end', 'needleX25end', 'needle_end', 'needleXend', 'needleABend', 'needle%25_end'].map.with_index do |value, index| + values = [ + 'needle%25end', 'needleX25end', 'needle_end', + 'needleXend', 'needleABend', 'needle%25_end'] + values.map.with_index do |value, index| Post.create!(uploaded_user: user, title: field == :title ? "prefix #{value} suffix" : 'url search post', url: field == :url ? "https://example.com/prefix-#{value}-suffix" : @@ -528,10 +531,13 @@ RSpec.describe 'Posts API', type: :request do end { + '%' => [0, 5], + '_' => [2, 5], 'needle%25end' => [0], 'needle_end' => [2], 'needle*end' => [0, 1, 2, 3, 4, 5], 'needle?end' => [2, 3], + 'needle??end' => [4], 'needle%*end' => [0, 5], 'needle_?nd' => [2], 'needle%25_end' => [5], -- 2.53.0 From a1ec74c6d9d53e31728baf784a1f4020d0fb05e5 Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Fri, 20 Nov 2026 02:06:25 +0900 Subject: [PATCH 5/7] WIP: unverified Codex job issue-279-k4skc3rg --- .../app/controllers/nico_tags_controller.rb | 6 ++- backend/app/controllers/tags_controller.rb | 5 +- backend/spec/requests/nico_tags_spec.rb | 50 +++++++++++++++++++ backend/spec/requests/tags_spec.rb | 38 ++++++++++++++ 4 files changed, 95 insertions(+), 4 deletions(-) diff --git a/backend/app/controllers/nico_tags_controller.rb b/backend/app/controllers/nico_tags_controller.rb index 902358d..6bf49aa 100644 --- a/backend/app/controllers/nico_tags_controller.rb +++ b/backend/app/controllers/nico_tags_controller.rb @@ -28,17 +28,19 @@ class NicoTagsController < ApplicationController 'ON post_tag_max.external_tag_id = external_tags.id') .includes(linked_tags: [:tag_names, :tag_descriptions]) if name + name_pattern = ExternalTag.sanitize_sql_like(name).tr('*?', '%_') q = q.where(('external_tags.name LIKE ? ' + "OR CONCAT(external_tags.platform, ':', external_tags.name) LIKE ?"), - "%#{ name }%", "%#{ name }") + "%#{ name_pattern }%", "%#{ name_pattern }") end if linked_tag + linked_tag_pattern = "%#{ Tag.sanitize_sql_like(linked_tag).tr('*?', '%_') }%" linked_tag_ids = Tag .joins(:tag_names) .where(tag_names: { language_code: locale.language_code, primary_flg: true }) - .where('tag_names.name LIKE ?', "%#{ linked_tag }%") + .where('tag_names.name LIKE ?', linked_tag_pattern) .pluck(:id) linked_nico_tag_ids = NicoTagRelation.where(tag_id: linked_tag_ids).pluck(:nico_tag_id) q = q.where(id: linked_nico_tag_ids) diff --git a/backend/app/controllers/tags_controller.rb b/backend/app/controllers/tags_controller.rb index 65a9de1..5730ac4 100644 --- a/backend/app/controllers/tags_controller.rb +++ b/backend/app/controllers/tags_controller.rb @@ -56,10 +56,11 @@ class TagsController < ApplicationController end if name - tags = tags.where('tag_names.name LIKE ?', "%#{ name }%") + name_pattern = "%#{ Tag.sanitize_sql_like(name).tr('*?', '%_') }%" + tags = tags.where('tag_names.name LIKE ?', name_pattern) external_tags = external_tags.where("CONCAT(external_tags.platform, ':', external_tags.name) LIKE ?", - "%#{ name }%") + name_pattern) end if category == 'nico' diff --git a/backend/spec/requests/nico_tags_spec.rb b/backend/spec/requests/nico_tags_spec.rb index 264f844..dd32b98 100644 --- a/backend/spec/requests/nico_tags_spec.rb +++ b/backend/spec/requests/nico_tags_spec.rb @@ -3,6 +3,56 @@ require 'rails_helper' RSpec.describe 'NicoTags', type: :request do describe 'GET /tags/nico' do + [:name, :linked_tag].each do |field| + context "when #{ field } contains wildcards" do + let!(:search_tags) do + names = ['wild%end', 'wild_end', 'wildXend', 'wildABend', 'wild%_end'] + names.map.with_index do |name, index| + if field == :name + create(:external_tag, name:) + else + destination = create(:tag, primary_name: name) + external = create(:external_tag, name: "wild-linked-#{ index }") + NicoTagRelation.create!(nico_tag: external, tag: destination) + external + end + end + end + + { + '%' => [0, 4], + '_' => [1, 4], + 'wild%end' => [0], + 'wild_end' => [1], + 'wild*end' => [0, 1, 2, 3, 4], + 'wild?end' => [0, 1, 2], + 'wild??end' => [3, 4], + 'wild%*end' => [0, 4], + 'wild_?nd' => [1], + 'wild%?end' => [4] }.each do |query, indices| + it "filters #{ field } with #{ query.inspect }" do + get '/tags/nico', params: { field => query } + + expected_ids = indices.map { |index| search_tags[index].id } + expect(response).to have_http_status(:ok) + expect(json.fetch('tags').pluck('id')).to match_array(expected_ids) + expect(json.fetch('count')).to eq(expected_ids.size) + end + end + end + end + + it 'supports wildcards in qualified external names' do + external = create(:external_tag, name: 'qualified_end') + create(:external_tag, name: 'qualifiedABend') + + get '/tags/nico', params: { name: 'nico:qualified?end' } + + expect(response).to have_http_status(:ok) + expect(json.fetch('tags').pluck('id')).to eq([external.id]) + expect(json.fetch('count')).to eq(1) + end + it 'returns the legacy Tag-compatible external fields' do external = create(:external_tag, name: 'legacy_external', post_count: 3) diff --git a/backend/spec/requests/tags_spec.rb b/backend/spec/requests/tags_spec.rb index 7a66889..1fe8b07 100644 --- a/backend/spec/requests/tags_spec.rb +++ b/backend/spec/requests/tags_spec.rb @@ -39,6 +39,44 @@ RSpec.describe 'Tags API', type: :request do end describe 'GET /tags' do + context 'when the name contains wildcards' do + let(:names) do + ['wild%end', 'wild_end', 'wildXend', 'wildABend', 'wild%_end'] + end + + before do + names.each do |name| + create(:tag, primary_name: name) + create(:external_tag, name:) + end + end + + { + '%' => [0, 4], + '_' => [1, 4], + 'wild%end' => [0], + 'wild_end' => [1], + 'wild*end' => [0, 1, 2, 3, 4], + 'wild?end' => [0, 1, 2], + 'wild??end' => [3, 4], + 'wild%*end' => [0, 4], + 'wild_?nd' => [1], + 'wild%?end' => [4], + 'nico:wild?end' => [0, 1, 2] }.each do |query, indices| + it "filters internal and external names with #{ query.inspect }" do + get '/tags', params: { name: query } + + expected_names = indices.flat_map do |index| + name = names[index] + query.start_with?('nico:') ? ["nico:#{ name }"] : [name, "nico:#{ name }"] + end + expect(response).to have_http_status(:ok) + expect(response_names).to match_array(expected_names) + expect(json.fetch('count')).to eq(expected_names.size) + end + end + end + it 'serialises descriptions and parents without loading legacy Wiki pages' do TagDescription.create!(tag:, language_code: 'ja', body: '', version_no: 1) TagDescription.create!(tag: tag2, language_code: 'ja', body: '', version_no: 1) -- 2.53.0 From 743c19cfa31bc49ab727b8f08d6c8e9d4994c55c Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Sat, 21 Nov 2026 01:16:18 +0900 Subject: [PATCH 6/7] AI: address issue #279 --- backend/spec/requests/tags_spec.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/spec/requests/tags_spec.rb b/backend/spec/requests/tags_spec.rb index 1fe8b07..988c87d 100644 --- a/backend/spec/requests/tags_spec.rb +++ b/backend/spec/requests/tags_spec.rb @@ -40,6 +40,8 @@ RSpec.describe 'Tags API', type: :request do describe 'GET /tags' do context 'when the name contains wildcards' do + let!(:tn) { create(:tag_name, name: 'background-tag') } + let(:names) do ['wild%end', 'wild_end', 'wildXend', 'wildABend', 'wild%_end'] end -- 2.53.0 From 6ca18a1f48dd49e8a40a6decfe4d605e92bfbe99 Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Mon, 23 Nov 2026 00:25:10 +0900 Subject: [PATCH 7/7] AI: address review on PR #488 --- backend/app/controllers/tags_controller.rb | 2 +- backend/spec/requests/tags_spec.rb | 35 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/backend/app/controllers/tags_controller.rb b/backend/app/controllers/tags_controller.rb index 5730ac4..15ef924 100644 --- a/backend/app/controllers/tags_controller.rb +++ b/backend/app/controllers/tags_controller.rb @@ -219,7 +219,7 @@ class TagsController < ApplicationController locale = resolve_locale! q = params[:q].to_s.strip.sub(/\Anot:/i, '') - prefix = "#{ ActiveRecord::Base.sanitize_sql_like(q) }%" + prefix = "#{ ActiveRecord::Base.sanitize_sql_like(q).tr('*?', '%_') }%" with_nico = bool?(:nico, default: true) present_only = bool?(:present, default: true) diff --git a/backend/spec/requests/tags_spec.rb b/backend/spec/requests/tags_spec.rb index 988c87d..da16111 100644 --- a/backend/spec/requests/tags_spec.rb +++ b/backend/spec/requests/tags_spec.rb @@ -479,6 +479,41 @@ RSpec.describe 'Tags API', type: :request do end describe 'GET /tags/autocomplete' do + context 'when q contains wildcards' do + let(:names) { ['wildend', 'wildXend', 'wildABend', 'otherwildXend'] } + + before do + names.each_with_index do |name, index| + create(:tag, primary_name: name, post_count: 1) + alias_target = create(:tag, primary_name: "target_#{ index }", post_count: 1) + create(:tag_name, :alias, name: "#{ name }_alias", tag: alias_target) + create(:external_tag, name:, post_count: 1) + end + end + + { + 'wild*end' => [0, 1, 2], + 'wild?end' => [1], + 'not:wild?end' => [1], + 'nico:wild?end' => [1] }.each do |query, indices| + it "matches primary, alias, and external names with #{ query.inspect }" do + get '/tags/autocomplete', params: { q: query } + + expected_names = indices.flat_map do |index| + name = names[index] + query.start_with?('nico:') ? ["nico:#{ name }"] : + [name, "target_#{ index }", "nico:#{ name }"] + end + expect(response).to have_http_status(:ok) + expect(json.map { |row| row.fetch('name') }).to match_array(expected_names) + unless query.start_with?('nico:') + row = json.find { |item| item.fetch('name') == "target_#{ indices.first }" } + expect(row.fetch('matched_alias')).to eq("#{ names[indices.first] }_alias") + end + end + end + end + it 'combines internal and external matches without conflating equal ids' do internal = create(:tag, category: :general, primary_name: 'mixed_internal', post_count: 2) external = create(:external_tag, id: internal.id, -- 2.53.0