Merge remote-tracking branch 'origin/main' into feature/055

backend/app/controllers/posts_controller.rb

@@ -49,7 +49,7 @@ class PostsController < ApplicationController
         filtered_posts
         .joins("LEFT JOIN (#{ pt_max_sql }) pt_max ON pt_max.post_id = posts.id")
         .reselect('posts.*', Arel.sql("#{ updated_at_all_sql } AS updated_at_all"))
-        .preload(:uploaded_user, :parents, :children,
+        .preload(:external_tags, :uploaded_user, :parents, :children,
                  post_tags: [:sections, { tag: [:deerjikists, :materials,
                                                 { tag_name: :wiki_page }] }])
         .with_attached_thumbnail
@@ -102,12 +102,14 @@ class PostsController < ApplicationController
   end
 
   def random
-    post = filtered_posts.preload(:uploaded_user, :parents, :children,
-                                  post_tags: [:sections, { tag: [:deerjikists, :materials,
-                                                                 { tag_name: :wiki_page }] }])
-                         .with_attached_thumbnail
-                         .order('RAND()')
-                         .first
+    post =
+        filtered_posts
+        .preload(:uploaded_user, :parents, :children,
+                 post_tags: [:sections, { tag: [:deerjikists, :materials,
+                                                { tag_name: :wiki_page }] }])
+        .with_attached_thumbnail
+        .order('RAND()')
+        .first
     return head :not_found unless post
 
     render json: PostRepr.base(post, current_user)
@@ -428,8 +430,20 @@ class PostsController < ApplicationController
     end
   end
 
-  def tagged_post_ids_for(name) =
-      Post.joins(tags: :tag_name).where(tag_names: { name: }).select(:id)
+  def tagged_post_ids_for(name)
+    posts_by_internal_tags =
+        Post
+        .joins(tags: :tag_name)
+        .where(tag_names: { name: })
+        .select(:id)
+
+    posts_by_external_tags =
+        Post
+        .joins(:external_tags)
+        .where("CONCAT(external_tags.platform, ':', external_tags.name) = ?", name)
+
+    (posts_by_internal_tags + posts_by_external_tags).uniq(&:id)
+  end
 
   def sync_post_tags! post, desired_tags, sections
     desired_tags.each do |t|
@@ -507,7 +521,10 @@ class PostsController < ApplicationController
       memo[tag_id] = TagRepr.inline(tag).merge(children:, sections:)
     end
 
-    root_ids.filter_map { |id| build_node.call(id, []) }
+    internal_tags = root_ids.filter_map { |id| build_node.call(id, []) }
+    external_tags =
+        post.external_tags.map { ExternalTagRepr.inline(_1).merge(children: [], sections: []) }
+    internal_tags + external_tags
   end
 
   def sibling_posts_by_parent parent_post_ids
@@ -655,7 +672,7 @@ class PostsController < ApplicationController
 
   def editable_tag_names_from_version version
     version.tags_json
-        .reject { _1.fetch('category') == 'nico' }
+        .select { _1.key?('tag_id') }
         .map { Post.tag_snapshot_literal(_1) }
         .sort
   end
@@ -673,7 +690,6 @@ class PostsController < ApplicationController
     post
         .post_tags
         .joins(tag: :tag_name)
-        .merge(Tag.not_nico)
         .merge(Tag.where(deprecated_at: nil))
         .includes(:sections, tag: :tag_name)
         .order('tag_names.name')
@@ -690,6 +706,7 @@ class PostsController < ApplicationController
   def post_incoming_snapshot locale:, title:, original_created_from:, original_created_before:,
                              tag_names:, video_ms_param:, duration_param:, parent_post_ids:
     validate_original_created_values!(original_created_from, original_created_before)
+
     Tag.normalise_tags!(locale, tag_names,
                         with_tagme: false,
                         deny_deprecated: true,
@@ -839,12 +856,9 @@ class PostsController < ApplicationController
     Tag.normalise_tags!(locale, snapshot[:tag_names],
                         with_tagme: false,
                         deny_deprecated: true,
-                        with_sections: true) => { tags: editable_tags, sections: }
-    TagVersioning.record_tag_snapshots!(editable_tags, created_by_user: current_user)
+                        with_sections: true) => { tags:, sections: }
+    TagVersioning.record_tag_snapshots!(tags, created_by_user: current_user)
 
-    readonly_tags = post.tags.nico.to_a
-
-    tags = readonly_tags + editable_tags
     tags = Tag.expand_parent_tags(tags).reject(&:deprecated?)
 
     post.video_ms = tags.any? { _1.id == Tag.video.id } ? snapshot[:video_ms] : nil