config: refactor remove_tag_after_replacement? config option.

danbooru · Jun 2, 2020 · 276f23b · 276f23b
1 parent 47e6821
commit 276f23b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/app/models/post_replacement.rb b/app/models/post_replacement.rb
@@ -29,7 +29,12 @@ def search(params = {})
   end
 
   def suggested_tags_for_removal
-    tags = post.tag_array.select { |tag| Danbooru.config.remove_tag_after_replacement?(tag) }
+    tags = post.tag_array.select do |tag|
+      Danbooru.config.post_replacement_tag_removals.any? do |pattern|
+        tag.match?(/\A#{pattern}\z/i)
+      end
+    end
+
     tags = tags.map { |tag| "-#{tag}" }
     tags.join(" ")
   end

diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb
@@ -321,9 +321,10 @@ def tumblr_consumer_key
       nil
     end
 
-    # Should return true if the given tag should be suggested for removal in the post replacement dialog box.
-    def remove_tag_after_replacement?(tag)
-      tag =~ /\A(?:replaceme|.*_sample|resized|upscaled|downscaled|md5_mismatch|jpeg_artifacts|corrupted_image|source_request|non-web_source)\z/i
+    # A list of tags that should be removed when a post is replaced. Regexes allowed.
+    def post_replacement_tag_removals
+      %w[replaceme .*_sample resized upscaled downscaled md5_mismatch
+      jpeg_artifacts corrupted_image source_request non-web_source]
     end
 
     # Posts with these tags will be highlighted in the modqueue.