#55

backend/app/controllers/materials_controller.rb

@@ -133,12 +133,14 @@ class MaterialsController < ApplicationController
     block = MaterialImportBlockMatcher.match_for_sha256(file_sha256)
     return render_material_import_block(block) if block
 
+    locale = resolve_locale!
+
     uploaded_blob = build_uploaded_material_blob!(file, file_sha256)
 
     begin
       Material.transaction do
         MaterialVersionRecorder.ensure_snapshot!(material, created_by_user: current_user)
-        tag = resolve_material_tag!(tag_name_raw)
+        tag = resolve_material_tag!(locale, tag_name_raw)
         material.assign_attributes(tag:, url:, updated_by_user: current_user)
         if uploaded_blob
           material.file.attach(uploaded_blob)

backend/app/controllers/posts_controller.rb

@@ -218,7 +218,7 @@ class PostsController < ApplicationController
     preflight = PostCreatePreflight.new(
         attributes: post_create_attributes,
         thumbnail: params[:thumbnail],
-        host: request.base_url).run
+        host: request.base_url).run(locale)
     return render json: dry_run_json(preflight) if bool?(:dry)
     if preflight[:existing_post_id].present?
       post = Post.new(url: preflight[:url])
@@ -273,13 +273,18 @@ class PostsController < ApplicationController
     return head :forbidden unless current_user.gte_member?
     return head :unsupported_media_type unless request.content_mime_type == Mime[:multipart_form]
     return head :payload_too_large if request.content_length.to_i > MAX_BULK_REQUEST_BYTES
+
+    locale = resolve_locale!
+
     posts = parse_bulk_posts_manifest
     thumbnails = parse_bulk_thumbnails(posts.length)
+
     result = PostBulkCreator.new(
         actor: current_user,
         posts:,
         thumbnails:,
-        host: request.base_url).run
+        host: request.base_url).run(locale)
+
     render json: result
   rescue JSON::ParserError
     render_bad_request 'posts manifest の JSON が不正です．'

backend/app/controllers/tags_controller.rb

@@ -406,10 +406,10 @@ class TagsController < ApplicationController
     return render_unprocessable_entity('カテゴリは必須です．', field: :category) if category.blank?
     return render_unprocessable_entity '廃止状態は必須です．', field: :deprecated unless params.key?(:deprecated)
 
-    return unless validate_tag_rename(tag, name)
-
     locale = resolve_locale!
 
+    return unless validate_tag_rename(locale, tag, name)
+
     alias_names = params[:aliases].to_s.split.uniq
     parent_names = params[:parent_tags].to_s.split.uniq
     deprecated = bool?(:deprecated)
@@ -455,6 +455,8 @@ class TagsController < ApplicationController
     return head :unauthorized unless current_user
     return head :forbidden unless current_user.gte_member?
 
+    locale = resolve_locale!
+
     name = params[:name].presence
     category = params[:category].presence
     deprecated_given = params.key?(:deprecated)
@@ -462,7 +464,7 @@ class TagsController < ApplicationController
 
     tag = Tag.find(params[:id])
 
-    return unless validate_tag_rename(tag, name)
+    return unless validate_tag_rename(locale, tag, name)
 
     if category.present? && category == 'nico'
       return render_unprocessable_entity 'ニコタグは変更できません．', field: :category
@@ -684,7 +686,7 @@ class TagsController < ApplicationController
         created_by_user:)
   end
 
-  def validate_tag_rename tag, name
+  def validate_tag_rename locale, tag, name
     return true if name.blank? || name == tag.name
 
     if tag.in?([Tag.tagme, Tag.bot, Tag.no_deerjikist, Tag.video, Tag.niconico])
@@ -692,9 +694,8 @@ class TagsController < ApplicationController
       return false
     end
 
-    target_tag_name = TagName.find_by(name:)
-    return true if target_tag_name.nil?
-    return true if target_tag_name.canonical_id?
+    target_tag_name = TagName.find_by(language_code: locale.language_code, name:)
+    return true unless target_tag_name&.primary_flg
 
     render_unprocessable_entity 'その名前は既に使はれてゐます．', field: :name
     false

backend/app/models/tag.rb

@@ -135,7 +135,7 @@ class Tag < ApplicationRecord
         raise SectionLiteralParseError.new(raw_name, raw_name)
       end
 
-      name = TagName.canonicalise(name).first
+      name = TagName.canonicalise(locale, name).first
 
       find_or_create_by_tag_name!(locale, name, category: (cat || :general)).tap do |tag|
         if deny_deprecated && tag.deprecated?
@@ -235,10 +235,7 @@ class Tag < ApplicationRecord
     end
 
     tag = tn.tag
-    if tag
-      tag.update!(tag_name_id: tn.id) if tag.tag_name_id != tn.id
-      return tag
-    end
+    return tag if tag
 
     tag = Tag.create!(tag_name: tn, category:)
     tn.update!(tag:)
@@ -279,6 +276,8 @@ class Tag < ApplicationRecord
         end
 
         TagVersioning.record!(source_tag, event_type: :discard, created_by_user:)
+        source_tag.tag_names.update_all(tag_id: source_tag.id, primary_key: false,
+                                        updated_at: Time.current)
         source_tag.destroy!
 
         source_tag_name.update_columns(canonical_id: target_tag.tag_name_id,

backend/app/models/tag_name.rb

@@ -1,24 +1,36 @@
 class TagName < ApplicationRecord
+  belongs_to :language, foreign_key: :language_code, primary_key: :code
   belongs_to :tag, optional: true
   has_one :wiki_page
 
-  belongs_to :canonical, class_name: 'TagName', optional: true
-  has_many :aliases, class_name: 'TagName', foreign_key: :canonical_id
+  validates :name, presence: true,
+                   length: { maximum: 255 },
+                   uniqueness: { scope: :language_code }
 
-  validates :name, presence: true, length: { maximum: 255 }, uniqueness: true
-
-  validate :canonical_must_be_canonical
   validate :alias_name_must_not_have_prefix
-  validate :canonical_must_not_be_present_with_tag_or_wiki_page
+  validate :alias_must_not_have_wiki_page
   validate :name_must_be_sanitised
 
-  def self.canonicalise names
+  def primary? = primary_flg
+
+  def canonical = TagName.find_by(language:, tag:, primary_flg: true)
+  def aliases = TagName.where(language:, tag:, primary_flg: false)
+
+  def self.canonicalise locale, names
     names = Array(names).map { |n| n.to_s.strip }.reject(&:blank?)
     return [] if names.blank?
 
-    tns = TagName.includes(:canonical).where(name: names).index_by(&:name)
+    tns = TagName.where(language_code: locale.language_code, name: names).index_by(&:name)
 
-    names.map { |name| tns[name]&.canonical&.name || name }.uniq
+    names.map { |name|
+      if tns[name].primary_flg
+        name
+      else
+        TagName.find_by(language_code: locale.language_code,
+                        tag_id: tns[name].tag_id,
+                        primary_flg: true).name
+      end
+    }.uniq
   end
 
   def self.generate_name locale, tag, name
@@ -29,21 +41,15 @@ class TagName < ApplicationRecord
 
   private
 
-  def canonical_must_be_canonical
-    if canonical&.canonical_id?
-      errors.add :canonical, 'canonical は実体を示す必要があります．'
-    end
-  end
-
   def alias_name_must_not_have_prefix
-    if canonical_id? && name.to_s.include?(':')
+    if !(primary?) && name.to_s.include?(':')
       errors.add :name, 'エーリアス名にプレフィクスを含むことはできません．'
     end
   end
 
-  def canonical_must_not_be_present_with_tag_or_wiki_page
-    if canonical_id? && (tag || wiki_page)
-      errors.add :canonical, 'タグもしくは Wiki の参照がある名前はエーリアスになれません．'
+  def alias_must_not_have_wiki_page
+    if !(primary?) && wiki_page
+      errors.add :primary_flg, 'Wiki 参照がある名前はエーリアスになれません．'
     end
   end
 

backend/app/models/tag_name_sanitisation_rule.rb

@@ -15,31 +15,38 @@ class TagNameSanitisationRule < ApplicationRecord
     end
 
     def apply!
-      TagName.find_each do |tn|
-        name = sanitise(tn.name)
-        next if name == tn.name
+      Language.find_each do |language|
+        TagName.where(language:).find_each do |tn|
+          name = sanitise(tn.name)
+          next if name == tn.name
 
-        TagName.transaction do
-          existing_tn = TagName.find_by(name:)
-          if existing_tn
-            existing_tn = existing_tn.canonical || existing_tn
-            next if existing_tn.id == tn.id
+          TagName.transaction do
+            existing_tn = TagName.find_by(language:, name:)
+            if existing_tn
+              unless existing_tn.primary_flg
+                existing_tn = TagName.find_by!(language:,
+                                               tag_id: existing_tn.tag_id,
+                                               primary_flg: true)
+              end
+              next if existing_tn.id == tn.id
 
-            existing_tag = Tag.find_by(tag_name_id: existing_tn.id)
-            source_tag = Tag.find_by(tag_name_id: tn.id)
+              existing_tag = existing_tn.tag
+              source_tag = tn.tag
 
-            if existing_tag
-              Tag.merge_tags!(existing_tag, source_tag) if tn.tag
-            elsif source_tag
-              source_tag.update_columns(tag_name_id: existing_tn.id, updated_at: Time.current)
+              if existing_tag
+                Tag.merge_tags!(existing_tag, source_tag) if tn.tag
+              elsif source_tag
+                source_tag.update_columns(tag_name_id: existing_tn.id, updated_at: Time.current)
+                existing_tn.update_columns(tag_id: source_tag.id, updated_at: Time.current)
+              end
+              tn.destroy!
+
+              next
             end
-            tn.destroy!
 
-            next
+            # TagName 側の自動サニタイズを回避
+            tn.update_columns(name:, updated_at: Time.current)
           end
-
-          # TagName 側の自動サニタイズを回避
-          tn.update_columns(name:, updated_at: Time.current)
         end
       end
     end

backend/app/services/post_create_plan.rb

@@ -8,13 +8,13 @@ class PostCreatePlan
     @existing_tags_by_name = nil
   end
 
-  def build!
-    direct_tag_specs, tag_sections = parse_direct_tag_specs
+  def build! locale
+    direct_tag_specs, tag_sections = parse_direct_tag_specs(locale)
     default_tag_specs = build_default_tag_specs(direct_tag_specs)
     snapshot_tag_specs = merge_tag_specs(direct_tag_specs + default_tag_specs)
     preload_existing_tags_by_name!(snapshot_tag_specs.map { _1[:name] })
     validate_new_tag_specs!(snapshot_tag_specs)
-    post_tag_specs = expand_parent_tag_specs(snapshot_tag_specs)
+    post_tag_specs = expand_parent_tag_specs(locale, snapshot_tag_specs)
     video_ms = normalise_video_ms(snapshot_tag_specs)
     validate_video_sections!(video_ms, tag_sections)
     parent_post_ids = normalise_parent_post_ids
@@ -42,13 +42,13 @@ class PostCreatePlan
 
   def tag_names = @attributes[:tags].to_s.split
 
-  def parse_direct_tag_specs
+  def parse_direct_tag_specs locale
     tag_sections = { }
     direct_tag_specs = []
 
     tag_names.each do |raw_name|
-      tag_name, category, sections = parse_raw_tag_name(raw_name)
-      existing_tag = existing_tags_by_name[tag_name]
+      tag_name, category, sections = parse_raw_tag_name(locale, raw_name)
+      existing_tag = existing_tags_by_name(locale)[tag_name]
       raise Tag::DeprecatedTagNormalisationError, [existing_tag.name] if existing_tag&.deprecated?
 
       direct_tag_specs << {
@@ -65,7 +65,7 @@ class PostCreatePlan
     [merge_tag_specs(direct_tag_specs), tag_sections]
   end
 
-  def parse_raw_tag_name raw_name
+  def parse_raw_tag_name locale, raw_name
     name = raw_name.to_s
     prefix, category =
         Tag::CATEGORY_PREFIXES.find {
@@ -74,7 +74,7 @@ class PostCreatePlan
     name = name.sub(/\A#{ prefix }/i, '')
 
     sections = []
-    while (match = name.match(/\A(\S*?)\[([^\[\]\s]*)-([^\[\]\s]*)\](\S*)\z/))
+    while match = name.match(/\A(\S*?)\[([^\[\]\s]*)-([^\[\]\s]*)\](\S*)\z/)
       name = "#{ match[1] }#{ match[4] }"
       next if match[2].empty? && match[3].empty?
 
@@ -87,17 +87,17 @@ class PostCreatePlan
       raise Tag::SectionLiteralParseError.new(raw_name, raw_name)
     end
 
-    [resolved_tag_name(name), category&.to_sym, sections]
+    [resolved_tag_name(locale, name), category&.to_sym, sections]
   end
 
-  def build_default_tag_specs direct_tag_specs
+  def build_default_tag_specs locale, direct_tag_specs
     default_tag_specs = []
     if direct_tag_specs.length < 10 && direct_tag_specs.none? { _1[:name] == TAGME_TAG_NAME }
       default_tag_specs << {
           name: TAGME_TAG_NAME,
           category: :meta }
     end
-    if direct_tag_specs.none? { deerjikist_tag_spec?(_1) }
+    if direct_tag_specs.none? { deerjikist_tag_spec?(locale, _1) }
       default_tag_specs << {
           name: NO_DEERJIKIST_TAG_NAME,
           category: :meta }
@@ -131,8 +131,10 @@ class PostCreatePlan
     raise ActiveRecord::RecordInvalid, post
   end
 
-  def expand_parent_tag_specs snapshot_tag_specs
-    existing_snapshot_tags = snapshot_tag_specs.filter_map { existing_tags_by_name[_1[:name]] }
+  def expand_parent_tag_specs locale, snapshot_tag_specs
+    existing_snapshot_tags = snapshot_tag_specs.filter_map do
+      existing_tags_by_name(locale)[_1[:name]]
+    end
     expanded_parent_specs =
         Tag.expand_parent_tags(existing_snapshot_tags)
            .reject(&:deprecated?)
@@ -156,33 +158,33 @@ class PostCreatePlan
     }.values.sort_by { _1[:name] }
   end
 
-  def existing_tags_by_name
+  def existing_tags_by_name locale
     @existing_tags_by_name ||= begin
-      names = tag_names.map { canonical_tag_name_without_sections(_1) }.uniq
+      names = tag_names.map { canonical_tag_name_without_sections(locale, _1) }.uniq
       Tag.joins(:tag_name).where(tag_names: { name: names }).index_by(&:name)
     end
   end
 
-  def preload_existing_tags_by_name! names
+  def preload_existing_tags_by_name! locale, names
     wanted_names = Array(names).map { _1.to_s }.reject(&:blank?).uniq
-    missing_names = wanted_names - existing_tags_by_name.keys
+    missing_names = wanted_names - existing_tags_by_name(locale).keys
     return if missing_names.empty?
 
-    existing_tags_by_name.merge!(
+    existing_tags_by_name(locale).merge!(
         Tag.joins(:tag_name)
            .where(tag_names: { name: missing_names })
            .index_by(&:name))
   end
 
-  def canonical_tag_name_without_sections raw_name
-    name, = parse_raw_tag_name(raw_name)
+  def canonical_tag_name_without_sections locale, raw_name
+    name, = parse_raw_tag_name(locale, raw_name)
     name
   end
 
-  def deerjikist_tag_spec? spec
+  def deerjikist_tag_spec? locale, spec
     return true if spec[:category] == :deerjikist
 
-    existing_tags_by_name[spec[:name]]&.deerjikist?
+    existing_tags_by_name(locale)[spec[:name]]&.deerjikist?
   end
 
   def normalise_parent_post_ids
@@ -260,10 +262,13 @@ class PostCreatePlan
     end
   end
 
-  def resolved_tag_name name
-    tag_name = TagName.includes(:canonical).find_by(name:)
-    return name if tag_name.nil?
-
-    (tag_name.canonical || tag_name).name
+  def resolved_tag_name locale, name
+    tag_name = TagName.find_by!(language_code: locale.language_code, name:)
+    unless tag_name.primary_flg
+      tag_name = TagName.find_by!(language_code: locale.language_code,
+                                  tag_id: tag_name.tag_id,
+                                  primary_flg: true)
+    end
+    tag_name.name
   end
 end

backend/app/services/post_creator.rb

@@ -21,14 +21,14 @@ class PostCreator
     ApplicationRecord.transaction do
       post.save!
       post.thumbnail.attach(thumbnail_attachment) if thumbnail_attachment.present?
-      snapshot_tags = planned_snapshot_tags
-      post_tags = planned_post_tags
-      sections = planned_sections
+      snapshot_tags = planned_snapshot_tags(locale)
+      post_tags = planned_post_tags(locale)
+      sections = planned_sections(locale)
       TagVersioning.record_tag_snapshots!(snapshot_tags, created_by_user: @actor)
       post.video_ms = planned_video_ms(locale)
       post.save!
       sync_post_tags!(post, post_tags, sections)
-      sync_parent_posts!(post, planned_parent_post_ids)
+      sync_parent_posts!(post, planned_parent_post_ids(locale))
       PostVersionRecorder.record!(post:, event_type: :create, created_by_user: @actor)
     end
     post
@@ -45,13 +45,15 @@ class PostCreator
         thumbnail_base: @attributes[:thumbnail_base].presence)
   end
 
-  def planned_snapshot_tags = planned_create_attributes[:snapshot_tags]
+  def planned_snapshot_tags(locale) = planned_create_attributes(locale)[:snapshot_tags]
 
-  def planned_post_tags = planned_create_attributes[:post_tags]
+  def planned_post_tags(locale) = planned_create_attributes(locale)[:post_tags]
 
-  def planned_sections = planned_create_attributes[:tag_sections]
+  def planned_sections(locale) = planned_create_attributes(locale)[:tag_sections]
 
-  def planned_parent_post_ids = planned_create_attributes[:normalised_parent_post_ids]
+  def planned_parent_post_ids locale
+    planned_create_attributes(locale)[:normalised_parent_post_ids]
+  end
 
   def planned_video_ms locale
     planned_create_attributes(locale)[:video_ms]