Merge branch 'main' into feature/479

このコミットが含まれているのは:
2026-11-23 03:58:34 +09:00
コミット 570846db67
19個のファイルの変更、455行の追加、139行の削除
+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)
+11 -9
ファイルの表示
@@ -37,7 +37,7 @@ class PostsController < ApplicationController
offset = (page - 1) * limit
needs_history_join = order[0] == 'updated_at' || updated_between.any?(&:present?)
history_join_required = order[0] == 'updated_at' || updated_between.any?(&:present?)
q =
filtered_posts(locale)
@@ -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
@@ -57,8 +57,8 @@ class PostsController < ApplicationController
q = q.where('posts.created_at >= ?', created_between[0]) if created_between[0]
q = q.where('posts.created_at <= ?', created_between[1]) if created_between[1]
count_scope = q
if needs_history_join
history_times = HistoryAccess.visible(PostVersion.all)
if history_join_required
history_times = PostVersion.all
.select('post_id, MAX(created_at) AS latest_at').group(:post_id)
q = q.joins("LEFT JOIN (#{ history_times.to_sql }) history_times " +
'ON history_times.post_id = posts.id')
@@ -72,7 +72,7 @@ class PostsController < ApplicationController
q = q.where("#{ updated_at_all_sql } <= ?", updated_between[1])
end
count_scope = q if updated_between.any?(&:present?)
if needs_history_join
if history_join_required
q = q.select('posts.*', "#{ updated_at_all_sql } AS updated_at")
end
@@ -92,10 +92,10 @@ class PostsController < ApplicationController
.offset(offset)
.to_a
latest_version_times =
if needs_history_join
if history_join_required
{ }
else
HistoryAccess.visible(PostVersion.where(post_id: posts.map(&:id)))
PostVersion.where(post_id: posts.map(&:id))
.group(:post_id).maximum(:created_at)
end
@@ -314,7 +314,9 @@ class PostsController < ApplicationController
def viewed
return head :unauthorized unless current_user
current_user.viewed_posts << Post.find(params[:id])
UserPostView.create_or_find_by!(
user: current_user,
post: Post.find(params[:id]))
head :no_content
end
-1
ファイルの表示
@@ -49,7 +49,6 @@ class TagDescriptionsController < ApplicationController
private
def representation description
HistoryAccess.require_current!(description, TagDescriptionVersion)
description.as_json(only: [
:tag_id,
:language_code,
+1 -1
ファイルの表示
@@ -1,7 +1,7 @@
class TagGroupsController < ApplicationController
def index
locale = resolve_locale!
groups = HistoryAccess.current(TagGroup.all, TagGroupVersion).includes(:created_by_user, :updated_by_user).order(:id)
groups = TagGroup.includes(:created_by_user, :updated_by_user).order(:id)
render json: TagGroupRepr.many(locale, groups.to_a)
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)
+17 -14
ファイルの表示
@@ -8,12 +8,11 @@ class WikiPagesController < ApplicationController
title = params[:title].to_s.strip
descriptions =
HistoryAccess.current(TagDescription.all, TagDescriptionVersion)
.where(language_code: locale.language_code)
TagDescription.where(language_code: locale.language_code)
.includes(tag: :tag_names)
descriptions = descriptions.order(updated_at: :desc, id: :asc)
tag_groups = HistoryAccess.current(TagGroup.all, TagGroupVersion).order(updated_at: :desc, id: :asc)
tag_groups = TagGroup.order(updated_at: :desc, id: :asc)
if title.present?
pattern = "%#{ ApplicationRecord.sanitize_sql_like(title) }%"
descriptions =
@@ -41,13 +40,13 @@ class WikiPagesController < ApplicationController
return head :not_found unless language.is_a?(String)
return head :not_found unless Language.exists?(code: language)
names = HistoryAccess.current(TagDescription.all, TagDescriptionVersion).joins(tag: :tag_names)
names = TagDescription.joins(tag: :tag_names)
.where(language_code: locale.language_code, tag_names: { language_code: language })
.pluck('tag_descriptions.tag_id', 'tag_descriptions.id', 'tag_names.name')
candidates = names.map do |tag_id, description_id, name|
WikiPageRepr.autolink_tag(locale, tag_id:, description_id:, name:, language:)
end
candidates.concat(HistoryAccess.current(TagGroup.all, TagGroupVersion).order(:id).pluck(:id, :name).map do |id, name|
candidates.concat(TagGroup.order(:id).pluck(:id, :name).map do |id, name|
WikiPageRepr.autolink_group(locale, id:, name:, language:)
end)
render json: candidates
@@ -309,7 +308,7 @@ class WikiPagesController < ApplicationController
else
current_group_version(group)
end
return head :not_found unless version
return head :not_found if params[:version].present? && !version
representation =
if params[:version].present?
@@ -327,20 +326,22 @@ class WikiPagesController < ApplicationController
def render_group_representation representation, version, body: nil, status: :ok
body ||= TagGroupMarkdownRenderer.render(representation)
versions = HistoryAccess.visible(TagGroupVersion.all).where(tag_group_id: version.tag_group_id)
if version
versions = HistoryAccess.visible(TagGroupVersion.all)
.where(tag_group_id: version.tag_group_id)
pred = versions.find_by(version_no: version.version_no - 1)&.id
succ = versions.find_by(version_no: version.version_no + 1)&.id
updated_at = version.created_at
end
render json: {
'id' => version.tag_group_id,
'id' => representation.fetch('id'),
'resource_type' => 'tag_group',
'title' => "#{ TagGroupRepr::PREFIX }#{ representation.fetch('name') }",
'deprecated_at' => nil,
'body' => body,
'revision_id' => version.id,
'revision_id' => version&.id,
'pred' => pred,
'succ' => succ,
'updated_at' => updated_at }, status:
'updated_at' => representation.fetch('updated_at') }, status:
rescue TagGroupMarkdownRenderer::UnsupportedStructure => error
render_unprocessable_entity(error.message)
end
@@ -395,14 +396,16 @@ class WikiPagesController < ApplicationController
historical = params[:version].present?
rev = historical ? versions.find_by(id: params[:version]) :
versions.find_by(version_no: description.version_no)
return head :not_found unless rev
return head :not_found if historical && !rev
if rev
pred = versions.find_by(version_no: rev.version_no - 1)&.id
succ = versions.find_by(version_no: rev.version_no + 1)&.id
end
body = historical ? rev.body : description.body
updated_at = historical ? rev.created_at : description.updated_at
render json: WikiPageRepr.tag_description(locale, description).merge(
body:, revision_id: rev.id, pred:, succ:, updated_at:)
body:, revision_id: rev&.id, pred:, succ:, updated_at:)
end
def description_versions description
@@ -411,7 +414,7 @@ class WikiPagesController < ApplicationController
end
def tag_description_by_title locale, title
HistoryAccess.current(TagDescription.all, TagDescriptionVersion).joins(tag: :tag_names)
TagDescription.joins(tag: :tag_names)
.find_by(language_code: locale.language_code,
tag_names: { language_code: locale.language_code, name: title })
end
-23
ファイルの表示
@@ -133,29 +133,6 @@ class HistoryAccess < ActiveSupport::CurrentAttributes
scope.where(Arel.sql(sql(scope.klass, row)))
end
def self.current(scope, version_model)
return scope if admin?
table = scope.klass.table_name
keys = KEYS.fetch(version_model.table_name)
matches = keys.map do |key|
column = scope.klass.column_names.include?(key) ? key : 'id'
"current_snapshot.#{ key } = #{ table }.#{ column }"
end.join(' AND ')
boundary = "#{ matches } AND current_snapshot.version_no >= #{ table }.version_no " +
"AND current_snapshot.event_type = 'discard'"
scope = scope.where(Arel.sql("NOT EXISTS (SELECT 1 FROM #{ version_model.table_name } " +
"current_snapshot WHERE #{ boundary })"))
condition = "#{ matches } AND current_snapshot.version_no = #{ table }.version_no"
scope.where(Arel.sql("NOT EXISTS (SELECT 1 FROM #{ version_model.table_name } " +
"current_snapshot WHERE #{ condition } AND NOT (#{ sql(version_model, 'current_snapshot') }))"))
end
def self.require_current!(record, version_model)
return if admin?
raise Forbidden unless current(record.class.where(id: record.id), version_model).exists?
end
def self.blob_visible?(blob, seen = [])
return true if admin?
return false if seen.include?(blob.id)
-1
ファイルの表示
@@ -44,7 +44,6 @@ module TagGroupRepr
end
def one locale, group
HistoryAccess.require_current!(group, TagGroupVersion)
many(locale, [group]).first
end
-1
ファイルの表示
@@ -5,7 +5,6 @@ module WikiPageRepr
module_function
def tag_description locale, description
HistoryAccess.require_current!(description, TagDescriptionVersion)
tag = description.tag
{ 'id' => description.id,
+20 -7
ファイルの表示
@@ -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
+22 -4
ファイルの表示
@@ -14,22 +14,40 @@ RSpec.describe 'History boundaries shared with Counts', type: :request do
end
end
it 'denies the same discarded description through Counts, the facade and the ordinary API' do
it 'keeps discarded history private while exposing the current description' do
get '/counts/query', params: { resource: 'tag_descriptions', definition: 'history',
mode: 'details', locale: 'ja', execution_at: '2025-01-01T00:00:00Z' }
expect(response).to have_http_status(:ok)
expect(response.parsed_body).to include('count' => 0, 'output_count' => 2,
'excluded_count' => 2, 'versions' => [])
["/wiki/#{ description.id }", "/tags/#{ tag.id }/description"].each do |path|
paths = [
"/wiki/#{ description.id }", '/wiki/title/description%20tag',
"/tags/#{ tag.id }/description"]
paths.each do |path|
get path, params: { locale: 'ja' }
expect(response).to have_http_status(:not_found)
expect(response.body).not_to include('private body')
expect(response).to have_http_status(:ok)
expect(response.parsed_body.fetch('body')).to eq(description.body)
end
get '/sitemap_entries/descriptions', params: { locale: 'ja' }
expect(response).to have_http_status(:ok)
expect(response.parsed_body['ids']).not_to include(description.id)
end
it 'omits private revision references and rejects history and diff requests' do
get "/wiki/#{ description.id }", params: { locale: 'ja' }
expect(response).to have_http_status(:ok)
expect(response.parsed_body).to include(
'revision_id' => nil, 'pred' => nil, 'succ' => nil,
'updated_at' => description.updated_at.iso8601(3))
version = TagDescriptionVersion.find_by!(
tag_id: tag.id, language_code: 'ja', version_no: 2)
get "/wiki/#{ description.id }", params: { locale: 'ja', version: version.id }
expect(response).to have_http_status(:not_found)
get "/wiki/#{ description.id }/diff", params: { locale: 'ja' }
expect(response).to have_http_status(:not_found)
end
it 'permits the server-authenticated administrator to read the discarded description' do
sign_in_as(create(:user, :admin))
get "/tags/#{ tag.id }/description", params: { locale: 'ja' }
+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)
+8 -10
ファイルの表示
@@ -69,40 +69,38 @@ RSpec.describe 'Post history privacy', type: :request do
sign_in_as(create(:user, role.to_sym)) unless role == 'anonymous'
end
it 'uses only authorised history timestamps for display' do
it 'uses the latest version timestamp for display regardless of role' do
get '/posts'
expect(response).to have_http_status(:ok)
row = response.parsed_body.fetch('posts').find { _1.fetch('id') == post_record.id }
expected = origin + (role == 'admin' ? 4 : 3).days
expected = origin + 4.days
expect(Time.zone.parse(row.fetch('updated_at'))).to eq(expected)
end
it 'uses the same visibility for date bounds and count' do
it 'uses the latest version timestamp for date bounds and count regardless of role' do
get '/posts', params: { updated_from: (origin + 4.days).iso8601,
updated_to: (origin + 4.days).iso8601 }
expect(response).to have_http_status(:ok)
ids = response.parsed_body.fetch('posts').pluck('id')
expect(ids).to eq(role == 'admin' ? [post_record.id] : [])
expect(ids).to eq([post_record.id])
expect(response.parsed_body.fetch('count')).to eq(ids.length)
end
it 'sorts using authorised timestamps in both directions' do
it 'sorts using the latest version timestamps in both directions regardless of role' do
['asc', 'desc'].each do |direction|
get '/posts', params: { order: "updated_at:#{ direction }" }
expect(response).to have_http_status(:ok)
expected = role == 'admin' ? [other_post.id, post_record.id] :
[post_record.id, other_post.id]
expected = [other_post.id, post_record.id]
expected.reverse! if direction == 'desc'
expect(response.parsed_body.fetch('posts').pluck('id')).to eq(expected)
end
end
it 'applies authorised timestamp ordering before pagination' do
it 'applies latest version timestamp ordering before pagination regardless of role' do
get '/posts', params: { order: 'updated_at:desc', limit: 1 }
expect(response).to have_http_status(:ok)
expected = role == 'admin' ? post_record.id : other_post.id
expect(response.parsed_body.fetch('posts').pluck('id')).to eq([expected])
expect(response.parsed_body.fetch('posts').pluck('id')).to eq([post_record.id])
expect(response.parsed_body.fetch('count')).to eq(2)
end
+93
ファイルの表示
@@ -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 }
@@ -516,6 +555,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) }
@@ -2559,6 +2637,21 @@ RSpec.describe 'Posts API', type: :request do
expect(user.reload.viewed?(post_record)).to be(true)
end
it '204 and keeps one view on repeated requests' do
sign_in_as(user)
expect {
post "/posts/#{ post_record.id }/viewed"
}.to change(UserPostView, :count).by(1)
expect(response).to have_http_status(:no_content)
expect {
post "/posts/#{ post_record.id }/viewed"
}.not_to change(UserPostView, :count)
expect(response).to have_http_status(:no_content)
expect(user.reload.viewed?(post_record)).to be(true)
end
end
describe 'DELETE /posts/:id/viewed' do
+4 -2
ファイルの表示
@@ -62,10 +62,12 @@ RSpec.describe 'Tag description Wiki compatibility', type: :request do
expect(response).to have_http_status(:not_found)
end
it 'does not fall back when the new current revision is missing' do
it 'reads current content when the corresponding revision is missing' do
TagDescriptionVersion.where(id: versions.last.id).delete_all
without_legacy_reads { get "/wiki/#{ description.id }" }
expect(response).to have_http_status(:not_found)
expect(response).to have_http_status(:ok)
expect(json).to include('body' => description.body,
'revision_id' => nil, 'pred' => nil, 'succ' => nil)
end
end
+24
ファイルの表示
@@ -42,6 +42,30 @@ RSpec.describe 'Tag group Wiki facade reads', type: :request do
'updated_at' => first_revision.created_at.iso8601(3))
end
it 'reads current structure while keeping discarded history private' do
TagGroupVersion.where(id: last_revision.id).update_all(event_type: 'discard')
without_group_legacy_reads { get path }
expect(response).to have_http_status(:ok)
expect(json).to include(
'body' => '- 新タグ', 'revision_id' => nil, 'pred' => nil, 'succ' => nil,
'updated_at' => page.updated_at.iso8601(3))
get path, params: { version: last_revision.id }
expect(response).to have_http_status(:not_found)
get "/wiki/#{ page.id }/diff"
expect(response).to have_http_status(:not_found)
end
it 'reads current structure when the corresponding revision is missing' do
TagGroupVersion.where(id: last_revision.id).delete_all
without_group_legacy_reads { get path }
expect(response).to have_http_status(:ok)
expect(json).to include(
'body' => '- 新タグ', 'revision_id' => nil, 'pred' => nil, 'succ' => nil)
end
it 'checks existence without consulting migrated Wiki tables' do
without_group_legacy_reads { get "#{ path }/exists" }
expect(response).to have_http_status(:no_content)
+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
+12
ファイルの表示
@@ -39,6 +39,18 @@ describe ('TagDetailSidebar', () => {
vi.clearAllMocks ()
})
it ('inherits the sidebar width saved by the post list', () => {
localStorage.setItem ('sidebar:posts-index-tags:left:width', '320')
const { container } = renderWithProviders (
<TagDetailSidebar post={buildPost ()}/>)
const sidebar = container.querySelector<HTMLElement> (
'[style*="--sidebar-width"]')
expect (sidebar).toBeInTheDocument ()
expect (sidebar?.style.getPropertyValue ('--sidebar-width')).toBe ('320px')
})
it ('keeps internal and external tags with the same numeric id in flat mode', () => {
setClientTagRelationDisplayMode ('flat')
+1 -1
ファイルの表示
@@ -378,7 +378,7 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
}, [baseTags])
return (
<SidebarComponent sidebarKey="post-detail-tags" className={className}>
<SidebarComponent sidebarKey="posts-index-tags" className={className}>
<TagSearch/>
<DndContext
sensors={sensors}