#406

backend/app/controllers/tags_controller.rb

@@ -200,14 +200,45 @@ class TagsController < ApplicationController
              .find_by(id: params[:id])
     return head :not_found unless tag
 
+    rows = normalise_deerjikist_rows(tag)
+    return if performed?
+
     ApplicationRecord.transaction do
-      tag.deerjikists = []
-      params[:_json].each.with_index do |item, i|
-        platform = item[:platform]
-        code = normalise_deerjikist_code(platform, item[:code])
-        deerjikist = Deerjikist.find_or_initialize_by(platform:, code:)
-        deerjikist.tag = tag
-        render_deerjikist_form_record_invalid(deerjikist, i) unless deerjikist.save
+      tag.lock!
+
+      requested_keys = rows.map { |row| [row[:platform], row[:code]] }.uniq
+      row_indexes_by_key = rows_by_key(rows)
+      locked_deerjikists = lock_deerjikists_for_tag_update(tag.id, requested_keys)
+      current_deerjikists = locked_deerjikists.filter { |deerjikist|
+        deerjikist.tag_id == tag.id
+      }
+      requested_deerjikists = locked_deerjikists.filter { |deerjikist|
+        row_indexes_by_key.key?([deerjikist.platform, deerjikist.code])
+      }
+
+      render_deerjikist_conflicts(requested_deerjikists, row_indexes_by_key, tag)
+      raise ActiveRecord::Rollback if performed?
+
+      requested_keys_set = requested_keys.to_set
+      current_deerjikists.each do |deerjikist|
+        key = [deerjikist.platform, deerjikist.code]
+        deerjikist.destroy! unless requested_keys_set.include?(key)
+      end
+
+      existing_keys = requested_deerjikists.to_h { |deerjikist|
+        [[deerjikist.platform, deerjikist.code], true]
+      }
+      requested_keys.each do |platform, code|
+        next if existing_keys[[platform, code]]
+
+        deerjikist = Deerjikist.new(platform:, code:, tag:)
+        row_index = row_indexes_by_key[[platform, code]].first
+        begin
+          render_deerjikist_form_record_invalid(deerjikist, row_index) unless deerjikist.save
+        rescue ActiveRecord::RecordNotUnique
+          conflicts = lock_deerjikists_for_tag_update(tag.id, [[platform, code]])
+          render_deerjikist_conflicts(conflicts, row_indexes_by_key, tag)
+        end
         raise ActiveRecord::Rollback if performed?
       end
     end
@@ -653,6 +684,7 @@ class TagsController < ApplicationController
   end
 
   def normalise_deerjikist_code platform, code
+    code = code.to_s
     return code if platform != 'youtube' || code[0] != '@'
 
     url = "https://www.youtube.com/#{ code }"
@@ -669,6 +701,82 @@ class TagsController < ApplicationController
     nil
   end
 
+  def normalise_deerjikist_rows tag
+    rows = []
+
+    params[:_json].each.with_index do |item, index|
+      platform = item[:platform]
+      unless Deerjikist.platforms.key?(platform)
+        render_deerjikist_platform_invalid(index)
+        return rows
+      end
+
+      code = normalise_deerjikist_code(platform, item[:code])
+      deerjikist = Deerjikist.new(platform:, code:, tag:)
+      unless deerjikist.valid?
+        render_deerjikist_form_record_invalid(deerjikist, index)
+        return rows
+      end
+
+      rows << { index:, platform:, code: }
+    end
+
+    rows
+  end
+
+  def lock_deerjikists_for_tag_update tag_id, keys
+    clauses = ['tag_id = ?']
+    values = [tag_id]
+
+    keys.each do |platform, code|
+      clauses << '(platform = ? AND code = ?)'
+      values << platform << code
+    end
+
+    Deerjikist
+      .where(clauses.join(' OR '), *values)
+      .order(:platform, :code)
+      .lock
+      .to_a
+  end
+
+  def render_deerjikist_conflicts deerjikists, row_indexes_by_key, tag
+    conflicts = deerjikists.filter { |deerjikist| deerjikist.tag_id != tag.id }
+    return if conflicts.empty?
+
+    tag_names_by_id = Tag
+                      .joins(:tag_name)
+                      .where(id: conflicts.map(&:tag_id).uniq)
+                      .pluck('tags.id', 'tag_names.name')
+                      .to_h
+    fields = { }
+
+    conflicts.each do |deerjikist|
+      message = "この情報は既に「#{ tag_names_by_id[deerjikist.tag_id] }」に紐づいてゐます．"
+      row_indexes_by_key[[deerjikist.platform, deerjikist.code]].each do |index|
+        field = :"deerjikists.#{ index }.code"
+        fields[field] ||= []
+        fields[field] << message
+      end
+    end
+
+    render_validation_error fields:
+  end
+
+  def render_deerjikist_platform_invalid index
+    render_validation_error fields: {
+      :"deerjikists.#{ index }.platform" => ['値が不正です．'],
+    }
+  end
+
+  def rows_by_key rows
+    rows.each_with_object({ }) do |row, result|
+      key = [row[:platform], row[:code]]
+      result[key] ||= []
+      result[key] << row[:index]
+    end
+  end
+
   def render_deerjikist_form_record_invalid deerjikist, index
     fields = { }
 

backend/app/models/post.rb

@@ -57,7 +57,7 @@ class Post < ApplicationRecord
 
   attribute :version_no, :integer, default: 1
 
-  before_validation :normalise_url, if: :will_save_change_to_url?
+  before_validation :normalise_url
 
   validates :url, presence: true, uniqueness: true
   validates :video_ms, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
@@ -180,7 +180,7 @@ class Post < ApplicationRecord
 
     u.host = u.host.downcase if u.host
     u.path = u.path.sub(/\/\Z/, '') if u.path.present?
-    self.url = PostUrlSanitisationRule.sanitise(u.to_s)
+    self.url = u.to_s
   rescue URI::InvalidURIError
     ;
   end

backend/app/models/post_url_sanitisation_rule.rb

@@ -1,77 +0,0 @@
-class PostUrlSanitisationRule < ApplicationRecord
-  include Discard::Model
-
-  class UrlConflictError < StandardError
-    attr_reader :conflicts
-
-    def initialize(conflicts)
-      @conflicts = conflicts
-      urls = conflicts.map { _1.fetch(:url) }.uniq.join(', ')
-      super("post URL sanitisation conflicts detected for #{ urls }")
-    end
-  end
-
-  self.primary_key = :priority
-
-  default_scope -> { kept }
-
-  validates :source_pattern, presence: true, uniqueness: true
-
-  validate :source_pattern_must_be_regexp
-
-  class << self
-    def sanitise(url) =
-        rules.reduce(url.dup) { |value, (pattern, replacement)| value.sub(pattern, replacement) }
-
-    def apply!
-      rewrites = Post.order(:id).pluck(:id, :url).map do |post_id, original_url|
-        { post_id:,
-          original_url:,
-          sanitised_url: sanitise(original_url) }
-      end
-
-      conflicts = rewrites
-                      .group_by { _1.fetch(:sanitised_url) }
-                      .values
-                      .filter { _1.size > 1 }
-                      .flatten
-                      .map { { url: _1.fetch(:sanitised_url),
-                               post_id: _1.fetch(:post_id),
-                               original_url: _1.fetch(:original_url) } }
-
-      raise UrlConflictError.new(conflicts) if conflicts.present?
-
-      changed = rewrites.filter { _1.fetch(:original_url) != _1.fetch(:sanitised_url) }
-      return if changed.empty?
-
-      token = SecureRandom.hex(6)
-
-      Post.transaction do
-        changed.each do |row|
-          Post.where(id: row.fetch(:post_id))
-              .update_all(url: temporary_url_for(row.fetch(:post_id), token))
-        end
-
-        changed.each do |row|
-          Post.where(id: row.fetch(:post_id))
-              .update_all(url: row.fetch(:sanitised_url))
-        end
-      end
-    end
-
-    private
-
-    def rules = kept.order(:priority).map { |r| [Regexp.new(r.source_pattern), r.replacement] }
-
-    def temporary_url_for(post_id, token) =
-        "https://post-url-sanitising.invalid/#{ token }/#{ post_id }"
-  end
-
-  private
-
-  def source_pattern_must_be_regexp
-    Regexp.new(source_pattern)
-  rescue RegexpError
-    errors.add :source_pattern, '変な正規表現だね〜（笑）'
-  end
-end

backend/db/migrate/20260713000000_create_post_url_sanitisation_rules.rb

@@ -1,47 +0,0 @@
-class CreatePostUrlSanitisationRules < ActiveRecord::Migration[8.0]
-  def up
-    create_table :post_url_sanitisation_rules,
-                 id: :integer,
-                 primary_key: :priority do |t|
-      t.string :source_pattern, null: false
-      t.string :replacement, null: false
-      t.timestamps
-      t.datetime :discarded_at
-      t.index :source_pattern, unique: true
-      t.index :discarded_at
-    end
-
-    now = ActiveRecord::Base.connection.quote(Time.current)
-    execute <<~SQL
-      INSERT INTO
-        post_url_sanitisation_rules(priority, source_pattern, replacement, created_at, updated_at)
-      VALUES
-        (10, '\\Ahttps?://youtu\\\\.be/([^/?#]+)(?:[?#].*)?\\z',
-             'https://www.youtube.com/watch?v=\\\\1',
-             #{ now }, #{ now })
-      , (20, '\\Ahttps?://(?:www\\\\.|m\\\\.)?youtube\\\\.com/live/([^/?#]+)(?:[?#].*)?\\z',
-             'https://www.youtube.com/watch?v=\\\\1',
-             #{ now }, #{ now })
-      , (30, '\\Ahttps?://(?:www\\\\.|m\\\\.)?youtube\\\\.com/shorts/([^/?#]+)(?:[?#].*)?\\z',
-             'https://www.youtube.com/watch?v=\\\\1',
-             #{ now }, #{ now })
-      , (40, '\\Ahttps?://(?:www\\\\.|m\\\\.)?youtube\\\\.com/embed/([^/?#]+)(?:[?#].*)?\\z',
-             'https://www.youtube.com/watch?v=\\\\1',
-             #{ now }, #{ now })
-      , (50, '\\Ahttps?://(?:www\\\\.|m\\\\.)?youtube\\\\.com/watch\\\\?(?:[^#&]+&)*v=([^&#]+)(?:[&#].*)?\\z',
-             'https://www.youtube.com/watch?v=\\\\1',
-             #{ now }, #{ now })
-      , (60, '\\Ahttps?://nico\\\\.ms/([^/?#]+)(?:[?#].*)?\\z',
-             'https://www.nicovideo.jp/watch/\\\\1',
-             #{ now }, #{ now })
-      , (70, '\\Ahttps?://(?:www\\\\.)?nicovideo\\\\.jp/watch/([^?#/]+)(?:[?#].*)?\\z',
-             'https://www.nicovideo.jp/watch/\\\\1',
-             #{ now }, #{ now })
-      ;
-    SQL
-  end
-
-  def down
-    drop_table :post_url_sanitisation_rules
-  end
-end

backend/db/schema.rb

@@ -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_07_13_000000) do
+ActiveRecord::Schema[8.0].define(version: 2026_07_05_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
@@ -331,16 +331,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_13_000000) do
     t.index ["tag_id"], name: "index_post_tags_on_tag_id"
   end
 
-  create_table "post_url_sanitisation_rules", primary_key: "priority", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.string "source_pattern", null: false
-    t.string "replacement", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.datetime "discarded_at"
-    t.index ["discarded_at"], name: "index_post_url_sanitisation_rules_on_discarded_at"
-    t.index ["source_pattern"], name: "index_post_url_sanitisation_rules_on_source_pattern", unique: true
-  end
-
   create_table "post_versions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.bigint "post_id", null: false
     t.integer "version_no", null: false

backend/spec/requests/tags_deerjikists_spec.rb

@@ -226,6 +226,14 @@ RSpec.describe 'Tags deerjikists API', type: :request do
               [platform2, code2],
             )
         end
+
+        it 'locks the tag before replacing the complete list' do
+          expect_any_instance_of(Tag).to receive(:lock!).and_call_original
+
+          do_request
+
+          expect(response).to have_http_status(:ok)
+        end
       end
 
       context 'when tag already has deerjikists' do
@@ -299,6 +307,81 @@ RSpec.describe 'Tags deerjikists API', type: :request do
         end
       end
 
+      context 'when platform is outside the enum' do
+        let(:payload) do
+          [
+            { platform: 'invalid', code: code1 },
+          ]
+        end
+
+        it 'returns 422 with an indexed platform error without changing the list' do
+          Deerjikist.create!(platform: platform1, code: code1, tag: tag)
+
+          expect {
+            do_request
+          }.not_to change { Deerjikist.where(tag: tag).map { |d| [d.platform, d.code] } }
+
+          expect(response).to have_http_status(:unprocessable_entity)
+          expect(json.fetch('errors')).to include(
+            'deerjikists.0.platform' => [be_present],
+          )
+        end
+      end
+
+      context 'when a requested deerjikist belongs to another tag' do
+        let!(:other_tag) { create(:tag, category: :deerjikist) }
+        let!(:owned_deerjikist) do
+          Deerjikist.create!(platform: platform1, code: code1, tag: tag)
+        end
+        let!(:conflicting_deerjikist) do
+          Deerjikist.create!(platform: platform2, code: code2, tag: other_tag)
+        end
+        let(:payload) do
+          [
+            { platform: 'nico', code: 'new-code' },
+            { platform: platform2, code: code2 },
+          ]
+        end
+
+        before do
+          other_tag.tag_name.update!(name: 'existing-deerjikist')
+        end
+
+        it 'returns an indexed 422 error and rolls back the complete replacement' do
+          expect {
+            do_request
+          }.not_to change { Deerjikist.order(:platform, :code).pluck(:platform, :code, :tag_id) }
+
+          expect(response).to have_http_status(:unprocessable_entity)
+          expect(json.fetch('errors')).to include(
+            'deerjikists.1.code' => [include('existing-deerjikist')],
+          )
+          expect(owned_deerjikist.reload.tag_id).to eq(tag.id)
+          expect(conflicting_deerjikist.reload.tag_id).to eq(other_tag.id)
+        end
+      end
+
+      context 'when a requested deerjikist already belongs to the same tag' do
+        let!(:existing_deerjikist) do
+          Deerjikist.create!(platform: platform1, code: code1, tag: tag)
+        end
+        let(:payload) do
+          [
+            { platform: platform1, code: code1 },
+          ]
+        end
+
+        it 'keeps the existing row' do
+          expect {
+            do_request
+          }.not_to change { existing_deerjikist.reload.created_at }
+
+          expect(response).to have_http_status(:ok)
+          expect(Deerjikist.where(tag: tag).pluck(:platform, :code))
+            .to eq([[platform1, code1]])
+        end
+      end
+
       context 'when youtube code is handle' do
         let(:channel_id) { 'UCabcdefghijklmnopqrstuv' }
         let(:payload) do

frontend/src/index.css

@@ -239,11 +239,6 @@ body
   background: var(--top-nav-submenu-bg);
 }
 
-.top-nav-mobile-menu .top-nav-submenu
-{
-  background: var(--top-nav-mobile-active-bg);
-}
-
 .top-nav-mobile-menu
 {
   background: var(--top-nav-mobile-menu-bg);

frontend/src/index.test.ts

@@ -1,22 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { resolve } from 'node:path'
-
-import { describe, expect, it } from 'vitest'
-
-
-const indexCss = readFileSync (
-    resolve (process.cwd (), 'src/index.css'),
-    'utf8')
-const compactIndexCss = indexCss.replace (/\s+/g, ' ')
-const mobileActiveRule = '.top-nav-mobile-active {'
-    + ' background: var(--top-nav-mobile-active-bg); }'
-const mobileSubmenuRule = '.top-nav-mobile-menu .top-nav-submenu {'
-    + ' background: var(--top-nav-mobile-active-bg); }'
-
-
-describe ('TopNav mobile menu colours', () => {
-  it ('uses one background variable for active rows and expanded submenus', () => {
-    expect (compactIndexCss).toContain (mobileActiveRule)
-    expect (compactIndexCss).toContain (mobileSubmenuRule)
-  })
-})

frontend/src/lib/settings.test.ts

@@ -89,12 +89,8 @@ describe ('settings', () => {
   })
 
   it ('derives TopNav colours without mixing mobile active backgrounds', () => {
-    const tokens = buildThemeTokens ('light', { })
-
-    expect (tokens.topNavMobileActiveBackground).toBe (
+    expect (buildThemeTokens ('light', { }).topNavMobileActiveBackground).toBe (
 	LIGHT_THEME_TOKENS.topNavRootBackgroundDesktop)
-    expect (tokens.topNavMobileActiveBackground).not.toBe (
-	tokens.topNavRootBackgroundMobile)
     expect (buildThemeTokens ('dark', { }).topNavMobileActiveBackground).toBe (
 	DARK_THEME_TOKENS.topNavActiveBackground)
   })