#309

backend/app/controllers/tag_versions_controller.rb

@@ -1,92 +0,0 @@
-class TagVersionsController < ApplicationController
-  def index
-    tag_id = params[:id].presence
-    page = (params[:page].presence || 1).to_i
-    limit = (params[:limit].presence || 20).to_i
-
-    page = 1 if page < 1
-    limit = 1 if limit < 1
-
-    offset = (page - 1) * limit
-
-    q = TagVersion.joins(<<~SQL.squish)
-          LEFT JOIN
-            tag_versions prev
-            ON
-              prev.tag_id = tag_versions.tag_id
-              AND prev.version_no = tag_versions.version_no - 1
-        SQL
-      .select('tag_versions.*', 'prev.name AS prev_name', 'prev.category AS prev_category',
-              'prev.aliases AS prev_aliases', 'prev.parent_tag_ids AS prev_parent_tag_ids')
-    q = q.where('tag_versions.tag_id = ?', tag_id) if tag_id
-
-    count = q.except(:select, :order, :limit, :offset).count
-
-    versions = q.order(Arel.sql('tag_versions.created_at DESC, tag_versions.id DESC'))
-                .limit(limit)
-                .offset(offset)
-
-    render json: { versions: serialise_versions(versions), count: }
-  end
-
-  private
-
-  def serialise_versions rows
-    user_ids = rows.map(&:created_by_user_id).compact.uniq
-    users_by_id = User.where(id: user_ids).pluck(:id, :name).to_h
-
-    rows.map do |row|
-      cur_aliases = split_values(row.aliases)
-      prev_aliases = split_values(row.attributes['prev_aliases'])
-
-      cur_parent_tag_ids = split_parent_tag_ids(row.parent_tag_ids)
-      prev_parent_tag_ids = split_parent_tag_ids(row.attributes['prev_parent_tag_ids'])
-
-      all_parent_tag_ids = (cur_parent_tag_ids | prev_parent_tag_ids)
-
-      tags_by_id =
-          Tag
-          .includes(:tag_name, :materials, { tag_name: :wiki_page })
-          .where(id: all_parent_tag_ids)
-          .index_by(&:id)
-
-      parent_tags =
-          build_version_values(cur_parent_tag_ids, prev_parent_tag_ids, key: :tag_id)
-          .map do |h|
-            { tag: TagRepr.base(tags_by_id[h[:tag_id]]),
-              type: h[:type] }
-          end
-
-      { tag_id: row.tag_id,
-        version_no: row.version_no,
-        event_type: row.event_type,
-        name: { current: row.name, prev: row.attributes['prev_name'] },
-        category: { current: row.category, prev: row.attributes['prev_category'] },
-        aliases: build_version_values(cur_aliases, prev_aliases, key: :name),
-        parent_tags:,
-        created_at: row.created_at.iso8601,
-        created_by_user: row.created_by_user_id &&
-                         { id: row.created_by_user_id,
-                           name: users_by_id[row.created_by_user_id] } }
-    end
-  end
-
-  def build_version_values cur_values, prev_values, key:
-    (cur_values | prev_values).map do |value|
-      type =
-          if cur_values.include?(value) && prev_values.include?(value)
-            'context'
-          elsif cur_values.include?(value)
-            'added'
-          else
-            'removed'
-          end
-
-      { key => value, type: }
-    end
-  end
-
-  def split_values(values) = values.to_s.split(/\s+/).reject(&:blank?)
-
-  def split_parent_tag_ids(values) = split_values(values).map(&:to_i)
-end

backend/app/controllers/tags_controller.rb

@@ -66,7 +66,7 @@ class TagsController < ApplicationController
             .offset(offset)
             .to_a
 
-    render json: { tags: TagRepr.many(tags), count: q.size }
+    render json: { tags: TagRepr.base(tags), count: q.size }
   end
 
   def with_depth
@@ -209,52 +209,6 @@ class TagsController < ApplicationController
     render json: build_tag_children(tag)
   end
 
-  def update_all
-    return head :unauthorized unless current_user
-    return head :forbidden unless current_user.gte_member?
-
-    tag = Tag.find_by(id: params[:id])
-    return head :not_found unless tag
-
-    name = params[:name].to_s.strip
-    category = params[:category].to_s.strip
-    return head :unprocessable_entity if name.blank? || category.blank?
-
-    if name != tag.name &&
-        tag.in?([Tag.tagme, Tag.bot, Tag.no_deerjikist, Tag.video, Tag.niconico])
-      return render json: { error: 'システム・タグの名称は変更できません．' },
-                    status: :unprocessable_entity
-    end
-
-    if tag.nico? || category == 'nico'
-      return render json: { error: 'ニコタグは変更できません．' },
-                    status: :unprocessable_entity
-    end
-
-    alias_names = params[:aliases].to_s.split.uniq
-    parent_names = params[:parent_tags].to_s.split.uniq
-
-    ApplicationRecord.transaction do
-      TagVersioning.ensure_snapshot!(tag, created_by_user: current_user)
-
-      old_name = tag.name
-
-      tag.update!(category:)
-      tag.tag_name.update!(name:)
-
-      alias_names << old_name if name != old_name
-      alias_names.delete(name)
-
-      update_aliases!(tag, alias_names)
-      update_parent_tags!(tag, parent_names)
-
-      tag.reload
-      record_tag_version!(tag, event_type: :update, created_by_user: current_user)
-    end
-
-    render json: TagRepr.base(tag.reload)
-  end
-
   def update
     return head :unauthorized unless current_user
     return head :forbidden unless current_user.gte_member?
@@ -264,8 +218,8 @@ class TagsController < ApplicationController
 
     tag = Tag.find(params[:id])
 
-    if tag.nico? || (category.present? && category == 'nico')
+    if category.present? && tag.nico? != (category == 'nico')
-      return render json: { error: 'ニコタグは変更できません．' },
+      return render json: { error: 'ニコタグのカテゴリ変更はできません．' },
                     status: :unprocessable_entity
     end
 
@@ -283,7 +237,7 @@ class TagsController < ApplicationController
 
   private
 
-  def build_tag_children tag
+  def build_tag_children(tag)
     material = tag.materials.first
     file = nil
     content_type = nil
@@ -297,45 +251,11 @@ class TagsController < ApplicationController
         material: material.as_json&.merge(file:, content_type:))
   end
 
-  def record_tag_version! tag, event_type:, created_by_user:
+  def record_tag_version!(tag, event_type:, created_by_user:)
     if tag.nico?
       NicoTagVersionRecorder.record!(tag:, event_type:, created_by_user:)
     else
       TagVersionRecorder.record!(tag:, event_type:, created_by_user:)
     end
   end
-
-  def update_aliases! tag, alias_names
-    current_aliases = tag.tag_name.aliases.to_a
-
-    current_aliases.each do |alias_tag_name|
-      next if alias_names.include?(alias_tag_name.name)
-
-      alias_tag_name.update!(canonical: nil)
-    end
-
-    alias_names.each do |alias_name|
-      alias_tag_name = TagName.find_undiscard_or_create_by!(name: alias_name)
-      alias_tag_name.update!(canonical: tag.tag_name)
-    end
-  end
-
-  def update_parent_tags! tag, parent_names
-    parent_tags = Tag.normalise_tags(parent_names, with_tagme: false,
-                                                   with_no_deerjikist: false,
-                                                   deny_nico: true)
-
-    old_parent_tags = tag.parents.to_a
-
-    TagVersioning.record_tag_snapshots!((old_parent_tags + parent_tags).uniq,
-                                        created_by_user: current_user)
-
-    tag.reversed_tag_implications.destroy_all
-
-    parent_tags.each do |parent_tag|
-      next if parent_tag == tag
-
-      TagImplication.create!(tag:, parent_tag:)
-    end
-  end
 end

backend/app/controllers/users_controller.rb

@@ -1,26 +1,18 @@
 class UsersController < ApplicationController
   def create
-    return head :unprocessable_entity if request.remote_ip.blank?
+    user = User.create!(inheritance_code: SecureRandom.uuid, role: 'guest')
-
-    user = nil
-
-    User.transaction do
-      user = User.create!(inheritance_code: SecureRandom.uuid, role: :guest)
-      attach_ip_address!(user)
-    end
-
     render json: { code: user.inheritance_code,
-                   user: user.slice(:id, :name, :inheritance_code, :role) },
+                   user: user.slice(:id, :name, :inheritance_code, :role) }
-           status: :created
   end
 
   def verify
+    ip_bin = IPAddr.new(request.remote_ip).hton
+    ip_address = IpAddress.find_or_create_by!(ip_address: ip_bin)
+
     user = User.find_by(inheritance_code: params[:code])
     return render json: { valid: false } unless user
 
-    return head :unprocessable_entity if request.remote_ip.blank?
+    UserIp.find_or_create_by!(user:, ip_address:)
-
-    attach_ip_address!(user)
 
     render json: { valid: true, user: user.slice(:id, :name, :inheritance_code, :role) }
   end
@@ -49,18 +41,9 @@ class UsersController < ApplicationController
     return head :bad_request if name.blank?
 
     if user.update(name:)
-      render json: user.slice(:id, :name, :inheritance_code, :role), status: :ok
+      render json: user.slice(:id, :name, :inheritance_code, :role), status: :created
     else
       render json: user.errors, status: :unprocessable_entity
     end
   end
-
-  private
-
-  def attach_ip_address! user
-    ip_bin = IPAddr.new(request.remote_ip).hton
-    ip_address = IpAddress.create_or_find_by!(ip_address: ip_bin)
-
-    UserIp.create_or_find_by!(user:, ip_address:)
-  end
 end

backend/app/representations/tag_repr.rb

@@ -8,9 +8,10 @@ module TagRepr
   module_function
 
   def base tag
-    tag.as_json(BASE).merge(aliases: tag.snapshot_aliases,
+    tag.as_json(BASE)
-                            parents: tag.parents.map { _1.as_json(BASE) })
   end
 
-  def many(tags) = tags.map { |t| base(t) }
+  def many tags
+    tags.map { |t| base(t) }
+  end
 end

backend/config/routes.rb

@@ -6,11 +6,10 @@ Rails.application.routes.draw do
     delete ':child_id', action: :destroy
   end
 
-  resources :tags, only: [:index, :show] do
+  resources :tags, only: [:index, :show, :update] do
     collection do
       get :autocomplete
       get :'with-depth', action: :with_depth
-      get :versions, to: 'tag_versions#index'
 
       scope :name do
         get ':name/deerjikists', action: :deerjikists_by_name
@@ -20,9 +19,6 @@ Rails.application.routes.draw do
     end
 
     member do
-      put '', action: :update_all
-      patch '', action: :update
-
       get :deerjikists
     end
   end

backend/config/schedule.rb

@@ -1,19 +1,12 @@
 env :PATH, '/root/.rbenv/shims:/root/.rbenv/bin:/usr/local/bin:/usr/bin:/bin'
 
-set :path, '/var/www/btrc-hub/backend'
-set :environment, 'production'
 set :output, standard: '/var/log/btrc_hub_nico_sync.log',
              error:    '/var/log/btrc_hub_nico_sync_err.log'
 
-job_type :rake,
+every 1.day, at: '3:00 pm' do
-         'cd :path && set -a && . /etc/btrc-hub/backend.env && set +a && ' \
-         ':environment_variable=:environment bundle exec rake :task --silent :output'
-
-every 1.day, at: '11:00 am' do
   rake 'nico:sync', environment: 'production'
 end
 
 every 1.day, at: '0:00 am' do
   rake 'post_similarity:calc', environment: 'production'
-  rake 'tag_similarity:calc', environment: 'production'
 end

backend/lib/tasks/export_nico.rake

@@ -1,23 +0,0 @@
-namespace :nico do
-  desc 'ニコニコ DB 逆連携'
-  task export: :environment do
-    require 'open3'
-
-    mysql_user = ENV.fetch('MYSQL_USER')
-    mysql_pass = ENV.fetch('MYSQL_PASS')
-    nizika_nico_path = ENV.fetch('NIZIKA_NICO_PATH')
-
-    videos = Post.where('url LIKE ?', '%nicovideo.jp/watch/%').pluck(:url).filter_map {
-      _1[%r{nicovideo\.jp/watch/([^/?#]+)}, 1]
-    }.uniq
-
-    next if videos.empty?
-
-    _, stderr, status = Open3.capture3(
-        { 'MYSQL_USER' => mysql_user, 'MYSQL_PASS' => mysql_pass },
-        'python3', '-m', 'tracked_videos.put_bulk_upsert', *videos,
-        chdir: nizika_nico_path)
-
-    raise stderr unless status.success?
-  end
-end

backend/spec/requests/tag_versions_spec.rb

@@ -1,218 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe 'TagVersions API', type: :request do
-  let(:member) { create(:user, :member, name: 'version member') }
-
-  let!(:tag) { create(:tag, name: 'tag_versions_target', category: :general) }
-  let!(:other_tag) { create(:tag, name: 'tag_versions_other', category: :general) }
-
-  let!(:parent_shared) { create(:tag, name: 'parent_shared', category: :general) }
-  let!(:parent_old) { create(:tag, name: 'parent_old', category: :general) }
-  let!(:parent_new) { create(:tag, name: 'parent_new', category: :general) }
-  let!(:other_parent) { create(:tag, name: 'other_parent', category: :general) }
-
-  let(:t_v1) { Time.zone.local(2020, 1, 1, 12, 0, 0) }
-  let(:t_v2) { Time.zone.local(2020, 1, 2, 12, 0, 0) }
-  let(:t_other) { Time.zone.local(2020, 1, 3, 12, 0, 0) }
-
-  def create_tag_version!(
-    tag:,
-    version_no:,
-    event_type:,
-    name:,
-    category:,
-    aliases: [],
-    parent_tags: [],
-    created_by_user:,
-    created_at:
-  )
-    TagVersion.create!(
-      tag: tag,
-      version_no: version_no,
-      event_type: event_type,
-      name: name,
-      category: category,
-      aliases: Array(aliases).join(' '),
-      parent_tag_ids: Array(parent_tags).map(&:id).join(' '),
-      created_by_user: created_by_user,
-      created_at: created_at
-    )
-  end
-
-  let!(:v1) do
-    create_tag_version!(
-      tag: tag,
-      version_no: 1,
-      event_type: 'create',
-      name: 'old_tag_name',
-      category: 'general',
-      aliases: ['alias_shared', 'alias_old'],
-      parent_tags: [parent_shared, parent_old],
-      created_by_user: member,
-      created_at: t_v1
-    )
-  end
-
-  let!(:v2) do
-    create_tag_version!(
-      tag: tag,
-      version_no: 2,
-      event_type: 'update',
-      name: 'new_tag_name',
-      category: 'meme',
-      aliases: ['alias_shared', 'alias_new'],
-      parent_tags: [parent_shared, parent_new],
-      created_by_user: member,
-      created_at: t_v2
-    )
-  end
-
-  let!(:other_v1) do
-    create_tag_version!(
-      tag: other_tag,
-      version_no: 1,
-      event_type: 'create',
-      name: 'other_tag_name',
-      category: 'general',
-      aliases: ['other_alias'],
-      parent_tags: [other_parent],
-      created_by_user: member,
-      created_at: t_other
-    )
-  end
-
-  describe 'GET /tags/versions' do
-    it 'returns all versions in reverse chronological order when id is omitted' do
-      get '/tags/versions'
-
-      expect(response).to have_http_status(:ok)
-      expect(json).to include('versions', 'count')
-      expect(json.fetch('count')).to eq(3)
-
-      versions = json.fetch('versions')
-
-      expect(versions.map { |v| [v['tag_id'], v['version_no']] }).to eq([
-        [other_tag.id, 1],
-        [tag.id, 2],
-        [tag.id, 1]
-      ])
-    end
-
-    it 'returns versions for the specified tag with diffs' do
-      get '/tags/versions', params: { id: tag.id }
-
-      expect(response).to have_http_status(:ok)
-      expect(json).to include('versions', 'count')
-      expect(json.fetch('count')).to eq(2)
-
-      versions = json.fetch('versions')
-      expect(versions.map { |v| v['tag_id'] }.uniq).to eq([tag.id])
-      expect(versions.map { |v| v['version_no'] }).to eq([2, 1])
-
-      latest = versions.first
-      expect(latest).to include(
-        'tag_id' => tag.id,
-        'version_no' => 2,
-        'event_type' => 'update',
-        'created_by_user' => {
-          'id' => member.id,
-          'name' => member.name
-        }
-      )
-
-      expect(latest.fetch('name')).to eq(
-        'current' => 'new_tag_name',
-        'prev' => 'old_tag_name'
-      )
-      expect(latest.fetch('category')).to eq(
-        'current' => 'meme',
-        'prev' => 'general'
-      )
-      expect(latest.fetch('aliases')).to include(
-        { 'name' => 'alias_shared', 'type' => 'context' },
-        { 'name' => 'alias_new', 'type' => 'added' },
-        { 'name' => 'alias_old', 'type' => 'removed' }
-      )
-      expect(latest.fetch('parent_tags')).to include(
-        a_hash_including(
-          'type' => 'context',
-          'tag' => a_hash_including(
-            'id' => parent_shared.id
-          )
-        ),
-        a_hash_including(
-          'type' => 'added',
-          'tag' => a_hash_including(
-            'id' => parent_new.id
-          )
-        ),
-        a_hash_including(
-          'type' => 'removed',
-          'tag' => a_hash_including(
-            'id' => parent_old.id
-          )
-        )
-      )
-      expect(latest.fetch('created_at')).to eq(t_v2.iso8601)
-
-      first = versions.second
-      expect(first).to include(
-        'tag_id' => tag.id,
-        'version_no' => 1,
-        'event_type' => 'create',
-        'created_by_user' => {
-          'id' => member.id,
-          'name' => member.name
-        }
-      )
-      expect(first.fetch('name')).to eq(
-        'current' => 'old_tag_name',
-        'prev' => nil
-      )
-      expect(first.fetch('category')).to eq(
-        'current' => 'general',
-        'prev' => nil
-      )
-      expect(first.fetch('aliases')).to include(
-        { 'name' => 'alias_shared', 'type' => 'added' },
-        { 'name' => 'alias_old', 'type' => 'added' }
-      )
-      expect(first.fetch('parent_tags')).to include(
-        a_hash_including(
-          'type' => 'added',
-          'tag' => a_hash_including(
-            'id' => parent_shared.id
-          )
-        ),
-        a_hash_including(
-          'type' => 'added',
-          'tag' => a_hash_including(
-            'id' => parent_old.id
-          )
-        )
-      )
-      expect(first.fetch('created_at')).to eq(t_v1.iso8601)
-    end
-
-    it 'returns empty when the specified tag has no versions' do
-      fresh_tag = create(:tag, name: 'no_versions_tag', category: :general)
-
-      get '/tags/versions', params: { id: fresh_tag.id }
-
-      expect(response).to have_http_status(:ok)
-      expect(json.fetch('versions')).to eq([])
-      expect(json.fetch('count')).to eq(0)
-    end
-
-    it 'clamps page and limit to at least 1' do
-      get '/tags/versions', params: { id: tag.id, page: 0, limit: 0 }
-
-      expect(response).to have_http_status(:ok)
-      expect(json.fetch('count')).to eq(2)
-
-      versions = json.fetch('versions')
-      expect(versions.size).to eq(1)
-      expect(versions.first['version_no']).to eq(2)
-    end
-  end
-end

backend/spec/requests/tags_spec.rb

@@ -1,6 +1,7 @@
 require 'cgi'
 require 'rails_helper'
 
+
 RSpec.describe 'Tags API', type: :request do
   let!(:tn) { TagName.create!(name: 'spec_tag') }
   let!(:tag) { Tag.create!(tag_name: tn, category: :general) }
@@ -196,30 +197,6 @@ RSpec.describe 'Tags API', type: :request do
       expect(response_tags.size).to eq(1)
       expect(response_names).to eq(['norm_a'])
     end
-
-    it 'returns aliases and parent tags' do
-      parent_tag = Tag.create!(
-        tag_name: TagName.create!(name: 'index_parent_tag'),
-        category: :meme
-      )
-      TagImplication.create!(tag:, parent_tag:)
-
-      get '/tags', params: { name: 'spec_tag' }
-
-      expect(response).to have_http_status(:ok)
-
-      row = response_tags.find { |t| t['name'] == 'spec_tag' }
-
-      expect(row['aliases']).to include('unko')
-      expect(row['parents'].map { |t| t['name'] }).to include('index_parent_tag')
-
-      parent = row['parents'].find { |t| t['name'] == 'index_parent_tag' }
-      expect(parent).to include(
-        'id' => parent_tag.id,
-        'name' => 'index_parent_tag',
-        'category' => 'meme'
-      )
-    end
   end
 
   describe 'GET /tags/:id' do
@@ -243,28 +220,6 @@ RSpec.describe 'Tags API', type: :request do
         expect(json).to have_key('created_at')
         expect(json).to have_key('updated_at')
       end
-
-      it 'returns aliases and parent tags' do
-        parent_tag = Tag.create!(
-          tag_name: TagName.create!(name: 'show_parent_tag'),
-          category: :character
-        )
-        TagImplication.create!(tag:, parent_tag:)
-
-        request
-
-        expect(response).to have_http_status(:ok)
-
-        expect(json['aliases']).to include('unko')
-        expect(json['parents'].map { |t| t['name'] }).to include('show_parent_tag')
-
-        parent = json['parents'].find { |t| t['name'] == 'show_parent_tag' }
-        expect(parent).to include(
-          'id' => parent_tag.id,
-          'name' => 'show_parent_tag',
-          'category' => 'character'
-        )
-      end
     end
 
     context 'when tag does not exist' do
@@ -404,9 +359,9 @@ RSpec.describe 'Tags API', type: :request do
         expect(tag.category).to eq('meta')
       end
 
-      it '存在しない id なら 404 を返す' do
+      it '存在しない id だと RecordNotFound になる（通常は 404）' do
         patch '/tags/999999999', params: { name: 'x' }
-        expect(response).to have_http_status(:not_found)
+        expect(response.status).to be_in([404, 500])
       end
 
       it 'nico category への変更は 422 を返す' do
@@ -446,18 +401,21 @@ RSpec.describe 'Tags API', type: :request do
         expect(tag.reload.category).to eq('general')
       end
 
-      it 'returns 422 when updating nico tag name' do
+      it 'creates nico tag versions when updating nico tag name' do
         nico_tag_name = TagName.create!(name: 'nico:tags_spec_source')
         nico_tag = Tag.create!(tag_name: nico_tag_name, category: :nico)
 
         expect {
           patch "/tags/#{nico_tag.id}", params: { name: 'nico:tags_spec_renamed' }
-        }.not_to change(NicoTagVersion, :count)
+        }.to change(NicoTagVersion, :count).by(2)
 
-        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response).to have_http_status(:ok)
 
-        expect(nico_tag.reload.name).to eq('nico:tags_spec_source')
+        versions = nico_tag.reload.nico_tag_versions.order(:version_no)
-        expect(nico_tag.category).to eq('nico')
+        expect(versions.map(&:event_type)).to eq(['create', 'update'])
+        expect(versions.first.name).to eq('nico:tags_spec_source')
+        expect(versions.second.name).to eq('nico:tags_spec_renamed')
+        expect(versions.second.created_by_user_id).to eq(member_user.id)
       end
 
       it 'returns 422 when changing nico tag category to normal category' do
@@ -613,269 +571,4 @@ RSpec.describe 'Tags API', type: :request do
       expect(response).to have_http_status(:not_found)
     end
   end
-
-  describe 'PUT /tags/:id' do
-    context '未ログイン' do
-      before { stub_current_user(nil) }
-
-      it '401 を返す' do
-        put "/tags/#{ tag.id }", params: {
-          name: 'new',
-          category: 'general',
-          aliases: '',
-          parent_tags: '',
-        }
-
-        expect(response).to have_http_status(:unauthorized)
-      end
-    end
-
-    context 'ログインしてゐるが member でない' do
-      before { stub_current_user(non_member_user) }
-
-      it '403 を返す' do
-        put "/tags/#{ tag.id }", params: {
-          name: 'new',
-          category: 'general',
-          aliases: '',
-          parent_tags: '',
-        }
-
-        expect(response).to have_http_status(:forbidden)
-      end
-    end
-
-    context 'member' do
-      before { stub_current_user(member_user) }
-
-      it '存在しない id なら 404 を返す' do
-        put '/tags/999999999', params: {
-          name: 'new',
-          category: 'general',
-          aliases: '',
-          parent_tags: '',
-        }
-
-        expect(response).to have_http_status(:not_found)
-      end
-
-      it 'name が空なら 422 を返す' do
-        put "/tags/#{ tag.id }", params: {
-          name: '',
-          category: 'general',
-          aliases: '',
-          parent_tags: '',
-        }
-
-        expect(response).to have_http_status(:unprocessable_entity)
-        expect(tag.reload.name).to eq('spec_tag')
-      end
-
-      it 'category が空なら 422 を返す' do
-        put "/tags/#{ tag.id }", params: {
-          name: 'new',
-          category: '',
-          aliases: '',
-          parent_tags: '',
-        }
-
-        expect(response).to have_http_status(:unprocessable_entity)
-        expect(tag.reload.name).to eq('spec_tag')
-        expect(tag.category).to eq('general')
-      end
-
-      it 'name, category, aliases, parent tags をまとめて更新できる' do
-        old_parent = Tag.create!(
-          tag_name: TagName.create!(name: 'put_old_parent'),
-          category: :general
-        )
-        kept_parent = Tag.create!(
-          tag_name: TagName.create!(name: 'put_kept_parent'),
-          category: :general
-        )
-        TagImplication.create!(tag:, parent_tag: old_parent)
-        TagImplication.create!(tag:, parent_tag: kept_parent)
-
-        put "/tags/#{ tag.id }", params: {
-          name: 'put_renamed_tag',
-          category: 'meme',
-          aliases: 'put_alias_a put_alias_b put_alias_a',
-          parent_tags: 'put_kept_parent put_new_parent',
-        }
-
-        expect(response).to have_http_status(:ok)
-
-        tag.reload
-
-        expect(tag.name).to eq('put_renamed_tag')
-        expect(tag.category).to eq('meme')
-
-        expect(TagName.find_by(name: 'put_alias_a').canonical).to eq(tag.tag_name)
-        expect(TagName.find_by(name: 'put_alias_b').canonical).to eq(tag.tag_name)
-
-        old_name_alias = TagName.find_by(name: 'spec_tag')
-        expect(old_name_alias).to be_present
-        expect(old_name_alias.canonical).to eq(tag.tag_name)
-
-        expect(alias_tn.reload.canonical).to be_nil
-
-        expect(tag.parents.map(&:name)).to contain_exactly(
-          'put_kept_parent',
-          'put_new_parent'
-        )
-
-        expect(TagImplication.where(tag:, parent_tag: old_parent)).not_to exist
-
-        expect(json['name']).to eq('put_renamed_tag')
-        expect(json['category']).to eq('meme')
-        expect(json['aliases']).to contain_exactly(
-          'put_alias_a',
-          'put_alias_b',
-          'spec_tag'
-        )
-        expect(json['parents'].map { |t| t['name'] }).to contain_exactly(
-          'put_kept_parent',
-          'put_new_parent'
-        )
-      end
-
-      it 'aliases に現在名を指定しても alias には残さない' do
-        put "/tags/#{ tag.id }", params: {
-          name: 'spec_tag',
-          category: 'general',
-          aliases: 'spec_tag put_alias_self_test',
-          parent_tags: '',
-        }
-
-        expect(response).to have_http_status(:ok)
-
-        tag.reload
-
-        expect(TagName.find_by(name: 'put_alias_self_test').canonical).to eq(tag.tag_name)
-        expect(json['aliases']).to include('put_alias_self_test')
-        expect(json['aliases']).not_to include('spec_tag')
-      end
-
-      it 'parent_tags に自分自身を指定しても自己参照は作らない' do
-        put "/tags/#{ tag.id }", params: {
-          name: 'spec_tag',
-          category: 'general',
-          aliases: 'unko',
-          parent_tags: 'spec_tag',
-        }
-
-        expect(response).to have_http_status(:ok)
-
-        expect(TagImplication.where(tag:, parent_tag: tag)).not_to exist
-        expect(tag.reload.parents).to eq([])
-      end
-
-      it 'initial and update tag versions を作成する' do
-        expect {
-          put "/tags/#{ tag.id }", params: {
-            name: 'put_versioned_tag',
-            category: 'meta',
-            aliases: '',
-            parent_tags: '',
-          }
-        }.to change(TagVersion, :count).by(2)
-
-        expect(response).to have_http_status(:ok)
-
-        versions = tag.reload.tag_versions.order(:version_no)
-
-        expect(versions.map(&:event_type)).to eq(['create', 'update'])
-
-        expect(versions.first.name).to eq('spec_tag')
-        expect(versions.first.category).to eq('general')
-        expect(versions.first.aliases.split).to include('unko')
-
-        expect(versions.second.name).to eq('put_versioned_tag')
-        expect(versions.second.category).to eq('meta')
-        expect(versions.second.aliases.split).to include('spec_tag')
-        expect(versions.second.created_by_user_id).to eq(member_user.id)
-      end
-
-      it 'parent tag の snapshot も作成する' do
-        old_parent = Tag.create!(
-          tag_name: TagName.create!(name: 'put_snapshot_old_parent'),
-          category: :general
-        )
-        new_parent = Tag.create!(
-          tag_name: TagName.create!(name: 'put_snapshot_new_parent'),
-          category: :general
-        )
-        TagImplication.create!(tag:, parent_tag: old_parent)
-
-        put "/tags/#{ tag.id }", params: {
-          name: 'spec_tag',
-          category: 'general',
-          aliases: 'unko',
-          parent_tags: new_parent.name,
-        }
-
-        expect(response).to have_http_status(:ok)
-
-        expect(old_parent.reload.tag_versions.map(&:event_type)).to include('create')
-        expect(new_parent.reload.tag_versions.map(&:event_type)).to include('create')
-      end
-
-      it 'normal tag を nico category には変更できない' do
-        expect {
-          put "/tags/#{ tag.id }", params: {
-            name: 'spec_tag',
-            category: 'nico',
-            aliases: '',
-            parent_tags: '',
-          }
-        }.not_to change(TagVersion, :count)
-
-        expect(response).to have_http_status(:unprocessable_entity)
-
-        expect(tag.reload.name).to eq('spec_tag')
-        expect(tag.category).to eq('general')
-      end
-
-      it 'nico tag は更新できない' do
-        nico_tag = Tag.create!(
-          tag_name: TagName.create!(name: 'nico:put_update_all_ng'),
-          category: :nico
-        )
-
-        expect {
-          put "/tags/#{ nico_tag.id }", params: {
-            name: 'nico:put_update_all_renamed',
-            category: 'nico',
-            aliases: '',
-            parent_tags: '',
-          }
-        }.not_to change(NicoTagVersion, :count)
-
-        expect(response).to have_http_status(:unprocessable_entity)
-
-        expect(nico_tag.reload.name).to eq('nico:put_update_all_ng')
-        expect(nico_tag.category).to eq('nico')
-      end
-
-      it 'system tag の name は変更できない' do
-        system_tag = Tag.tagme
-        old_name = system_tag.name
-        old_category = system_tag.category
-
-        expect {
-          put "/tags/#{ system_tag.id }", params: {
-            name: 'put_system_tag_renamed',
-            category: old_category,
-            aliases: '',
-            parent_tags: '',
-          }
-        }.not_to change(TagVersion, :count)
-
-        expect(response).to have_http_status(:unprocessable_entity)
-
-        expect(system_tag.reload.name).to eq(old_name)
-        expect(system_tag.category).to eq(old_category)
-      end
-    end
-  end
 end

backend/spec/requests/users_spec.rb

@@ -1,10 +1,11 @@
 require "rails_helper"
 
+
 RSpec.describe "Users", type: :request do
   describe "POST /users" do
     it "creates guest user and returns code" do
       post "/users"
-      expect(response).to have_http_status(:created)
+      expect(response).to have_http_status(:ok)
       expect(json["code"]).to be_present
       expect(json["user"]["role"]).to eq("guest")
     end
@@ -37,7 +38,7 @@ RSpec.describe "Users", type: :request do
       sign_in_as(user)
       put "/users/#{user.id}", params: { name: "new-name" }
 
-      expect(response).to have_http_status(:ok)
+      expect(response).to have_http_status(:created)
       expect(json["id"]).to eq(user.id)
       expect(json["name"]).to eq("new-name")
 

backend/spec/tasks/nico_export_spec.rb

@@ -1,100 +0,0 @@
-require 'rails_helper'
-require 'rake'
-require 'open3'
-
-RSpec.describe 'nico:export' do
-  let(:task) { Rake::Task['nico:export'] }
-  let(:success_status) { instance_double(Process::Status, success?: true) }
-  let(:failure_status) { instance_double(Process::Status, success?: false) }
-
-  def create_post(url)
-    Post.create!(url:)
-  end
-
-  before(:all) do
-    Rails.application.load_tasks unless Rake::Task.task_defined?('nico:export')
-  end
-
-  before do
-    task.reenable
-
-    allow(ENV).to receive(:fetch).with('MYSQL_USER').and_return('mysql-user')
-    allow(ENV).to receive(:fetch).with('MYSQL_PASS').and_return('mysql-pass')
-    allow(ENV).to receive(:fetch).with('NIZIKA_NICO_PATH').and_return('/srv/nizika-nico')
-  end
-
-  describe 'export' do
-    it 'exports nicovideo ids to shared nico DB' do
-      create_post('https://www.nicovideo.jp/watch/sm12345?ref=foo')
-      create_post('https://www.nicovideo.jp/watch/so67890#comments')
-      create_post('https://www.nicovideo.jp/watch/nm24680')
-      create_post('https://example.com/watch/sm99999')
-
-      expect(Open3).to receive(:capture3) do |env, *args, **kwargs|
-        expect(env).to eq(
-          {
-            'MYSQL_USER' => 'mysql-user',
-            'MYSQL_PASS' => 'mysql-pass',
-          },
-        )
-
-        expect(args.take(3)).to eq(
-          [
-            'python3',
-            '-m',
-            'tracked_videos.put_bulk_upsert',
-          ],
-        )
-
-        expect(args.drop(3)).to contain_exactly(
-          'sm12345',
-          'so67890',
-          'nm24680',
-        )
-
-        expect(kwargs).to eq(chdir: '/srv/nizika-nico')
-
-        ['', '', success_status]
-      end
-
-      task.invoke
-    end
-
-    it 'deduplicates video ids' do
-      create_post('https://www.nicovideo.jp/watch/sm12345')
-      create_post('https://www.nicovideo.jp/watch/sm12345?from=1')
-
-      expect(Open3).to receive(:capture3) do |_env, *args, **_kwargs|
-        expect(args.drop(3)).to eq(['sm12345'])
-
-        ['', '', success_status]
-      end
-
-      task.invoke
-    end
-
-    it 'does not call python when there are no nicovideo posts' do
-      create_post('https://example.com/watch/sm12345')
-
-      expect(Open3).not_to receive(:capture3)
-
-      task.invoke
-    end
-
-    it 'raises stderr when python command fails' do
-      create_post('https://www.nicovideo.jp/watch/sm12345')
-
-      allow(Open3).to receive(:capture3).and_return(
-        [
-          '',
-          'bulk upsert failed',
-          failure_status,
-        ],
-      )
-
-      expect {
-        task.invoke
-      }.to raise_error(RuntimeError, 'bulk upsert failed')
-    end
-  end
-end

frontend/src/App.tsx

@@ -26,8 +26,6 @@ import PostNewPage from '@/pages/posts/PostNewPage'
 import PostSearchPage from '@/pages/posts/PostSearchPage'
 import ServiceUnavailable from '@/pages/ServiceUnavailable'
 import SettingPage from '@/pages/users/SettingPage'
-import TagDetailPage from '@/pages/tags/TagDetailPage'
-import TagHistoryPage from '@/pages/tags/TagHistoryPage'
 import TagListPage from '@/pages/tags/TagListPage'
 import TheatreDetailPage from '@/pages/theatres/TheatreDetailPage'
 import WikiDetailPage from '@/pages/wiki/WikiDetailPage'
@@ -57,9 +55,7 @@ const RouteTransitionWrapper = ({ user, setUser }: {
 	  <Route path="/posts/:id" element={<PostDetailRoute user={user}/>}/>
 	  <Route path="/posts/changes" element={<PostHistoryPage/>}/>
 	  <Route path="/tags" element={<TagListPage/>}/>
-	  <Route path="/tags/:id" element={<TagDetailPage/>}/>
 	  <Route path="/tags/nico" element={<NicoTagListPage user={user}/>}/>
-	  <Route path="/tags/changes" element={<TagHistoryPage/>}/>
 	  <Route path="/theatres/:id" element={<TheatreDetailPage/>}/>
 	  <Route path="/materials" element={<MaterialBasePage/>}>
 	    <Route index element={<MaterialListPage/>}/>

frontend/src/components/TopNav.tsx

@@ -8,7 +8,7 @@ import PrefetchLink from '@/components/PrefetchLink'
 import TopNavUser from '@/components/TopNavUser'
 import { WikiIdBus } from '@/lib/eventBus/WikiIdBus'
 import { tagsKeys, wikiKeys } from '@/lib/queryKeys'
-import { fetchTag, fetchTagByName } from '@/lib/tags'
+import { fetchTagByName } from '@/lib/tags'
 import { cn } from '@/lib/utils'
 import { fetchWikiPage } from '@/lib/wiki'
 
@@ -29,8 +29,6 @@ export const menuOutline = ({ tag, wikiId, user, pathName }: {
   const wikiPageFlg = Boolean (/^\/wiki\/(?!new|changes)[^\/]+/.test (pathName) && wikiId)
   const wikiTitle = pathName.split ('/')[2] ?? ''
 
-  const tagFlg = /^\/tags\/\d+/.test (pathName)
-
   return [
       { name: '広場', to: '/posts', subMenu: [
 	  { name: '一覧', to: '/posts' },
@@ -40,15 +38,10 @@ export const menuOutline = ({ tag, wikiId, user, pathName }: {
 	  { name: 'ヘルプ', to: '/wiki/ヘルプ:広場' }] },
       { name: 'タグ', to: '/tags', subMenu: [
 	  { name: 'マスタ', to: '/tags' },
+	  { name: '別名タグ', to: '/tags/aliases', visible: false },
+	  { name: '上位タグ', to: '/tags/implications', visible: false },
 	  { name: 'ニコニコ連携', to: '/tags/nico' },
-	  { name: '履歴', to: '/tags/changes' },
+	  { name: 'ヘルプ', to: '/wiki/ヘルプ:タグ' }] },
-	  { name: 'ヘルプ', to: '/wiki/ヘルプ:タグ' },
-	  { component: <Separator/>, visible: tagFlg },
-	  { name: `広場 (${ postCount || 0 })`,
-	    to: `/posts?tags=${ encodeURIComponent (tag?.name ?? '') }`,
-	    visible: tagFlg },
-	  { name: '履歴', to: `/tags/changes?id=${ tag?.id }`,
-	    visible: tagFlg && tag?.category !== 'nico' }] },
       { name: '素材', to: '/materials', visible: false, subMenu: [
 	  { name: '一覧', to: '/materials' },
 	  { name: '検索', to: '/materials/search', visible: false }, 
@@ -121,14 +114,12 @@ export default (({ user }: Props) => {
       queryKey: wikiKeys.show (wikiIdStr, { }),
       queryFn: () => fetchWikiPage (wikiIdStr, { }) })
 
-  const tagFlg = /^\/tags\/\d+/.test (location.pathname)
+  const effectiveTitle = wikiPage?.title ?? ''
-  const effectiveTitle = (tagFlg ? location.pathname.split ('/')[2] : wikiPage?.title) ?? ''
 
   const { data: tag } = useQuery ({
       enabled: Boolean (effectiveTitle),
       queryKey: tagsKeys.show (effectiveTitle),
-      queryFn: () => (tagFlg ? fetchTag : fetchTagByName) (effectiveTitle) })
+      queryFn: () => fetchTagByName (effectiveTitle) })
-
 
   const menu = menuOutline ({ tag, wikiId, user, pathName: location.pathname })
   const visibleMenu = menu.filter ((item): item is MenuVisibleItem => item.visible ?? true)

frontend/src/lib/prefetchers.ts

@@ -3,7 +3,7 @@ import { match } from 'path-to-regexp'
 
 import { fetchPost, fetchPosts, fetchPostChanges } from '@/lib/posts'
 import { postsKeys, tagsKeys, wikiKeys } from '@/lib/queryKeys'
-import { fetchTagByName, fetchTag, fetchTagChanges, fetchTags } from '@/lib/tags'
+import { fetchTagByName, fetchTag, fetchTags } from '@/lib/tags'
 import { fetchWikiPage,
 	 fetchWikiPageByTitle,
 	 fetchWikiPages } from '@/lib/wiki'
@@ -14,7 +14,6 @@ type Prefetcher = (qc: QueryClient, url: URL) => Promise<void>
 
 const mPost = match<{ id: string }> ('/posts/:id')
 const mWiki = match<{ title: string }> ('/wiki/:title')
-const mTag = match<{ id: string }> ('/tags/:id')
 
 
 const prefetchWikiPagesIndex: Prefetcher = async (qc, url) => {
@@ -170,30 +169,6 @@ const prefetchTagsIndex: Prefetcher = async (qc, url) => {
 }
 
 
-const prefetchTagShow: Prefetcher = async (qc, url) => {
-  const m = mTag (url.pathname)
-  if (!(m))
-    return
-
-  const { id } = m.params
-
-  await qc.prefetchQuery ({
-      queryKey: tagsKeys.show (id),
-      queryFn:  () => fetchTag (id) })
-}
-
-
-const prefetchTagChanges: Prefetcher = async (qc, url) => {
-  const id = url.searchParams.get ('id')
-  const page = Number (url.searchParams.get ('page') || 1)
-  const limit = Number (url.searchParams.get ('limit') || 20)
-
-  await qc.prefetchQuery ({
-      queryKey: tagsKeys.changes ({ ...(id && { id }), page, limit }),
-      queryFn: () => fetchTagChanges ({ ...(id && { id }), page, limit }) })
-}
-
-
 export const routePrefetchers: { test: (u: URL) => boolean; run: Prefetcher }[] = [
     { test: u => ['/', '/posts', '/posts/search'].includes (u.pathname),
       run: prefetchPostsIndex },
@@ -205,11 +180,7 @@ export const routePrefetchers: { test: (u: URL) => boolean; run: Prefetcher }[]
     { test: u => (!(['/wiki/new', '/wiki/changes'].includes (u.pathname))
 		  && Boolean (mWiki (u.pathname))),
       run: prefetchWikiPageShow },
-    { test: u => u.pathname === '/tags', run: prefetchTagsIndex },
+    { test: u => u.pathname === '/tags', run: prefetchTagsIndex }]
-    { test: u => (!(['/tags/nico', '/tags/changes'].includes (u.pathname))
-		  && Boolean (mTag (u.pathname))),
-      run: prefetchTagShow },
-    { test: u => u.pathname === '/tags/changes', run: prefetchTagChanges }]
 
 
 export const prefetchForURL = async (qc: QueryClient, urlLike: string): Promise<void> => {

frontend/src/lib/queryKeys.ts

@@ -11,9 +11,7 @@ export const postsKeys = {
 export const tagsKeys = {
     root:   ['tags'] as const,
     index:  (p: FetchTagsParams) => ['tags', 'index', p] as const,
-    show:     (name: string) => ['tags', name] as const,
+    show:   (name: string) => ['tags', name] as const }
-    changes:  (p: { id?: string; page: number; limit: number }) =>
-		  ['tags', 'changes', p] as const }
 
 export const wikiKeys = {
     root:   ['wiki'] as const,

frontend/src/lib/tags.ts

@@ -1,6 +1,6 @@
 import { apiGet } from '@/lib/api'
 
-import type { FetchTagsParams, Tag, TagVersion } from '@/types'
+import type { FetchTagsParams, Tag } from '@/types'
 
 
 export const fetchTags = async (
@@ -45,14 +45,3 @@ export const fetchTagByName = async (name: string): Promise<Tag | null> => {
     return null
   }
 }
-
-
-export const fetchTagChanges = async (
-    { id, page, limit }: {
-	id?:    string
-	page:   number
-	limit:  number },
-): Promise<{
-    versions: TagVersion[]
-    count:    number }> =>
-	await apiGet ('/tags/versions', { params: { ...(id && { id }), page, limit } })

frontend/src/pages/tags/TagDetailPage.tsx

@@ -1,158 +0,0 @@
-import { useQuery, useQueryClient } from '@tanstack/react-query'
-import { useEffect, useState } from 'react'
-import { useParams } from 'react-router-dom'
-
-import TagLink from '@/components/TagLink'
-import Label from '@/components/common/Label'
-import PageTitle from '@/components/common/PageTitle'
-import MainArea from '@/components/layout/MainArea'
-import { toast } from '@/components/ui/use-toast'
-import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
-import { apiPut } from '@/lib/api'
-import { postsKeys, tagsKeys } from '@/lib/queryKeys'
-import { fetchTag } from '@/lib/tags'
-import { cn } from '@/lib/utils'
-
-import type { FC, FormEvent } from 'react'
-
-import type { Category, Tag } from '@/types'
-
-
-export default (() => {
-  const { id } = useParams ()
-  const tagId = String (id ?? '')
-  const tagKey = tagsKeys.show (tagId)
-
-  const { data: tag, isLoading: loading } = useQuery ({
-      queryKey: tagKey,
-      queryFn: () => fetchTag (tagId) })
-
-  const [name, setName] = useState ('')
-  const [category, setCategory] = useState<Category> ('general')
-  const [aliases, setAliases] = useState ('')
-  const [parentTags, setParentTags] = useState ('')
-  const [disabled, setDisabled] = useState (true)
-
-  const qc = useQueryClient ()
-
-  const handleSubmit = async (e: FormEvent) => {
-    e.preventDefault ()
-
-    const formData = new FormData
-    formData.append ('name', name)
-    formData.append ('category', category)
-    formData.append ('aliases', aliases)
-    formData.append ('parent_tags', parentTags)
-
-    try
-    {
-      const data = await apiPut<Tag> (`/tags/${ id }`, formData)
-
-      setName (data.name)
-      setCategory (data.category as Category)
-      setAliases (data.aliases.join (' '))
-      setParentTags (data.parents.map (t => t.name).join (' '))
-
-      qc.invalidateQueries ({ queryKey: postsKeys.root })
-      qc.invalidateQueries ({ queryKey: tagsKeys.root })
-      toast ({ description: '更新しました．' })
-    }
-    catch
-    {
-      toast ({ description: '更新に失敗しました．' })
-    }
-  }
-
-  useEffect (() => {
-    if (!(tag))
-      {
-	setDisabled (true)
-	return
-      }
-
-    setName (tag.name)
-    setCategory (tag.category as Category)
-    setAliases (tag.aliases.join (' '))
-    setParentTags (tag.parents.map (t => t.name).join (' '))
-    setDisabled (tag.category === 'nico')
-  }, [tag])
-
-  return (
-      <MainArea>
-	{(loading || !(tag)) ? 'Loading...' : (
-	    <div className="max-w-xl">
-	      <PageTitle>
-		<TagLink
-		    tag={tag}
-		    withWiki={false}
-		    withCount={false}/>
-	      </PageTitle>
-
-	      <form onSubmit={handleSubmit} className="my-4 space-y-2">
-		{/* 名称 */}
-		<div>
-		  <Label>名称</Label>
-		  {/* TODO: 補完に対応させる */}
-		  <input
-		      type="text"
-		      disabled={disabled}
-		      value={name}
-		      onChange={e => setName (e.target.value)}
-		      className="w-full border p-2 rounded"/>
-		</div>
-
-		{/* カテゴリ */}
-		<div>
-		  <Label>カテゴリ</Label>
-		  <select
-		      disabled={disabled}
-		      value={category ?? ''}
-		      onChange={e => setCategory(e.target.value as Category)}
-		      className="w-full border p-2 rounded">
-		    {CATEGORIES.filter (cat => tag.category === 'nico' || cat !== 'nico')
-			       .map (cat => (
-			<option key={cat} value={cat}>
-			  {CATEGORY_NAMES[cat]}
-			</option>))}
-		  </select>
-		</div>
-
-		{/* 別名 */}
-		<div>
-		  <Label>別名</Label>
-		  {/* TODO: 補完に対応させる */}
-		  <input
-		      type="text"
-		      disabled={disabled}
-		      value={aliases}
-		      onChange={e => setAliases (e.target.value)}
-		      className="w-full border p-2 rounded"/>
-		</div>
-
-		{/* 上位タグ */}
-		<div>
-		  <Label>上位タグ</Label>
-		  {/* TODO: 補完に対応させる */}
-		  <input
-		      type="text"
-		      disabled={disabled}
-		      value={parentTags}
-		      onChange={e => setParentTags (e.target.value)}
-		      className="w-full border p-2 rounded"/>
-		</div>
-
-		<div className="py-3">
-		  <button
-		      type="submit"
-		      disabled={disabled}
-		      className={cn ('px-4 py-2 rounded',
-				     (disabled
-				      ? 'text-gray-300 bg-gray-500'
-				      : 'text-white bg-blue-500'))}>
-		    更新
-		  </button>
-		</div>
-	      </form>
-	    </div>)}
-      </MainArea>)
-}) satisfies FC

frontend/src/pages/tags/TagHistoryPage.tsx

@@ -1,212 +0,0 @@
-import { useQuery, useQueryClient } from '@tanstack/react-query'
-import { useEffect } from 'react'
-import { Helmet } from 'react-helmet-async'
-import { useLocation } from 'react-router-dom'
-
-import PrefetchLink from '@/components/PrefetchLink'
-import PageTitle from '@/components/common/PageTitle'
-import Pagination from '@/components/common/Pagination'
-import MainArea from '@/components/layout/MainArea'
-import { toast } from '@/components/ui/use-toast'
-import { SITE_TITLE } from '@/config'
-import { CATEGORY_NAMES } from '@/consts'
-import { apiPut } from '@/lib/api'
-import { postsKeys, tagsKeys } from '@/lib/queryKeys'
-import { fetchTagChanges } from '@/lib/tags'
-import { cn, dateString } from '@/lib/utils'
-
-import type { FC } from 'react'
-
-
-const renderDiff = (diff: { current: string | null; prev: string | null }) => (
-    <>
-      {(diff.prev && diff.prev !== diff.current) && (
-	  <>
-	    <del className="text-red-600 dark:text-red-400">
-	      {diff.prev}
-	    </del>
-	    {diff.current && <br/>}
-	  </>)}
-      {diff.current}
-    </>)
-
-
-export default (() => {
-  const location = useLocation ()
-  const query = new URLSearchParams (location.search)
-  const id = query.get ('id')
-  const page = Number (query.get ('page') ?? 1)
-  const limit = Number (query.get ('limit') ?? 20)
-
-  const { data, isLoading: loading } = useQuery ({
-      queryKey: tagsKeys.changes ({ ...(id && { id }), page, limit }),
-      queryFn:  () => fetchTagChanges ({ ...(id && { id }), page, limit }) })
-  const changes = data?.versions ?? []
-  const totalPages = data ? Math.ceil (data.count / limit) : 0
-
-  const qc = useQueryClient ()
-
-  useEffect (() => {
-    document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
-  }, [location.search])
-
-  return (
-      <MainArea>
-	<Helmet>
-	  <title>{`タグ定義変更履歴 | ${ SITE_TITLE }`}</title>
-	</Helmet>
-
-	<PageTitle>
-	  タグ定義変更履歴
-	  {id && <>: タグ {<PrefetchLink to={`/tags/${ id }`}>#{id}</PrefetchLink>}</>}
-	</PageTitle>
-
-	{loading ? 'Loading...' : (
-	    <>
-	      <div className="overflow-x-auto">
-		<table className="w-full min-w-[1200px] table-fixed border-collapse">
-		  <colgroup>
-		    {/* 版 */}
-		    <col className="w-40"/>
-		    {/* 名称 */}
-		    <col className="w-96"/>
-		    {/* カテゴリ */}
-		    <col className="w-96"/>
-		    {/* 別名 */}
-		    <col className="w-[48rem]"/>
-		    {/* 上位タグ */}
-		    <col className="w-96"/>
-		    {/* 更新日時 */}
-		    <col className="w-64"/>
-		    {/* (差戻ボタン) */}
-		    <col className="w-20"/>
-		  </colgroup>
-
-		  <thead className="border-b-2 border-black dark:border-white">
-		    <tr>
-		      <th className="p-2 text-left">版</th>
-		      <th className="p-2 text-left">名称</th>
-		      <th className="p-2 text-left">カテゴリ</th>
-		      <th className="p-2 text-left">別名</th>
-		      <th className="p-2 text-left">上位タグ</th>
-		      <th className="p-2 text-left">更新日時</th>
-		      <th className="p-2"/>
-		    </tr>
-		  </thead>
-
-		  <tbody>
-		    {changes.map (change => (
-			<tr key={`${ change.tagId }.${ change.versionNo }`}
-			    className={cn ('even:bg-gray-100 dark:even:bg-gray-700')}>
-			  <td className="p-2">{change.tagId}.{change.versionNo}</td>
-			  <td className="p-2 break-all">{renderDiff (change.name)}</td>
-			  <td className="p-2 break-all">
-			    {renderDiff ({
-				current: CATEGORY_NAMES[change.category.current],
-				prev: (change.category.prev
-				       && CATEGORY_NAMES[change.category.prev]) })}
-			  </td>
-			  <td className="p-2">
-			    {change.aliases.map ((tag, i) => (
-				tag.type === 'added'
-				? (
-				    <ins
-					key={i}
-					className="mr-2 text-green-600 dark:text-green-400">
-				      {tag.name}
-				    </ins>)
-				: (
-				    tag.type === 'removed'
-				    ? (
-					<del
-					    key={i}
-					    className="mr-2 text-red-600 dark:text-red-400">
-					  {tag.name}
-					</del>)
-				    : (
-					<span key={i} className="mr-2">
-					  {tag.name}
-					</span>))))}
-			  </td>
-			  <td className="p-2">
-			    {change.parentTags.map ((tag, i) => (
-				tag.type === 'added'
-				? (
-				    <ins
-					key={i}
-					className="mr-2 text-green-600 dark:text-green-400">
-				      {tag.tag.name}
-				    </ins>)
-				: (
-				    tag.type === 'removed'
-				    ? (
-					<del
-					    key={i}
-					    className="mr-2 text-red-600 dark:text-red-400">
-					  {tag.tag.name}
-					</del>)
-				    : (
-					<span key={i} className="mr-2">
-					  {tag.tag.name}
-					</span>))))}
-			  </td>
-			  <td className="p-2">
-			    {change.createdByUser
-			     ? (
-				<PrefetchLink to={`/users/${ change.createdByUser.id }`}>
-				  {change.createdByUser.name
-				   || `名もなきニジラー（#${ change.createdByUser.id }）`}
-				</PrefetchLink>)
-			     : 'bot 操作'}
-			    <br/>
-			    {dateString (change.createdAt)}
-			  </td>
-			  <td className="p-2">
-			    <a
-				href="#"
-				onClick={async e => {
-				  e.preventDefault ()
-
-				  if (!(confirm (
-				      `タグ『${ change.name.current }』を版 ${
-				      change.versionNo } に差戻します．\nよろしいですか?`)))
-				    return
-
-				  try
-				  {
-				    await apiPut (
-					`/tags/${ change.tagId }`,
-					{ name: change.name.current,
-					  category: change.category.current,
-					  aliases:
-					      change.aliases
-					      .filter (t => t.type !== 'removed')
-					      .map (t => t.name)
-					      .join (' '),
-					  parent_tags:
-					      change.parentTags
-					      .filter (t => t.type !== 'removed')
-					      .map (t => t.tag.name)
-					      .join (' ') })
-
-				    qc.invalidateQueries ({ queryKey: postsKeys.root })
-				    qc.invalidateQueries ({ queryKey: tagsKeys.root })
-				    toast ({ description: '差戻しました．' })
-				  }
-				  catch
-				  {
-				    toast ({ description: '差戻に失敗……' })
-				  }
-				}}>
-			      復元
-			    </a>
-			  </td>
-			</tr>))}
-		  </tbody>
-		</table>
-	      </div>
-
-	      <Pagination page={page} totalPages={totalPages}/>
-	    </>)}
-      </MainArea>)
-}) satisfies FC

frontend/src/pages/tags/TagListPage.tsx

@@ -205,15 +205,13 @@ export default (() => {
 	{loading ? 'Loading...' : (results.length > 0 ? (
 	    <div className="mt-4">
 	      <div className="overflow-x-auto">
-		<table className="w-full min-w-[2000px] table-fixed border-collapse">
+		<table className="w-full min-w-[1200px] table-fixed border-collapse">
 		  <colgroup>
 		    <col className="w-72"/>
+		    <col className="w-48"/>
 		    <col className="w-16"/>
-		    <col className="w-48"/>
+		    <col className="w-44"/>
-		    <col className="w-72"/>
+		    <col className="w-44"/>
-		    <col className="w-48"/>
-		    <col className="w-56"/>
-		    <col className="w-56"/>
 		    <col className="w-16"/>
 		  </colgroup>
 
@@ -226,13 +224,6 @@ export default (() => {
 			    currentOrder={order}
 			    defaultDirection={defaultDirection}/>
 		      </th>
-		      <th className="p-2 text-left whitespace-nowrap">
-			<SortHeader<FetchTagsOrderField>
-			    by="post_count"
-			    label="件数"
-			    currentOrder={order}
-			    defaultDirection={defaultDirection}/>
-		      </th>
 		      <th className="p-2 text-left whitespace-nowrap">
 			<SortHeader<FetchTagsOrderField>
 			    by="category"
@@ -240,8 +231,13 @@ export default (() => {
 			    currentOrder={order}
 			    defaultDirection={defaultDirection}/>
 		      </th>
-		      <th className="p-2 text-left whitespace-nowrap">別名</th>
+		      <th className="p-2 text-left whitespace-nowrap">
-		      <th className="p-2 text-left whitespace-nowrap">上位タグ</th>
+			<SortHeader<FetchTagsOrderField>
+			    by="post_count"
+			    label="件数"
+			    currentOrder={order}
+			    defaultDirection={defaultDirection}/>
+		      </th>
 		      <th className="p-2 text-left whitespace-nowrap">
 			<SortHeader<FetchTagsOrderField>
 			    by="created_at"
@@ -264,23 +260,10 @@ export default (() => {
 		    {results.map (row => (
 			<tr key={row.id} className="even:bg-gray-100 dark:even:bg-gray-700">
 			  <td className="p-2">
-			    <TagLink
+			    <TagLink tag={row} withCount={false}/>
-				tag={row}
-				to={`/tags/${ encodeURIComponent (row.id) }`}
-				withCount={false}/>
 			  </td>
-			  <td className="p-2 text-right">{row.postCount}</td>
 			  <td className="p-2">{CATEGORY_NAMES[row.category]}</td>
-			  <td className="p-2">{row.aliases.join (' ')}</td>
+			  <td className="p-2 text-right">{row.postCount}</td>
-			  <td className="p-2">
-			    {row.parents.map (t => (
-				<span key={t.id} className="mr-2">
-				  <TagLink
-				      tag={t}
-				      withWiki={false}
-				      withCount={false}/>
-				</span>))}
-			  </td>
 			  <td className="p-2">{dateString (row.createdAt)}</td>
 			  <td className="p-2">{dateString (row.updatedAt)}</td>
 			  <td className="p-2">

frontend/src/pages/wiki/WikiDetailPage.tsx

@@ -114,15 +114,13 @@ export default () => {
 		     {...(version && { to: `/wiki/${ encodeURIComponent (title) }` })}/>
 	  </h1>
 	  {loading ? <div>Loading...</div> : <WikiBody title={title} body={wikiPage?.body}/>}
+	</article>
 
 	{(!(version) && posts.length > 0) && (
-	      <div className="not-prose">
 	    <TabGroup>
 	      <Tab name="広場">
 		<PostList posts={posts}/>
 	      </Tab>
-		</TabGroup>
+	    </TabGroup>)}
-	      </div>)}
-	</article>
       </MainArea>)
 }

frontend/src/types.ts

@@ -165,8 +165,6 @@ export type Tag = {
     id:             number
     name:           string
     category:       Category
-    aliases:        string[]
-    parents:        Tag[]
     postCount:      number
     createdAt:      string
     updatedAt:      string
@@ -175,17 +173,6 @@ export type Tag = {
     children?:      Tag[]
     matchedAlias?:  string | null }
 
-export type TagVersion = {
-    tagId:                  number
-    versionNo:              number
-    eventType:              'create' | 'update' | 'discard' | 'restore'
-    name:                   { current: string; prev: string | null }
-    category:               { current: Category; prev: Category | null }
-    aliases:                { name: string; type: 'context' | 'added' | 'removed' }[]
-    parentTags:             { tag: Tag; type: 'context' | 'added' | 'removed' }[]
-    createdAt:              string
-    createdByUser:          { id: number; name: string | null } | null }
-
 export type Theatre = {
     id:             number
     name:           string | null