コミットを比較

...
作成者 SHA1 メッセージ 日付
Codex Night Worker efcc363537 WIP: preserve failed Codex job issue-205-idew24v8 2026-11-19 12:29:23 +09:00
みてるぞとCodex Night Worker dda3d87073 外部タグの履歴管理方式を変更 (#445) (#480)
Co-authored-by: Codex Night Worker <codex-night@localhost>
Reviewed-on: #480
Co-authored-by: miteruzo <miteruzo@naver.com>
2026-11-15 16:18:27 +09:00
43個のファイルの変更、4386行の追加、134行の削除
-35
ファイルの表示
@@ -1,35 +0,0 @@
## 背景
なぜ必要か。
## 対象範囲
- backend:
- frontend:
- docs:
- migration:
## やること
- [ ]
## 受け入れ条件
- [ ]
## 実行すべき確認
- [ ] `cd backend && bundle exec rspec`
- [ ] `cd frontend && npm run build`
- [ ] `cd frontend && npm run lint`
## 禁止事項
- unrelated refactor はしない
- 既存 API response shape を壊さない
- 認証・認可・BAN を弱めない
## Codex への指示
この issue を読んで実装してください。
不明点があれば、実装前に調査結果と選択肢を提示してください。
+1 -10
ファイルの表示
@@ -100,18 +100,9 @@ class PostVersionsController < ApplicationController
def external_tag_names_for snapshots
ids = snapshots.flatten.filter_map { _1['external_tag_id'] }.uniq
names = ExternalTag.where(id: ids).pluck(:id, :platform, :name).to_h { |id, platform, name|
ExternalTag.where(id: ids).pluck(:id, :platform, :name).to_h { |id, platform, name|
[id, "#{ platform }:#{ name }"]
}
missing_ids = ids - names.keys
HistoryAccess.visible(NicoTagVersion.all)
.where(tag_id: missing_ids)
.order(:tag_id, version_no: :desc)
.pluck(:tag_id, :name)
.each { |id, name| names[id] ||= name }
names
end
def snapshot_tag_literals snapshots, tag_names, external_tag_names
+33
ファイルの表示
@@ -0,0 +1,33 @@
class SubmissionsController < ApplicationController
def index
page_value = params[:page].to_s
page = page_value.match?(/\A[1-9][0-9]{0,5}\z/) ? page_value.to_i : 1
scope = Submission.public_listing
submissions = scope.includes(:user).order(created_at: :desc, id: :desc)
.limit(Submission::PAGE_SIZE).offset((page - 1) * Submission::PAGE_SIZE)
render json: { submissions: submissions.map { repr(_1) },
count: scope.count,
page_size: Submission::PAGE_SIZE }
end
def create
return head :unauthorized unless current_user
submission = Submission.create!(
params.permit(:category, :target_id, :content).merge(user: current_user))
render json: repr(submission), status: :created
end
private
def repr(submission)
{ id: submission.id,
category: submission.category,
target_id: submission.target_id,
content: submission.content,
user: UserRepr.base(submission.user),
created_at: submission.created_at }
end
end
+19 -6
ファイルの表示
@@ -1,8 +1,11 @@
class ExternalTag < ApplicationRecord
before_create { SharedResourceIdAllocator.assign!(self) }
# Must run before dependent association callbacks.
before_destroy :prevent_destroy
enum :platform, nico: 'nico'
validates :platform, presence: true, inclusion: { in: ExternalTag.platforms.keys }
validate :immutable_identity, on: :update
has_many :post_external_tags, dependent: :delete_all
has_many :posts, through: :post_external_tags
@@ -16,11 +19,21 @@ class ExternalTag < ApplicationRecord
has_many :linked_tags, through: :nico_tag_relations, source: :tag
def snapshot_linked_tag_names language_code = 'ja'
linked_tags
.joins(:tag_names)
.where(tag_names: { language_code:, primary_flg: true })
.order('tag_names.name')
.pluck('tag_names.name')
def snapshot_linked_tag_ids = linked_tags.distinct.order(:id).pluck(:id)
def delete
raise ActiveRecord::ReadOnlyRecord, '外部タグは削除できません.'
end
private
def immutable_identity
errors.add(:platform, 'は変更できません.') if will_save_change_to_platform?
errors.add(:name, 'は変更できません.') if will_save_change_to_name?
end
def prevent_destroy
errors.add(:base, '外部タグは削除できません.')
throw(:abort)
end
end
+1 -15
ファイルの表示
@@ -106,21 +106,7 @@ class HistoryAccess < ActiveSupport::CurrentAttributes
snapshot_reference(TagVersion, row),
snapshot_reference(NicoTagVersion, row, external: true)]
when 'nico_tag_versions'
# Legacy linked_tags snapshots contain names, not IDs. Match recorded names
# conservatively; never expose a private linked name through an external tag.
names = "JSON_MERGE_PRESERVE(JSON_ARRAY(private_tag.name), " +
"COALESCE(JSON_EXTRACT(private_tag.names, '$**.name'), JSON_ARRAY()))"
# DISTINCT prevents merging this independent name set into the correlated scan.
# Keep byte-distinct names even when the column collation considers them equal.
private_names = 'SELECT DISTINCT private_name.name, ' +
'CAST(private_name.name AS BINARY) AS name_bytes FROM tag_versions private_tag ' +
"JOIN (#{ discarded_keys('tag_versions', 'tag_id') }) blocked " +
'ON blocked.tag_id = private_tag.tag_id ' +
"JOIN JSON_TABLE(#{ names }, '$[*]' COLUMNS (name TEXT PATH '$')) private_name " +
"WHERE private_name.name <> ''"
["NOT EXISTS (SELECT 1 FROM (#{ private_names }) private_name WHERE " +
"LOCATE(CONCAT(' ', private_name.name, ' '), " +
"CONCAT(' ', COALESCE(#{ row }.linked_tags, ''), ' ')) > 0)"]
[list_reference('tag_versions', 'tag_id', "#{ row }.linked_tag_ids")]
when 'tag_versions'
[list_reference('tag_versions', 'tag_id', "#{ row }.parent_tag_ids")]
when 'tag_description_versions'
+6 -1
ファイルの表示
@@ -3,5 +3,10 @@ class NicoTagVersion < ApplicationRecord
belongs_to :external_tag, foreign_key: :tag_id, inverse_of: :nico_tag_versions
validates :name, presence: true
validates :event_type, inclusion: { in: ['create', 'update'] }
def name
tag = external_tag
"#{ tag.platform }:#{ tag.name }" if tag
end
end
+49
ファイルの表示
@@ -0,0 +1,49 @@
class Submission < ApplicationRecord
TARGETS = { 'post_removal' => [Post, PostVersion, :post_id],
'tag_removal' => [Tag, TagVersion, :tag_id],
'material_removal' => [Material, MaterialVersion, :material_id] }.freeze
CATEGORIES = (TARGETS.keys + ['opinion']).freeze
PAGE_SIZE = 20
belongs_to :user
validates :category, inclusion: { in: CATEGORIES }
validates :content, presence: true, length: { maximum: 5000 }
validates :target_id, absence: true, if: -> { category == 'opinion' }
validates :target_id, numericality: { only_integer: true,
greater_than: 0, less_than: 2**63 },
if: -> { TARGETS.key?(category) }
validate :validate_target
def self.target_scope(category)
model, version_model = TARGETS.fetch(category)
HistoryAccess.current(model.all, version_model)
end
def self.public_listing
return all if HistoryAccess.admin?
TARGETS.keys.reduce(where(category: 'opinion')) do |scope, category|
_model, version_model, key = TARGETS.fetch(category)
# Keep pre-removal submissions private even after the target is restored.
boundaries = version_model.where(event_type: 'discard').where(
version_model.arel_table[:version_no].gteq(arel_table[:target_version_no]))
scope.or(where(category:, target_id: target_scope(category).select(:id))
.where.not(target_version_no: nil)
.where.not(target_id: boundaries.select(key)))
end
end
private
def validate_target
return unless TARGETS.key?(category) && errors[:target_id].empty?
target = self.class.target_scope(category).find_by(id: target_id)
if target
self.target_version_no = target.version_no if new_record?
return
end
errors.add(:target_id, :invalid)
end
end
+4 -1
ファイルの表示
@@ -139,6 +139,8 @@ class CountsVersionRepr
result = {}
table = model.table_name
comparison = @inclusive ? '<=' : '<'
name = model == NicoTagVersion ?
CountsResourceDefinition.new('nico_tags').expression('name', table) : 'name'
requests.each_slice(100) do |batch|
queries = batch.map do |id, point|
scope = HistoryAccess.visible(model.where(tag_id: id))
@@ -148,7 +150,8 @@ class CountsVersionRepr
"AND newer.version_no > #{ table }.version_no)", point)
quoted = model.connection.quote(point.iso8601(6))
names = model == TagVersion ? 'names' : 'JSON_OBJECT() AS names'
scope.select("tag_id, name, #{ names }, #{ quoted } AS reference_point").to_sql
scope.select("tag_id, #{ name } AS name, #{ names }, " +
"#{ quoted } AS reference_point").to_sql
end
next if queries.empty?
+4 -2
ファイルの表示
@@ -28,16 +28,18 @@ class CountsCandidates
[external, 'external', 'NULL', 'JSON_OBJECT()']]
sources = sources.map do |population, kind, category, names|
scope = population.scope.except(:select)
name = population.definition.expression('name')
if @params['query'].present?
pattern = "%#{ ApplicationRecord.sanitize_sql_like(@params['query']) }%"
scope = scope.where("(v.name LIKE ? OR CAST(v.tag_id AS CHAR) = ? OR EXISTS (" +
scope = scope.where("(#{ name } LIKE ? OR CAST(v.tag_id AS CHAR) = ? OR EXISTS (" +
"SELECT 1 FROM JSON_TABLE(COALESCE(JSON_EXTRACT(#{ names }, '$**.name'), " +
"JSON_ARRAY()), '$[*]' COLUMNS (name TEXT PATH '$')) candidate_name " +
'WHERE candidate_name.name LIKE ?))', pattern, @params['query'], pattern)
end
scope.select(Arel.sql(
"CONCAT('#{ kind }:', v.tag_id) AS value, v.tag_id AS id, " +
"v.name AS name, #{ names } AS names, #{ category } AS category, '#{ kind }' AS kind"))
"#{ name } AS name, #{ names } AS names, " +
"#{ category } AS category, '#{ kind }' AS kind"))
.to_sql
end
clauses = []
+1 -1
ファイルの表示
@@ -113,7 +113,7 @@ class CountsPopulation
else
raise ArgumentError unless definition.axes(history).include?(key)
scope = scope.where(definition.expression(key) => entry['value'])
scope = scope.where("#{ definition.expression(key) } <=> ?", entry['value'])
end
scope
end
+18 -3
ファイルの表示
@@ -105,12 +105,25 @@ class CountsResourceDefinition
def time_column = 'created_at'
def column(key)
raise ArgumentError unless fields.key?(key)
# Keep the V1 Counts field name at the API boundary only.
return 'linked_tag_ids' if resource == 'nico_tags' && key == 'linked_tags'
{ 'resource_id' => keys.first, 'user' => 'created_by_user_id' }.fetch(key, key)
end
def expression(key, row = 'v') = "#{ row }.#{ column(key) }"
def changes = fields.keys - COMMON.keys - ['updated_at', 'updated_by_user_id']
def expression(key, row = 'v')
if resource == 'nico_tags' && key == 'name'
return "(SELECT CONCAT(external_tags.platform, ':', external_tags.name) " +
"FROM external_tags WHERE external_tags.id = #{ row }.tag_id)"
end
"#{ row }.#{ column(key) }"
end
def changes
columns = fields.keys - COMMON.keys - ['updated_at', 'updated_by_user_id']
resource == 'nico_tags' ? columns - ['name'] : columns
end
def axes(history)
fields.reject { |_key, type| type == :json }.keys +
(resource == 'posts' ? ['tags'] : []) + (history ? ['changed_field'] : [])
@@ -118,7 +131,9 @@ class CountsResourceDefinition
def metadata
fields.map do |key, type|
{ key:, type:, nullable: model.columns_hash.fetch(column(key)).null,
nullable = (resource == 'nico_tags' && key == 'name') ||
model.columns_hash.fetch(column(key)).null
{ key:, type:, nullable:,
operators: OPERATORS.fetch(type, []) }
end
end
+3 -1
ファイルの表示
@@ -201,6 +201,8 @@ class CountsStateQuery
end
def listing
external_name = CountsResourceDefinition.new('nico_tags')
.expression('name', 'external_version')
catalog = <<~SQL
, tag_counts AS (
SELECT membership.kind, membership.tag_id, COUNT(*) AS post_count
@@ -209,7 +211,7 @@ class CountsStateQuery
SELECT 'internal' AS kind, tag_id, name, names,
deprecated_at FROM tag_at WHERE event_type <> 'discard'
UNION ALL
SELECT tc.kind, tc.tag_id, external_version.name, JSON_OBJECT() AS names,
SELECT tc.kind, tc.tag_id, #{ external_name } AS name, JSON_OBJECT() AS names,
NULL AS deprecated_at
FROM tag_counts tc
LEFT JOIN tag_at internal_version
+2
ファイルの表示
@@ -182,6 +182,7 @@ class CountsTableQuery
order = sort_sql { detail_expression(_1) }
query = query.order(Arel.sql((order + ['v.id ASC']).join(', ')))
.limit(limit).offset((page - 1) * limit)
query = query.preload(:external_tag) if @definition.resource == 'nico_tags'
rows = query.to_a
if ['posts', 'tags'].include?(@definition.resource)
point = population.history ? population.at :
@@ -486,6 +487,7 @@ class CountsTableQuery
table = model.table_name
scope = HistoryAccess.visible(model.where(tag_id: ids)).where('created_at <= ?', point)
scope = scope.includes(:external_tag) if model == NicoTagVersion
bound = @connection.quote(point)
if population.history && @definition.resource == 'posts'
key = kind == 'internal' ? 'tag_id' : 'external_tag_id'
+2 -2
ファイルの表示
@@ -1,4 +1,5 @@
class NicoTagVersionRecorder < VersionRecorder
EVENT_TYPES = ['create', 'update'].freeze
def self.record! external_tag:, event_type:, created_by_user:
new(external_tag:, event_type:, created_by_user:).record!
end
@@ -14,8 +15,7 @@ class NicoTagVersionRecorder < VersionRecorder
def record_key = :external_tag
def snapshot_attributes
{ name: "#{ @record.platform }:#{ @record.name }",
linked_tags: @record.snapshot_linked_tag_names.join(' ') }
{ linked_tag_ids: @record.snapshot_linked_tag_ids.join(' ') }
end
def tracks_version_no_on_record? = false
+1
ファイルの表示
@@ -15,6 +15,7 @@ Rails.application.routes.draw do
get 'counts/tags', to: 'counts_tags#index'
resources :locales, only: [:index]
resources :submissions, only: [:index, :create]
resources :sitemap_entries, only: [:index, :show], param: :resource
resources :tag_groups, only: [:index, :show, :create, :update]
+5
ファイルの表示
@@ -0,0 +1,5 @@
class AddLinkedTagIdsToNicoTagVersions < ActiveRecord::Migration[8.0]
def change
add_column :nico_tag_versions, :linked_tag_ids, :text
end
end
+42
ファイルの表示
@@ -0,0 +1,42 @@
class MigrateLinkedTagsInNicoTagVersions < ActiveRecord::Migration[8.0]
class MigrationTagVersion < ActiveRecord::Base
self.table_name = 'tag_versions'
end
class MigrationNicoTagVersion < ActiveRecord::Base
self.table_name = 'nico_tag_versions'
end
def up
# 除票外部タグの恢復はないので除票履歴があれば全消しでよいはず.
execute <<~SQL
DELETE
t1
FROM
nico_tag_versions t1
INNER JOIN
nico_tag_versions t2
ON
t1.tag_id = t2.tag_id
AND t2.event_type = 'discard'
SQL
MigrationNicoTagVersion.find_each do |ntv|
linked_tag_ids = ntv.linked_tags.split.map { |name|
# 厳密には一意ぢゃないけどめんだぅだからこれでいいや.
MigrationTagVersion
.order(created_at: :desc, id: :desc)
.find_by("names ->> '$.ja.name' = ?", name)
&.tag_id
}.compact.uniq.sort.join(' ')
ntv.update_columns(linked_tag_ids:)
end
change_column_null :nico_tag_versions, :linked_tag_ids, false
end
def down
raise ActiveRecord::IrreversibleMigration, '戻せません.'
end
end
+6
ファイルの表示
@@ -0,0 +1,6 @@
class RemoveLinkedTagsFromNicoTagVersions < ActiveRecord::Migration[8.0]
def change
remove_column :nico_tag_versions, :linked_tags
remove_column :nico_tag_versions, :name
end
end
+13
ファイルの表示
@@ -0,0 +1,13 @@
class CreateSubmissions < ActiveRecord::Migration[8.0]
def change
create_table :submissions do |t|
t.references :user, null: false, foreign_key: true
t.string :category, null: false
t.bigint :target_id
t.integer :target_version_no
t.text :content, null: false
t.timestamps
t.index [:created_at, :id]
end
end
end
生成ファイル
+16 -3
ファイルの表示
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[8.0].define(version: 2026_10_15_010000) do
ActiveRecord::Schema[8.0].define(version: 2026_11_18_000000) do
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.string "name", null: false
t.string "record_type", null: false
@@ -301,10 +301,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_10_15_010000) do
t.bigint "tag_id", null: false
t.integer "version_no", null: false
t.string "event_type", null: false
t.string "name", null: false
t.text "linked_tags", null: false
t.datetime "created_at", null: false
t.bigint "created_by_user_id"
t.text "linked_tag_ids", null: false
t.index ["created_at"], name: "index_nico_tag_versions_on_created_at"
t.index ["created_by_user_id", "created_at"], name: "index_nico_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc }
t.index ["tag_id", "created_at"], name: "index_nico_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc }
@@ -440,6 +439,19 @@ ActiveRecord::Schema[8.0].define(version: 2026_10_15_010000) do
t.index ["user_id"], name: "index_settings_on_user_id", unique: true
end
create_table "submissions", charset: "utf8mb4",
collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.bigint "user_id", null: false
t.string "category", null: false
t.bigint "target_id"
t.integer "target_version_no"
t.text "content", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["created_at", "id"], name: "index_submissions_on_created_at_and_id"
t.index ["user_id"], name: "index_submissions_on_user_id"
end
create_table "tag_description_versions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.bigint "tag_id", null: false
t.string "language_code", limit: 16, null: false
@@ -817,6 +829,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_10_15_010000) do
add_foreign_key "post_versions", "users", column: "created_by_user_id"
add_foreign_key "posts", "users", column: "uploaded_user_id"
add_foreign_key "settings", "users"
add_foreign_key "submissions", "users"
add_foreign_key "tag_description_versions", "tag_description_versions", column: ["tag_id", "source_language_code", "source_version_no"], primary_key: ["tag_id", "language_code", "version_no"]
add_foreign_key "tag_descriptions", "languages", column: "language_code", primary_key: "code"
add_foreign_key "tag_descriptions", "tag_description_versions", column: ["tag_id", "source_language_code", "source_version_no"], primary_key: ["tag_id", "language_code", "version_no"]
+43 -8
ファイルの表示
@@ -11,28 +11,63 @@ RSpec.describe ExternalTag, type: :model do
expect(external.reload.name).to eq('raw tag[]')
end
it 'deletes post associations without deleting posts or version history' do
it 'does not allow a persisted external tag to change its platform or name' do
external = create(:external_tag, name: 'immutable')
expect { external.update!(name: 'renamed') }
.to raise_error(ActiveRecord::RecordInvalid)
expect(external.errors[:name]).to include('は変更できません.')
external.reload
external.platform = nil
expect { external.save! }.to raise_error(ActiveRecord::RecordInvalid)
expect(external.errors[:platform]).to include('は変更できません.')
expect(external.reload).to have_attributes(platform: 'nico', name: 'immutable')
end
it 'rejects delete, which bypasses destroy callbacks' do
external = create(:external_tag)
expect { external.delete }.to raise_error(ActiveRecord::ReadOnlyRecord)
expect(external.reload).to be_persisted
end
it 'increments the counter through post associations without changing identity' do
external = create(:external_tag, name: 'counter')
post = create(:post)
expect {
PostExternalTag.create!(post:, external_tag: external)
}.to change { external.reload.post_count }.by(1)
expect(external.reload).to have_attributes(platform: 'nico', name: 'counter')
end
it 'does not destroy external tags or their post associations and history' do
external = create(:external_tag)
post = create(:post)
PostExternalTag.create!(post:, external_tag: external)
version = NicoTagVersionRecorder.record!(
external_tag: external, event_type: :create, created_by_user: nil)
external.destroy!
expect { external.destroy! }.to raise_error(ActiveRecord::RecordNotDestroyed)
expect(PostExternalTag.where(external_tag_id: external.id)).to be_empty
expect(post.reload.external_tags).to be_empty
expect(external.reload).to be_persisted
expect(PostExternalTag.exists?(post:, external_tag: external)).to be(true)
expect(post.reload.external_tags).to contain_exactly(external)
expect(version.reload.tag_id).to eq(external.id)
end
it 'deletes external links without deleting linked internal tags' do
it 'does not destroy an external tag or its links to internal tags' do
external = create(:external_tag)
tag = create(:tag)
NicoTagRelation.create!(nico_tag: external, tag:)
relation = NicoTagRelation.create!(nico_tag: external, tag:)
external.destroy!
expect { external.destroy! }.to raise_error(ActiveRecord::RecordNotDestroyed)
expect(NicoTagRelation.where(nico_tag_id: external.id)).to be_empty
expect(external.reload).to be_persisted
expect(relation.reload).to be_persisted
expect(Tag.exists?(tag.id)).to be(true)
end
end
+3 -3
ファイルの表示
@@ -76,7 +76,7 @@ RSpec.describe 'Counts artifact policy and external references' do
end
end
it 'does not expose a private linked tag name through an external history snapshot' do
it 'does not expose a private linked tag ID through an external history snapshot' do
tag = create(:tag, primary_name: 'private-linked-name')
TagVersion.create!(tag:, version_no: 1, event_type: 'discard', name: 'private-linked-name',
category: 'general', aliases: '', parent_tag_ids: '', created_at: Time.utc(2024),
@@ -84,7 +84,7 @@ RSpec.describe 'Counts artifact policy and external references' do
auto_generated: false, aliases: [] } })
external = create(:external_tag, name: 'public-external')
row = NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create',
name: 'nico:public-external', linked_tags: 'private-linked-name',
linked_tag_ids: tag.id.to_s,
created_at: Time.utc(2024))
post = create(:post)
snapshot = PostVersion.create!(post:, version_no: 1, event_type: 'create',
@@ -99,7 +99,7 @@ RSpec.describe 'Counts artifact policy and external references' do
expect(HistoryAccess.visible(NicoTagVersion.where(id: row.id))).to exist
end
public_row = NicoTagVersion.create!(external_tag: external, version_no: 2, event_type: 'update',
name: 'nico:public-external', linked_tags: 'private-linked-name-extra',
linked_tag_ids: '',
created_at: Time.utc(2024, 7))
HistoryAccess.set(user: nil) do
expect(HistoryAccess.visible(NicoTagVersion.where(id: public_row.id))).to exist
+3 -4
ファイルの表示
@@ -10,23 +10,22 @@ RSpec.describe 'Shared Tag and ExternalTag IDs', type: :model do
expect(next_tag.id).to be > external.id
end
it 'does not reuse physically deleted IDs in either table' do
it 'does not reuse IDs after internal deletion while external tags remain' do
tag = create(:tag)
external = create(:external_tag)
TagName.where(tag_id: tag.id).delete_all
tag.destroy!
external.destroy!
expect(ExternalTag.exists?(external.id)).to be(true)
expect(create(:tag).id).to be > external.id
expect(create(:external_tag).id).to be > external.id
end
it 'retains existing overlapping IDs without renumbering on update or insert' do
it 'retains overlapping IDs after a tag update and a new allocation' do
tag = create(:tag)
external = create(:external_tag)
external.update_columns(id: tag.id)
tag.update!(category: :meta)
external.update!(name: 'updated_external')
before_tag = tag.reload.attributes
before_external = external.reload.attributes
+15 -5
ファイルの表示
@@ -47,24 +47,34 @@ RSpec.describe VersionRecord, type: :model do
external_tag: nico_tag,
version_no: 1,
event_type: 'create',
name: "nico:#{ nico_tag.name }",
linked_tags: '',
linked_tag_ids: '',
created_at: Time.current,
created_by_user: nil
)
expect {
version.update!(name: 'nico:changed')
version.update!(linked_tag_ids: '123')
}.to raise_error(ActiveRecord::ReadOnlyRecord)
end
it 'rejects discard and restore versions for external tags' do
[:discard, :restore].each do |event_type|
version = NicoTagVersion.new(
external_tag: nico_tag, version_no: 1, event_type:,
linked_tag_ids: '', created_at: Time.current)
expect(version).not_to be_valid
expect(version.errors[:event_type]).not_to be_empty
end
end
it 'prevents NicoTagVersion destroy' do
version = NicoTagVersion.create!(
external_tag: nico_tag,
version_no: 1,
event_type: 'create',
name: "nico:#{ nico_tag.name }",
linked_tags: '',
linked_tag_ids: '',
created_at: Time.current,
created_by_user: nil
)
+114 -6
ファイルの表示
@@ -19,7 +19,7 @@ RSpec.describe 'Counts table API', type: :request do
names: { ja: { name: 'alpha', script_code: 'Jpan', auto_generated: false, aliases: [] } },
created_at: Time.utc(2023))
NicoTagVersion.create!(external_tag: external, version_no: 1,
event_type: 'create', name: 'beta', linked_tags: '', created_at: Time.utc(2023))
event_type: 'create', linked_tag_ids: '', created_at: Time.utc(2023))
snapshots = [
{ tag_id: tag.id, version_no: 1, name: 'alpha', category: 'general', sections: [] },
{ external_tag_id: external.id }]
@@ -50,6 +50,115 @@ RSpec.describe 'Counts table API', type: :request do
def versions(result) = result.fetch('versions').map { _1.fetch('version_no') }
context 'nico link ID snapshots through the V1 field name' do
let(:base) do
super().merge(resource: 'nico_tags')
end
before do
NicoTagVersion.create!(external_tag: external, version_no: 2,
event_type: 'update', linked_tag_ids: tag.id.to_s,
created_at: Time.utc(2024, 1, 1))
NicoTagVersion.create!(external_tag: external, version_no: 3,
event_type: 'update', linked_tag_ids: '',
created_at: Time.utc(2024, 2, 1))
end
it 'returns ID values under linked_tags without exposing the physical column key' do
result = query
expect(versions(result)).to eq([1, 2, 3])
expect(result['versions'].map { _1.fetch('linked_tags') }).to eq(['', tag.id.to_s, ''])
result['versions'].each do |row|
expect(row).not_to have_key('linked_tag_ids')
expect(row.fetch('name')).to eq('nico:beta')
end
end
it 'preloads external names separately for aliased link-change details' do
statements = []
listener = lambda do |_name, _start, _finish, _id, payload|
statements << payload[:sql]
end
ActiveSupport::Notifications.subscribed(listener, 'sql.active_record') do
result = query(axis('changed_field', 'linked_tags'))
expect(versions(result)).to eq([2, 3])
expect(result.fetch('versions').map { _1.fetch('name') })
.to eq(['nico:beta', 'nico:beta'])
end
details = statements.find { _1.include?('AS counts_latest') }
expect(details).not_to be_nil
expect(details).not_to include('JOIN `external_tags`')
names = statements.select { _1.match?(/SELECT .* FROM `external_tags`/) }
expect(names.length).to eq(1)
end
it 'advertises the legacy field, label and default columns only' do
get '/counts/definitions/nico_tags', params: { locale: 'ja' }
expect(response).to have_http_status(:ok)
body = response.parsed_body
['fields', 'filter_fields', 'output_fields'].each do |collection|
keys = body.fetch(collection).map { _1.fetch('key') }
expect(keys).to include('linked_tags')
expect(keys).not_to include('linked_tag_ids')
end
field = body.fetch('output_fields').find { _1['key'] == 'linked_tags' }
expect(field.fetch('label')).to eq('counts:attributes.linked_tags')
body.fetch('axes').each_value do |keys|
expect(keys).to include('linked_tags')
expect(keys).not_to include('linked_tag_ids')
end
body.fetch('defaults').select { _1['mode'] == 'details' }.each do |entry|
settings = entry.fetch('params').to_h { [_1.fetch('key'), _1.fetch('value')] }
expect(settings.fetch('columns').split).to include('name', 'linked_tags')
expect(settings.fetch('columns').split).not_to include('linked_tag_ids')
end
end
it 'filters IDs and legacy drills and compares link changes through linked_tags' do
predicate = { conditions: '', 'conditions.0.field' => 'linked_tags',
'conditions.0.operator' => 'eq', 'conditions.0.value' => tag.id.to_s }
expect(versions(query(predicate))).to eq([2])
expect(versions(query(axis('linked_tags', tag.id.to_s, root: 'drill')))).to eq([2])
expect(versions(query(axis('changed_field', 'linked_tags')))).to eq([2, 3])
expect(versions(query(predicate.merge('conditions.0.value' => 'alpha')))).to be_empty
end
it 'sorts ID snapshots through the public field in both directions' do
expect(versions(query(sort: 'linked_tags:asc version_no:asc'))).to eq([1, 3, 2])
expect(versions(query(sort: 'linked_tags:desc version_no:asc'))).to eq([2, 1, 3])
end
it 'restores historical link IDs before applying a latest snapshot filter' do
predicate = { definition: 'latest', at: '2024-01-15T00:00:00Z',
conditions: '', 'conditions.0.field' => 'linked_tags',
'conditions.0.operator' => 'eq', 'conditions.0.value' => tag.id.to_s }
expect(versions(query(predicate))).to eq([2])
expect(versions(query(predicate.except(:at)))).to be_empty
end
it 'groups by linked_tags ID values and accepts the resulting drill condition' do
sign_in_as(create(:user, :admin))
result = query(mode: 'summary', rows: 'linked_tags', cols: '', sort: '')
expect(result.fetch('cells')).to match_array([
{ 'values' => [''], 'count' => 2 },
{ 'values' => [tag.id.to_s], 'count' => 1 }])
expect(versions(query(axis('linked_tags', tag.id.to_s)))).to eq([2])
end
it 'rejects the physical column as a public filter, axis, sort or change field' do
sign_in_as(create(:user, :admin))
[
axis('linked_tag_ids', tag.id.to_s),
axis('changed_field', 'linked_tag_ids'),
{ mode: 'summary', rows: 'linked_tag_ids', cols: '', sort: '' },
{ sort: 'linked_tag_ids:asc' }].each do |invalid|
get '/counts/query', params: base.merge(invalid)
expect(response).to have_http_status(:bad_request), invalid.inspect
end
end
end
it 'identifies a totals timeout without exposing SQL in the error response' do
allow_any_instance_of(CountsPivotTotals).to receive(:call)
.and_raise(CountsPivotTotals::TimedOut, 'private SQL')
@@ -223,11 +332,10 @@ RSpec.describe 'Counts table API', type: :request do
expect(versions(query(tags: 'renamed-alpha'))).to eq([1, 2, 4])
end
it 'resolves external names from current registrations too' do
external.update!(name: 'renamed-beta')
expect(versions(query(tags: 'nico:renamed-beta'))).to eq([1])
expect(versions(query(tags: 'nico:beta'))).to eq([])
expect(versions(query(tags: 'not:nico:renamed-beta'))).to eq([2, 3, 4])
it 'resolves immutable external names across historical snapshots' do
expect(versions(query(tags: 'nico:beta'))).to eq([1])
expect(versions(query(tags: 'nico:renamed-beta'))).to eq([])
expect(versions(query(tags: 'not:nico:beta'))).to eq([2, 3, 4])
end
end
+8 -14
ファイルの表示
@@ -38,12 +38,9 @@ RSpec.describe 'NicoTags', type: :request do
end
it 'filters by nico tag name, linked tag name, and link status' do
linked = create(:external_tag)
linked.update!(name: 'search_linked')
unlinked = create(:external_tag)
unlinked.update!(name: 'search_unlinked')
other = create(:external_tag)
other.update!(name: 'other')
linked = create(:external_tag, name: 'search_linked')
unlinked = create(:external_tag, name: 'search_unlinked')
other = create(:external_tag, name: 'other')
destination = create(:tag, category: :general)
primary_tag_name_for(destination, 'ja').update!(name: 'destination_search')
NicoTagRelation.create!(nico_tag: linked, tag: destination)
@@ -80,11 +77,9 @@ RSpec.describe 'NicoTags', type: :request do
end
it 'sorts by name and timestamps' do
older = create(:external_tag)
older.update!(name: 'ordered_a')
older = create(:external_tag, name: 'ordered_a')
older.update_columns(created_at: 2.days.ago)
newer = create(:external_tag)
newer.update!(name: 'ordered_b')
newer = create(:external_tag, name: 'ordered_b')
newer.update_columns(created_at: 1.day.ago)
older_post_tag =
PostExternalTag.create!(post: create(:post), external_tag: older)
@@ -189,9 +184,8 @@ RSpec.describe 'NicoTags', type: :request do
versions = nico_tag.reload.nico_tag_versions.order(:version_no)
expect(versions.map(&:event_type)).to eq(['create', 'update'])
expect(versions.last.linked_tags.split).to match_array([
'nico_linked_a',
'nico_linked_b'])
expect(versions.last.linked_tag_ids.split.map(&:to_i))
.to match_array([linked_a.id, linked_b.id])
expect(versions.last.created_by_user_id).to eq(admin.id)
end
@@ -210,7 +204,7 @@ RSpec.describe 'NicoTags', type: :request do
expect(json).to eq([])
expect(nico_tag.reload.linked_tags).to be_empty
expect(nico_tag.nico_tag_versions.order(:version_no).last)
.to have_attributes(linked_tags: '', created_by_user: member)
.to have_attributes(linked_tag_ids: '', created_by_user: member)
end
it 'returns the tags field error when a nico tag is specified directly' do
+1 -1
ファイルの表示
@@ -20,7 +20,7 @@ RSpec.describe 'Post history privacy', type: :request do
created_at: origin + index.hours)
end
NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create',
name: 'nico:external-history-tag', linked_tags: 'private-history-tag',
linked_tag_ids: tag.id.to_s,
created_at: origin)
['create', 'discard', 'restore', 'update'].each_with_index do |event, index|
snapshots =
+190
ファイルの表示
@@ -0,0 +1,190 @@
require 'rails_helper'
RSpec.describe 'Submissions', type: :request do
let(:user) { create(:user) }
let(:admin) { create(:user, :admin) }
let(:opinion) { { category: 'opinion', content: '御意見です.' } }
def record_version(target, event_type)
recorder = { Post => [PostVersionRecorder, :post],
Tag => [TagVersionRecorder, :tag],
Material => [MaterialVersionRecorder, :material] }.fetch(target.class)
recorder.first.record!(**{ recorder.last => target },
event_type:, created_by_user: admin)
target.reload
end
describe 'POST /submissions' do
it 'requires an authenticated user' do
expect { post '/submissions', params: opinion }
.not_to change(Submission, :count)
expect(response).to have_http_status(:unauthorized)
end
['guest', 'member', 'admin'].each do |role|
it "accepts opinions from #{ role } users using server identity" do
actor = create(:user, role:)
expect {
post '/submissions', params: opinion.merge(user_id: admin.id, role: 'admin'),
headers: cookie_headers(actor)
}.to change(Submission, :count).by(1)
expect(response).to have_http_status(:created)
expect(Submission.last.user).to eq(actor)
expect(Submission.last.target_id).to be_nil
expect(response.parsed_body.fetch('user')).to eq(
{ 'id' => actor.id, 'name' => actor.name })
expect(response.body).not_to include(actor.inheritance_code)
end
end
[{ content: '' }, { content: ' ' }, { content: 'x' * 5001 },
{ category: 'unknown' }, { target_id: 1 }].each do |attributes|
it "rejects invalid opinion attributes #{ attributes.keys }" do
sign_in_as(user)
expect { post '/submissions', params: opinion.merge(attributes) }
.not_to change(Submission, :count)
expect(response).to have_http_status(:unprocessable_entity)
expect(response.parsed_body.fetch('type')).to eq('validation_error')
end
end
it 'rejects banned users' do
sign_in_as(create(:user, :banned))
expect { post '/submissions', params: opinion }
.not_to change(Submission, :count)
expect(response).to have_http_status(:forbidden)
end
it 'rejects banned IP addresses for reads and writes' do
create(:ip_address, :banned, ip_address: IPAddr.new('192.0.2.1').hton)
headers = { 'REMOTE_ADDR' => '192.0.2.1' }
sign_in_as(user)
expect { post '/submissions', params: opinion, headers: }
.not_to change(Submission, :count)
expect(response).to have_http_status(:forbidden)
get '/submissions', headers:
expect(response).to have_http_status(:forbidden)
end
end
describe 'GET /submissions' do
it 'allows anonymous browsing without exposing user credentials' do
submission = Submission.create!(**opinion, user:)
get '/submissions'
expect(response).to have_http_status(:ok)
expect(response.parsed_body.fetch('submissions')).to contain_exactly(
include('id' => submission.id, 'content' => opinion[:content],
'user' => { 'id' => user.id, 'name' => user.name }))
expect(response.body).not_to include(user.inheritance_code)
expect(response.headers['Cache-Control']).to include('no-store')
end
it 'paginates newest first with stable ordering and a public count' do
submissions = Array.new(21) { Submission.create!(**opinion, user:) }
get '/submissions'
expect(response.parsed_body.fetch('count')).to eq(21)
expect(response.parsed_body.fetch('page_size')).to eq(20)
expect(response.parsed_body.fetch('submissions').pluck('id'))
.to eq(submissions.reverse.first(20).map(&:id))
get '/submissions', params: { page: 2 }
expect(response.parsed_body.fetch('submissions').pluck('id'))
.to eq([submissions.first.id])
end
end
['post_removal', 'tag_removal', 'material_removal'].each do |category|
context category do
let(:target) do
case category
when 'post_removal' then create(:post)
when 'tag_removal' then create(:tag)
when 'material_removal' then Material.create!(url: 'https://example.com/material')
end
end
let(:attributes) { { category:, target_id: target.id, content: '除票を申請します.' } }
it 'stores a guest request without changing the target or its history' do
sign_in_as(user)
original = target.attributes
version_model = Submission::TARGETS.fetch(category)[1]
expect {
post '/submissions', params: attributes.merge(target_version_no: 99999)
}.not_to change(version_model, :count)
expect(response).to have_http_status(:created)
expect(target.reload.attributes).to eq(original)
expect(Submission.last).to have_attributes(
category:, target_id: target.id, target_version_no: target.version_no, user:)
sign_out
get '/submissions'
expect(response.parsed_body.fetch('submissions').pluck('id'))
.to eq([Submission.last.id])
end
[nil, 0, -1, '1.5', '1x', 2**63].each do |target_id|
it "rejects invalid target ID #{ target_id.inspect }" do
sign_in_as(user)
expect { post '/submissions', params: attributes.merge(target_id:) }
.not_to change(Submission, :count)
expect(response).to have_http_status(:unprocessable_entity)
expect(response.parsed_body.fetch('errors')).to have_key('target_id')
end
end
it 'rejects a missing target' do
sign_in_as(user)
post '/submissions', params: attributes.merge(target_id: 2**62)
expect(response).to have_http_status(:unprocessable_entity)
end
it 'hides pre-removal requests after restores and every later removal' do
record_version(target, 'create')
original = Submission.create!(**attributes, user:)
record_version(target, 'discard')
sign_in_as(user)
post '/submissions', params: attributes
expect(response).to have_http_status(:unprocessable_entity)
boundary = HistoryAccess.set(user: admin) { Submission.create!(**attributes, user: admin) }
record_version(target, 'restore')
restored = Submission.create!(**attributes, user:)
[nil, user, create(:user, :member)].each do |actor|
sign_in_as(actor)
get '/submissions', params: { role: 'admin' }
expect(response.parsed_body.fetch('submissions').pluck('id')).to eq([restored.id])
expect(response.parsed_body.fetch('count')).to eq(1)
end
record_version(target, 'discard')
record_version(target, 'restore')
sign_out
get '/submissions'
expect(response.parsed_body.fetch('submissions')).to eq([])
expect(response.parsed_body.fetch('count')).to eq(0)
sign_in_as(admin)
get '/submissions'
expect(response.parsed_body.fetch('submissions').pluck('id'))
.to eq([restored.id, boundary.id, original.id])
expect(response.parsed_body.fetch('count')).to eq(3)
end
end
end
end
+49
ファイルの表示
@@ -22,6 +22,55 @@ RSpec.describe 'Counts export contracts' do
.and_return(@counts_export_dir)
end
context 'nico link IDs with the V1 export field name' do
let(:tag) { create(:tag, primary_name: 'linked export tag') }
let(:external) { create(:external_tag, name: 'external export tag') }
let(:payload) do
super().merge('resource' => 'nico_tags', 'columns' => 'linked_tags',
'headers' => '["linked_tags"]')
end
before do
NicoTagVersion.create!(external_tag: external, version_no: 1,
event_type: 'create', linked_tag_ids: '', created_at: Time.utc(2023))
NicoTagVersion.create!(external_tag: external, version_no: 2,
event_type: 'update', linked_tag_ids: tag.id.to_s, created_at: Time.utc(2024))
end
it 'exports recorded IDs with the legacy JSON key and metadata' do
result = JSON.parse(CountsTableExport.new(payload).body.to_a.join)
expect(result.fetch('data')).to eq([
{ 'linked_tags' => '' }, { 'linked_tags' => tag.id.to_s }])
expect(result.fetch('metadata').fetch('columns')).to eq(['linked_tags'])
keys = result.fetch('metadata').fetch('fields').map { _1.fetch('key') }
expect(keys).to include('linked_tags')
expect(keys).not_to include('linked_tag_ids')
end
it 'exports the selected legacy CSV header and ID values' do
body = CountsTableExport.new(payload.merge('format' => 'csv')).body.to_a.join
expect(CSV.parse(body.delete_prefix("\uFEFF")))
.to eq([['linked_tags'], [''], [tag.id.to_s]])
end
it 'keeps the legacy link column in default JSON exports' do
options = payload.except('columns', 'headers')
result = JSON.parse(CountsTableExport.new(options).body.to_a.join)
expect(result.fetch('metadata').fetch('columns')).to include('linked_tags')
result.fetch('data').each do |row|
expect(row).to have_key('linked_tags')
expect(row).not_to have_key('linked_tag_ids')
end
end
it 'rejects the physical column as a selected CSV or JSON field' do
['csv', 'json'].each do |format|
options = payload.merge('format' => format, 'columns' => 'linked_tag_ids')
expect { CountsTableExport.new(options) }.to raise_error(ArgumentError)
end
end
end
context 'serialization after the authorised query' do
let(:rows) { [{ title: "=formula\n\"quoted\"" }, { title: 'second' }] }
let(:page) do
+18 -8
ファイルの表示
@@ -8,21 +8,23 @@ RSpec.describe NicoTagVersionRecorder do
described_class.record!(external_tag:, event_type:, created_by_user: member)
end
it 'records the external association and platform-qualified name' do
it 'records the external association and derives the platform-qualified name' do
version = record(:create)
expect(version).to have_attributes(
external_tag:, version_no: 1, event_type: 'create',
name: 'nico:raw tag[]', linked_tags: '', created_by_user: member)
name: 'nico:raw tag[]', linked_tag_ids: '', created_by_user: member)
expect(external_tag.reload.nico_tag_versions).to contain_exactly(version)
end
it 'uses the latest history number when the record has no version_no column' do
first = record(:create)
external_tag.update!(name: 'changed')
tag = create(:tag)
NicoTagRelation.create!(nico_tag: external_tag, tag:)
second = record(:update)
expect(second).to have_attributes(version_no: 2, name: 'nico:changed')
expect(second).to have_attributes(version_no: 2, name: 'nico:raw tag[]',
linked_tag_ids: tag.id.to_s)
expect(first.reload.name).to eq('nico:raw tag[]')
expect(external_tag.reload.has_attribute?(:version_no)).to be(false)
end
@@ -40,7 +42,7 @@ RSpec.describe NicoTagVersionRecorder do
expect(version).to have_attributes(
external_tag: external, name: 'registered_external:foo', version_no: 1,
event_type: 'create', linked_tags: '', created_by_user: member)
event_type: 'create', linked_tag_ids: '', created_by_user: member)
end
it 'returns the latest version without appending an unchanged snapshot' do
@@ -64,13 +66,21 @@ RSpec.describe NicoTagVersionRecorder do
expect(external_tag.nico_tag_versions).to contain_exactly(first)
end
it 'records sorted linked internal names and later link removal' do
it 'rejects discard and restore events for external tags' do
[:discard, :restore].each do |event_type|
expect { record(event_type) }
.to raise_error(ArgumentError, "Invalid event_type: #{ event_type }")
end
end
it 'records sorted linked internal IDs and later link removal' do
tags = ['z_link', 'a_link'].map { |name| create(:tag, primary_name: name, category: :general) }
tags.each { |tag| NicoTagRelation.create!(nico_tag: external_tag, tag:) }
expect(record(:create).linked_tags).to eq('a_link z_link')
expect(record(:create).linked_tag_ids).to eq(tags.map(&:id).sort.join(' '))
external_tag.linked_tags = [tags.first]
expect(record(:update)).to have_attributes(version_no: 2, linked_tags: 'z_link')
expect(record(:update)).to have_attributes(version_no: 2, linked_tag_ids: tags.first.id.to_s)
end
end
+3366
ファイルの表示
ファイル差分が大きすぎるため省略します 差分を読み込み
+12 -4
ファイルの表示
@@ -158,7 +158,15 @@ private ID の正誤に応じて許可可否を変えないため、条件の一
非公開列を含む列順変更は API の column_values_editable でも不可と通知する。
公開列の値を使うソートは引き続き利用できる。
明細には元の認可を適用し、抽出条件自体や取得済みの全言語値を表示設定で改変しない。
外部タグ履歴の linked_tags は名前しか記録していないため、非公開タグの記録名を含む
スナップショットを保守的に非公開とする。名前全体を空白区切りの境界で照合する。
区切りが曖昧な旧データでは過剰な秘匿の可能性はあるが、参照 ID がない旧形式から
名前の公開可否を楽観的に推定しない。
外部タグ履歴の linked_tag_ids は、連携する内部タグの ID を半角スペース区切りで
記録する。除票履歴のある内部タグの ID を含むスナップショットを非管理者へ公開しない。
名前や UI ロカールを参照 ID の判定に使わない。
外部タグ名は履歴に保存せず、external_tags の platform と name を参照する。
V1 Counts の公開フィールド名は linked_tags を維持し、DB の linked_tag_ids へ対応付ける。
明細・フィルタ・集計軸・変更項目・ソート・CSV / JSON 出力で同じ対応付けを使う。
既定列と既存の表示ラベルも linked_tags のままとし、値は ID のスペース区切りとする。
linked_tag_ids は物理カラム名であり、Counts の公開フィールドとしては受け付けない。
旧 URL や保存済み設定のフィールド指定は維持できるが、値にタグ名を指定した検索条件や
ドリル条件は ID 値への見直しが必要となる。旧履歴の名称は移行後の ID 列から復元できず、
現在の名称からの推定変換も行わない。
+3
ファイルの表示
@@ -83,6 +83,7 @@ const MaterialSyncSuppressionsPage = lazyPage (
() => import ('@/pages/materials/MaterialSyncSuppressionsPage'))
const CountsResourcePage = lazyPage (() => import ('@/pages/counts/CountsResourcePage'))
const MorePage = lazyPage (() => import ('@/pages/MorePage'))
const SubmissionsPage = lazyPage (() => import ('@/pages/SubmissionsPage'))
const GekanatorUnavailablePage = lazyPage (() => import ('@/pages/GekanatorUnavailablePage'))
const NicoTagListPage = lazyPage (() => import ('@/pages/tags/NicoTagListPage'))
const TOSPage = lazyPage (() => import ('@/pages/TOSPage'))
@@ -217,6 +218,8 @@ export const pageRoutes = (
handle: { preload: CountsResourcePage.preload, prefetch: false, robots: 'noindex' } },
{ path: 'more', element: <MorePage/>,
handle: { preload: MorePage.preload, sitemap: ['static'] } },
{ path: 'submissions', element: <SubmissionsPage user={user}/>,
handle: { preload: SubmissionsPage.preload, robots: 'noindex' } },
{ path: '*', element: <NotFound/>, handle: { notFound: true } }]
+2
ファイルの表示
@@ -129,6 +129,8 @@ export const menuOutline = (
{ ...message ('list'), to: '/users', visible: false },
{ ...message ('currentUser'), to: `/users/${ user?.id }`, visible: false },
{ ...message ('settings'), to: '/users/settings', visible: Boolean (user) }] },
{ ...message ('submissions'), visible: false, subMenu: [
{ ...message ('list'), to: '/submissions' }] },
{ ...message ('legal'), visible: false, subMenu: [
{ ...message ('terms'), to: '/tos' }] }]
}
+5
ファイルの表示
@@ -11,6 +11,11 @@ export const localesKeys = {
root: ['locales'] as const,
index: ['locales', 'index'] as const }
export const submissionsKeys = {
root: ['submissions'] as const,
index: (page: number, locale: LocaleCode) =>
['submissions', locale, 'index', page] as const }
export const postsKeys = {
root: ['posts'] as const,
index: (
+24
ファイルの表示
@@ -0,0 +1,24 @@
import { apiGet, apiPost } from '@/lib/api'
import type { LocaleCode } from '@/lib/locales'
import type { Submission, SubmissionCategory } from '@/types'
export type SubmissionIndex = { submissions: Submission[]
count: number
pageSize: number }
export const fetchSubmissions = (
page: number,
locale: LocaleCode,
): Promise<SubmissionIndex> =>
apiGet ('/submissions', { locale, params: { page } })
export const createSubmission = (
attributes: { category: SubmissionCategory
targetId: string
content: string },
locale: LocaleCode,
): Promise<Submission> =>
apiPost ('/submissions', { category: attributes.category,
target_id: attributes.category === 'opinion' ? null : attributes.targetId,
content: attributes.content }, { locale })
+3 -1
ファイルの表示
@@ -26,5 +26,7 @@
"terms": "エイワンケ イレンカ",
"more": "モㇱマ アン ペ »",
"counts": "ウコピㇱキ",
"externalTags": "ソイタ シロシ"
"externalTags": "ソイタ シロシ",
"submissions": "$t(submissions:title)",
"_untranslated": ["submissions"]
}
+14
ファイルの表示
@@ -0,0 +1,14 @@
{
"_untranslated": ["*"],
"title": "申請・御意見板",
"category": "種別",
"targetId": "対象 ID",
"submit": "送信",
"error": "申請の取得に失敗しました.",
"categories": {
"post_removal": "投稿の除票申請",
"tag_removal": "タグの除票申請",
"material_removal": "素材の除票申請",
"opinion": "御意見板"
}
}
+1
ファイルの表示
@@ -25,4 +25,5 @@
"settings": "設定",
"legal": "法規",
"terms": "利用規約",
"submissions": "$t(submissions:title)",
"more": "その他 »" }
+13
ファイルの表示
@@ -0,0 +1,13 @@
{
"title": "申請・御意見板",
"category": "種別",
"targetId": "対象 ID",
"submit": "送信",
"error": "申請の取得に失敗しました.",
"categories": {
"post_removal": "投稿の除票申請",
"tag_removal": "タグの除票申請",
"material_removal": "素材の除票申請",
"opinion": "御意見板"
}
}
+107
ファイルの表示
@@ -0,0 +1,107 @@
import { fireEvent, screen, waitFor } from '@testing-library/react'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import SubmissionsPage from '@/pages/SubmissionsPage'
import { buildUser } from '@/test/factories'
import { renderWithProviders } from '@/test/render'
const api = vi.hoisted (() => (
{ apiGet: vi.fn (), apiPost: vi.fn (), isApiError: vi.fn () }))
const toastApi = vi.hoisted (() => ({ toast: vi.fn () }))
vi.mock ('@/lib/api', () => api)
vi.mock ('@/components/ui/use-toast', () => toastApi)
const opinion = { id: 1,
category: 'opinion',
targetId: null,
content: '<script>public opinion</script>',
user: { id: 2, name: 'reader' },
createdAt: '2026-11-18T00:00:00Z' }
describe ('SubmissionsPage', () => {
beforeEach (() => {
vi.clearAllMocks ()
api.apiGet.mockResolvedValue ({ submissions: [opinion], count: 1, pageSize: 20 })
api.apiPost.mockResolvedValue ({ id: 2 })
api.isApiError.mockReturnValue (false)
})
it ('allows anonymous reading and renders submitted content as plain text', async () => {
const { container } = renderWithProviders (<SubmissionsPage user={null}/>, {
route: '/ja/submissions' })
expect (await screen.findByText (opinion.content)).toBeInTheDocument ()
expect (container.querySelector ('script')).toBeNull ()
expect (screen.getByRole ('button', { name: '送信' })).toBeDisabled ()
})
for (const category of ['post_removal', 'tag_removal', 'material_removal'])
{
it (`submits ${category} for a guest and refreshes the public list`, async () => {
renderWithProviders (<SubmissionsPage user={buildUser ({ role: 'guest' })}/>, {
route: '/ja/submissions' })
await screen.findByText (opinion.content)
fireEvent.change (screen.getByRole ('combobox'), { target: { value: category } })
fireEvent.change (screen.getByLabelText ('対象 ID'), { target: { value: '42' } })
fireEvent.change (screen.getByLabelText ('内容'), { target: { value: '除票の理由' } })
const calls = api.apiGet.mock.calls.length
fireEvent.click (screen.getByRole ('button', { name: '送信' }))
await waitFor (() => {
expect (api.apiPost).toHaveBeenCalledWith ('/submissions', {
category, target_id: '42', content: '除票の理由' }, { locale: 'ja' })
expect (api.apiGet.mock.calls.length).toBeGreaterThan (calls)
expect (screen.getByLabelText ('内容')).toHaveValue ('')
})
})
}
it ('submits opinions without a target and preserves free text', async () => {
renderWithProviders (<SubmissionsPage user={buildUser ()}/>, {
route: '/ja/submissions' })
fireEvent.change (screen.getByLabelText ('対象 ID'), { target: { value: '42' } })
fireEvent.change (screen.getByRole ('combobox'), { target: { value: 'opinion' } })
expect (screen.queryByLabelText ('対象 ID')).not.toBeInTheDocument ()
const content = '空白 を含む,御意見\n二行目'
fireEvent.change (screen.getByLabelText ('内容'), { target: { value: content } })
fireEvent.click (screen.getByRole ('button', { name: '送信' }))
await waitFor (() => {
expect (api.apiPost).toHaveBeenCalledWith ('/submissions', {
category: 'opinion', target_id: null, content }, { locale: 'ja' })
})
})
it ('retains inputs and shows server validation errors', async () => {
api.isApiError.mockReturnValue (true)
api.apiPost.mockRejectedValue ({ response: { status: 422, data: {
type: 'validation_error', errors: { target_id: ['対象が不正です.'] },
base_errors: [] } } })
renderWithProviders (<SubmissionsPage user={buildUser ()}/>, {
route: '/ja/submissions' })
fireEvent.change (screen.getByLabelText ('対象 ID'), { target: { value: '42' } })
fireEvent.change (screen.getByLabelText ('内容'), { target: { value: '理由' } })
fireEvent.click (screen.getByRole ('button', { name: '送信' }))
expect (await screen.findByText ('対象が不正です.')).toBeInTheDocument ()
expect (screen.getByLabelText ('対象 ID')).toHaveAttribute ('aria-invalid', 'true')
expect (screen.getByLabelText ('内容')).toHaveValue ('理由')
})
it ('uses the existing pagination and Japanese fallback language metadata', async () => {
api.apiGet.mockResolvedValue ({ submissions: [], count: 41, pageSize: 20 })
renderWithProviders (<SubmissionsPage user={null}/>, {
route: '/ain-Kana/submissions?page=2' })
await waitFor (() => {
expect (api.apiGet).toHaveBeenCalledWith ('/submissions', {
locale: 'ain-Kana', params: { page: 2 } })
})
expect (await screen.findByRole ('navigation')).toBeInTheDocument ()
expect (screen.getByRole ('option', { name: '御意見板' })).toHaveAttribute ('lang', 'ja')
expect (screen.getByRole ('heading', { name: '申請・御意見板' })).toBeInTheDocument ()
expect (screen.getByRole ('link', { name: '3' }))
.toHaveAttribute ('href', '/ain-Kana/submissions?page=3')
})
})
+153
ファイルの表示
@@ -0,0 +1,153 @@
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useState } from 'react'
import { useSearchParams } from 'react-router-dom'
import FieldError from '@/components/common/FieldError'
import Form from '@/components/common/Form'
import FormField from '@/components/common/FormField'
import PageHead from '@/components/common/PageHead'
import PageTitle from '@/components/common/PageTitle'
import Pagination from '@/components/common/Pagination'
import TextArea from '@/components/common/TextArea'
import MainArea from '@/components/layout/MainArea'
import { Button } from '@/components/ui/button'
import { toast } from '@/components/ui/use-toast'
import { submissionsKeys } from '@/lib/queryKeys'
import { createSubmission, fetchSubmissions } from '@/lib/submissions'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation'
import { useValidationErrors } from '@/lib/useValidationErrors'
import { inputClass, localisedDateString } from '@/lib/utils'
import type { FC, FormEvent } from 'react'
import type { SubmissionCategory, User } from '@/types'
const CATEGORIES: SubmissionCategory[] = [
'post_removal', 'tag_removal', 'material_removal', 'opinion']
const SubmissionsPage: FC<{ user: User | null }> = ({ user }) => {
const locale = useLocale ()
const navigate = useLocaleNavigate ()
const { message, label } = useUITranslation ('submissions')
const client = useQueryClient ()
const [query] = useSearchParams ()
const pageValue = query.get ('page') ?? ''
const page =
pageValue.match (/^[1-9][0-9]{0,5}$/)?.[0] === pageValue
? Number (pageValue)
: 1
const [category, setCategory] = useState<SubmissionCategory> ('post_removal')
const [targetId, setTargetId] = useState ('')
const [content, setContent] = useState ('')
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<'category' | 'targetId' | 'content'> ()
const { data, isLoading: loading, isError: errorFlg } = useQuery ({
queryKey: submissionsKeys.index (page, locale),
queryFn: () => fetchSubmissions (page, locale) })
const { mutate, isPending: pending } = useMutation ({
mutationFn: () => createSubmission ({ category, targetId, content }, locale),
onSuccess: async () => {
setTargetId ('')
setContent ('')
await client.invalidateQueries ({ queryKey: submissionsKeys.root })
navigate ('/submissions')
toast ({ title: label ('shared:messages.postSuccess') })
},
onError: error => {
applyValidationError (error)
toast ({ title: label ('shared:messages.postFailed') })
} })
const handleSubmit = (event: FormEvent) => {
event.preventDefault ()
if (pending || user == null) return
clearValidationErrors ()
mutate ()
}
return (
<MainArea>
<PageHead title={message ('title')}/>
<div className="mx-auto max-w-3xl space-y-6">
<PageTitle>{label ('title')}</PageTitle>
<form onSubmit={handleSubmit}>
<fieldset disabled={pending || user == null}>
<Form>
<FieldError messages={baseErrors}/>
<FormField label={label ('category')} messages={fieldErrors.category}>
{({ describedBy, invalid }) => (
<select
value={category}
onChange={event => {
setCategory (event.target.value as SubmissionCategory)
setTargetId ('')
clearValidationErrors ()
}}
aria-label={message ('category').text}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}>
{CATEGORIES.map (value => (
<option key={value} value={value}
lang={message (`categories.${value}`).language}>
{message (`categories.${value}`).text}
</option>))}
</select>)}
</FormField>
{category !== 'opinion' && (
<FormField label={label ('targetId')} messages={fieldErrors.targetId}>
{({ describedBy, invalid }) => (
<input
value={targetId}
onChange={event => setTargetId (event.target.value)}
inputMode="numeric"
pattern="[1-9][0-9]*"
required
aria-label={message ('targetId').text}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}/>)}
</FormField>)}
<FormField label={label ('shared:labels.content')} messages={fieldErrors.content}>
{({ describedBy, invalid }) => (
<TextArea
value={content}
onChange={event => setContent (event.target.value)}
required
maxLength={5000}
aria-label={message ('shared:labels.content').text}
aria-describedby={describedBy}
invalid={invalid}/>)}
</FormField>
<Button type="submit">{label ('submit')}</Button>
</Form>
</fieldset>
</form>
{loading && <p>{label ('shared:messages.loading')}</p>}
{errorFlg && <FieldError messages={[label ('error')]}/>}
<div className="space-y-4">
{data?.submissions.map (submission => (
<article key={submission.id} className="border-b pb-4">
<h2 className="font-semibold">
{label (`categories.${submission.category}`)}
</h2>
{submission.targetId != null && (
<p>{label ('targetId')}: {submission.targetId}</p>)}
<p className="whitespace-pre-wrap break-words">{submission.content}</p>
<div className="text-sm">
{submission.user.name || label ('shared:labels.anonymous')}
{' / '}
<time dateTime={submission.createdAt} lang={locale}>
{localisedDateString (submission.createdAt, locale)}
</time>
</div>
</article>))}
</div>
{data != null && data.count > data.pageSize && (
<Pagination page={page} totalPages={Math.ceil (data.count / data.pageSize)}/>)}
</div>
</MainArea>)
}
export default SubmissionsPage
+13
ファイルの表示
@@ -10,6 +10,19 @@ import type { LocaleCode } from '@/lib/locales'
export type Category = typeof CATEGORIES[number]
export type SubmissionCategory =
| 'post_removal'
| 'tag_removal'
| 'material_removal'
| 'opinion'
export type Submission = { id: number
category: SubmissionCategory
targetId: number | null
content: string
user: Pick<User, 'id' | 'name'>
createdAt: string }
export type Deerjikist = { platform: Platform; code: string }
export type FetchPostsOrder = `${ FetchPostsOrderField }:${ 'asc' | 'desc' }`