Merge branch 'main' into feature/485

このコミットが含まれているのは:
2026-11-23 02:50:43 +09:00
コミット aa8841feb2
6個のファイルの変更、279行の追加、63行の削除
+4 -2
ファイルの表示
@@ -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)
+2 -2
ファイルの表示
@@ -46,8 +46,8 @@ class PostsController < ApplicationController
:tag_names, :tag_descriptions] }])
.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
+65 -58
ファイルの表示
@@ -9,8 +9,8 @@ class TagsController < ApplicationController
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
@@ -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'
@@ -218,63 +219,16 @@ class TagsController < ApplicationController
locale = resolve_locale!
q = params[:q].to_s.strip.sub(/\Anot:/i, '')
prefix = "#{ ActiveRecord::Base.sanitize_sql_like(q) }%"
literal = ActiveRecord::Base.sanitize_sql_like(q).tr('*?', '%_')
nico = bool?(:nico, default: true)
present = bool?(:present, default: true)
with_nico = bool?(:nico, default: true)
present_only = bool?(:present, default: true)
alias_rows =
TagName
.where(language_code: locale.language_code, primary_flg: false)
.where('name LIKE ?', prefix)
.pluck(:tag_id, :name)
matched_alias_by_tag_id = { }
tag_ids = []
alias_rows.each do |tag_id, alias_name|
tag_ids << tag_id
matched_alias_by_tag_id[tag_id] ||= alias_name
rows = autocomplete_rows(locale:, pattern: "#{ literal }%", nico:, present:)
if rows.length < 20 && q.present?
partial_rows = autocomplete_rows(locale:, pattern: "%#{ literal }%", nico:, present:)
rows = (rows + partial_rows).uniq { [_1['category'], _1['id']] }.first(20)
end
base =
Tag
.joins(:tag_names)
.preload(:tag_names, :materials, :deerjikists, :tag_descriptions,
parents: [:tag_names, :materials, :deerjikists, :tag_descriptions])
.where(tag_names: { language_code: locale.language_code, primary_flg: true },
deprecated_at: nil)
base = base.where('tags.post_count > 0') if present_only
canonical_hit = base.where('tag_names.name LIKE ?', prefix)
internal_tags = canonical_hit.or(base.where(id: tag_ids.uniq))
internal_rows =
internal_tags
.order(Arel.sql('tags.post_count DESC, tag_names.name'))
.limit(20)
.map { |tag|
TagRepr.base(tag, language_code: locale.language_code)
.merge(matched_alias: matched_alias_by_tag_id[tag.id])
}
return render json: internal_rows unless with_nico
external_base = ExternalTag.all
external_base = external_base.where('post_count > 0') if present_only
external_rows =
external_base
.where("CONCAT(platform, ':', name) LIKE ? OR name LIKE ?", prefix, prefix)
.order(post_count: :desc, name: :asc)
.limit(20)
.map { external_tag_json(_1) }
rows =
(internal_rows + external_rows)
.sort_by { |row| [-row['post_count'], row['name'] || row[:name]] }
.first(20)
render json: rows
end
@@ -545,6 +499,59 @@ class TagsController < ApplicationController
private
def autocomplete_rows locale:, pattern:, nico:, present:
alias_rows =
TagName
.where(language_code: locale.language_code, primary_flg: false)
.where('name LIKE ?', pattern)
.pluck(:tag_id, :name)
matched_alias_by_tag_id = { }
tag_ids = []
alias_rows.each do |tag_id, alias_name|
tag_ids << tag_id
matched_alias_by_tag_id[tag_id] ||= alias_name
end
base =
Tag
.joins(:tag_names)
.preload(:tag_names, :materials, :deerjikists, :tag_descriptions,
parents: [:tag_names, :materials, :deerjikists, :tag_descriptions])
.where(tag_names: { language_code: locale.language_code, primary_flg: true },
deprecated_at: nil)
base = base.where('tags.post_count > 0') if present
canonical_hit = base.where('tag_names.name LIKE ?', pattern)
internal_tags = canonical_hit.or(base.where(id: tag_ids.uniq))
internal_rows =
internal_tags
.order(Arel.sql('tags.post_count DESC, tag_names.name'))
.limit(20)
.map { |tag|
TagRepr.base(tag, language_code: locale.language_code)
.merge(matched_alias: matched_alias_by_tag_id[tag.id])
}
return internal_rows unless nico
external_base = ExternalTag.all
external_base = external_base.where('post_count > 0') if present
external_rows =
external_base
.where("CONCAT(platform, ':', name) LIKE ? OR name LIKE ?", pattern, pattern)
.order(post_count: :desc, name: :asc)
.limit(20)
.map { external_tag_json(_1) }
(internal_rows + external_rows)
.sort_by { |row| [-row['post_count'], row['name'] || row[:name]] }
.first(20)
end
def material_filter_param default:
value = params[:material_filter].to_s.presence
return default unless ['present', 'missing', 'any'].include?(value)
+50
ファイルの表示
@@ -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)
+39
ファイルの表示
@@ -516,6 +516,45 @@ RSpec.describe 'Posts API', type: :request do
end
end
[:title, :url].each do |field|
context "when #{field} contains wildcards" do
let!(:search_posts) do
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" :
"https://example.com/title-search-#{index}")
end
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],
'needle%25_*end' => [5]
}.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) }
+119 -1
ファイルの表示
@@ -39,6 +39,46 @@ RSpec.describe 'Tags API', type: :request do
end
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
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)
@@ -439,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, 3],
'wild?end' => [1, 3],
'not:wild?end' => [1, 3],
'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,
@@ -482,6 +557,7 @@ RSpec.describe 'Tags API', type: :request do
create(:tag, category: :general, primary_name: name, post_count: 1)
create(:external_tag, name:, post_count: 1)
end
create(:external_tag, name: 'suffix_combined', post_count: 100)
get '/tags/autocomplete', params: { q: 'combined' }
@@ -490,6 +566,40 @@ RSpec.describe 'Tags API', type: :request do
expect(json.map { |row| row.fetch('name') }).to eq(expected.first(20))
end
it 'appends primary, alias, and external partial matches without duplicate resources' do
prefix = create(:tag, primary_name: 'tail', post_count: 1)
create(:tag_name, :alias, name: 'tail_alias', tag: prefix)
create(:tag_name, :alias, name: 'alias_tail', tag: prefix)
create(:tag, primary_name: 'primary_tail', post_count: 4)
alias_target = create(:tag, primary_name: 'alias_target', post_count: 3)
create(:tag_name, :alias, name: 'middle_tail_alias', tag: alias_target)
external = create(:external_tag, id: prefix.id, name: 'external_tail', post_count: 5)
create(:tag, primary_name: 'middle_tail_only', post_count: 100)
create(:external_tag, name: 'middle_tail_only', post_count: 100)
get '/tags/autocomplete', params: { q: 'tail' }
expect(response).to have_http_status(:ok)
expect(json.map { |row| row.fetch('name') }).to eq(
['tail', 'middle_tail_only', 'nico:middle_tail_only',
'nico:external_tail', 'primary_tail', 'alias_target'])
expect(json.first.fetch('matched_alias')).to eq('tail_alias')
expect(json.last.fetch('matched_alias')).to eq('middle_tail_alias')
expect(json[3]).to include('id' => external.id, 'category' => 'nico')
end
it 'fills only the remaining places with partial matches' do
names = 19.times.map { |number| "capacity_#{ number.to_s.rjust(2, '0') }" }
names.each { create(:tag, primary_name: _1, post_count: 1) }
create(:tag, primary_name: 'first_capacity_match', post_count: 3)
create(:external_tag, name: 'second_capacity_match', post_count: 2)
get '/tags/autocomplete', params: { q: 'capacity' }
expect(response).to have_http_status(:ok)
expect(json.map { |row| row.fetch('name') }).to eq(names + ['first_capacity_match'])
end
it 'excludes external tags but preserves internal alias matches when nico is false' do
internal = create(:tag, category: :general, primary_name: 'switch_internal', post_count: 1)
alias_target = create(:tag, category: :general, primary_name: 'alias_target', post_count: 1)
@@ -518,12 +628,20 @@ RSpec.describe 'Tags API', type: :request do
create(:external_tag, name: literal, post_count: 1)
create(:tag, category: :general, primary_name: 'literalXmatch', post_count: 2)
create(:external_tag, name: 'literalXmatch', post_count: 2)
suffix = "suffix_literal#{ wildcard }"
create(:tag, primary_name: suffix, post_count: 1)
suffix_alias = create(:tag, primary_name: 'suffix_alias_target', post_count: 1)
create(:tag_name, :alias, name: "alias_#{ suffix }", tag: suffix_alias)
create(:external_tag, name: suffix, post_count: 1)
create(:tag, primary_name: 'suffix_literalX', post_count: 2)
create(:external_tag, name: 'suffix_literalX', post_count: 2)
get '/tags/autocomplete', params: { q: "literal#{ wildcard }" }
expect(json.map { |row| row.fetch('name') })
.to contain_exactly(
literal, primary_tag_name_for(alias_target, 'ja').name, "nico:#{ literal }")
literal, primary_tag_name_for(alias_target, 'ja').name, "nico:#{ literal }",
suffix, 'suffix_alias_target', "nico:#{ suffix }")
end
end