Merge branch 'main' into feature/308

backend/app/controllers/nico_tags_controller.rb

@@ -33,8 +33,7 @@ class NicoTagsController < ApplicationController
     return head :bad_request if tag.category != 'nico'
 
     linked_tag_names = params[:tags].to_s.split(' ')
-    linked_tags = Tag.normalise_tags(linked_tag_names, with_tagme: false,
+    linked_tags = Tag.normalise_tags(linked_tag_names, with_tagme: false)
-                                                       with_no_deerjikist: false)
     return head :bad_request if linked_tags.any? { |t| t.category == 'nico' }
 
     tag.linked_tags = linked_tags

backend/app/models/tag.rb

@@ -98,9 +98,7 @@ class Tag < ApplicationRecord
     @niconico ||= find_or_create_by_tag_name!('ニコニコ', category: :meta)
   end
 
-  def self.normalise_tags tag_names, with_tagme: true,
+  def self.normalise_tags tag_names, with_tagme: true, deny_nico: true
-                                     with_no_deerjikist: true,
-                                     deny_nico: true
     if deny_nico && tag_names.any? { |n| n.downcase.start_with?('nico:') }
       raise NicoTagNormalisationError
     end
@@ -114,7 +112,7 @@ class Tag < ApplicationRecord
     end
 
     tags << Tag.tagme if with_tagme && tags.size < 10 && tags.none?(Tag.tagme)
-    tags << Tag.no_deerjikist if with_no_deerjikist && tags.all? { |t| !(t.deerjikist?) }
+    tags << Tag.no_deerjikist if tags.all? { |t| !(t.deerjikist?) }
     tags.uniq(&:id)
   end