From 9901161bbf4649b5efd2c149c7f5b61ff79ec14d Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Thu, 16 Apr 2020 20:45:16 -0500
Subject: [PATCH] search: rename artcomm metatag to commentaryupdater.

* Rename the artcomm:<user> metatag to commentaryupdater:<user>.
* Add support for negated -commentaryupdater:<user> searches.
---
 .../src/javascripts/autocomplete.js.erb       |  1 +
 app/logical/post_query_builder.rb             | 68 +++++++++++++++----
 test/unit/post_test.rb                        | 27 +++++---
 3 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/app/javascript/src/javascripts/autocomplete.js.erb b/app/javascript/src/javascripts/autocomplete.js.erb
index b57939ce8..5d21046fc 100644
--- a/app/javascript/src/javascripts/autocomplete.js.erb
+++ b/app/javascript/src/javascripts/autocomplete.js.erb
@@ -128,6 +128,7 @@ Autocomplete.initialize_tag_autocomplete = function() {
       case "comm":
       case "noter":
       case "noteupdater":
+      case "commentaryupdater":
       case "artcomm":
       case "fav":
       case "ordfav":
diff --git a/app/logical/post_query_builder.rb b/app/logical/post_query_builder.rb
index 0e7eba29c..cd0d2bad3 100644
--- a/app/logical/post_query_builder.rb
+++ b/app/logical/post_query_builder.rb
@@ -12,13 +12,46 @@ class PostQueryBuilder
   COUNT_METATAG_SYNONYMS = COUNT_METATAGS.map { |str| str.delete_suffix("_count").pluralize }
 
   METATAGS = %w[
-    -user user -approver approver -commenter commenter comm -noter noter
-    -noteupdater noteupdater artcomm -pool pool ordpool -favgroup favgroup -fav
-    fav -ordfav ordfav md5 -rating rating -locked locked width height mpixels ratio
-    score favcount filesize source -source id -id date age order limit -status
-    status tagcount parent -parent child pixiv_id pixiv search -upvote upvote
-    -downvote downvote filetype -filetype flagger -flagger appealer -appealer
-    disapproved -disapproved embedded
+    -user user
+    -approver approver
+    -commenter commenter comm
+    -noter noter
+    -noteupdater noteupdater
+    -artcomm artcomm
+    -commentaryupdater commentaryupdater
+    -flagger flagger
+    -appealer appealer
+    -upvote upvote
+    -downvote downvote
+    -fav fav
+    -ordfav ordfav
+    -favgroup favgroup
+    -pool pool ordpool
+    -id id
+    -rating rating
+    -locked locked
+    -source source
+    -status status
+    -filetype filetype
+    -disapproved disapproved
+    -parent parent
+    md5
+    width
+    height
+    mpixels
+    ratio
+    score
+    favcount
+    filesize
+    date
+    age
+    order
+    limit
+    tagcount
+    child
+    pixiv_id pixiv
+    search
+    embedded
   ] + TagCategory.short_name_list.map {|x| "#{x}tags"} + COUNT_METATAGS + COUNT_METATAG_SYNONYMS
 
   ORDER_METATAGS = %w[
@@ -403,10 +436,12 @@ class PostQueryBuilder
       relation = add_user_subquery_relation(NoteVersion.unscoped, note_updater, relation, field: :updater)
     end
 
-    if q[:artcomm_ids]
-      q[:artcomm_ids].each do |artcomm_id|
-        relation = relation.where("posts.id": ArtistCommentaryVersion.unscoped.where(updater_id: artcomm_id).select("post_id").distinct)
-      end
+    q[:commentary_updater_neg].to_a.each do |username|
+      relation = add_user_subquery_relation(ArtistCommentaryVersion.unscoped, username, relation, field: :updater).negate
+    end
+
+    q[:commentary_updater].to_a.each do |username|
+      relation = add_user_subquery_relation(ArtistCommentaryVersion.unscoped, username, relation, field: :updater)
     end
 
     if q[:post_id_negated]
@@ -785,10 +820,13 @@ class PostQueryBuilder
               q[:note_updater_neg] ||= []
               q[:note_updater_neg] << g2
 
-            when "artcomm"
-              q[:artcomm_ids] ||= []
-              user_id = User.name_to_id(g2)
-              q[:artcomm_ids] << user_id unless user_id.blank?
+            when "-commentaryupdater", "-artcomm"
+              q[:commentary_updater_neg] ||= []
+              q[:commentary_updater_neg] << g2
+
+            when "commentaryupdater", "artcomm"
+              q[:commentary_updater] ||= []
+              q[:commentary_updater] << g2
 
             when "disapproved"
               q[:disapproved] ||= []
diff --git a/test/unit/post_test.rb b/test/unit/post_test.rb
index a45388097..fc0e944e1 100644
--- a/test/unit/post_test.rb
+++ b/test/unit/post_test.rb
@@ -2206,15 +2206,26 @@ class PostTest < ActiveSupport::TestCase
       assert_tag_match([posts[1]], "deleted_notes:1")
     end
 
-    should "return posts for the artcomm:<name> metatag" do
-      users = FactoryBot.create_list(:user, 2)
-      posts = FactoryBot.create_list(:post, 2)
-      users.zip(posts).map do |u, p|
-        CurrentUser.scoped(u) { FactoryBot.create(:artist_commentary, post: p) }
-      end
+    should "return posts for the commentaryupdater:<name> metatag" do
+      user1 = create(:user)
+      user2 = create(:user)
+      post1 = create(:post)
+      post2 = create(:post)
+      artcomm1 = as(user1) { create(:artist_commentary, post: post1) }
+      artcomm2 = as(user2) { create(:artist_commentary, post: post2) }
 
-      assert_tag_match([posts[0]], "artcomm:#{users[0].name}")
-      assert_tag_match([posts[1]], "artcomm:#{users[1].name}")
+      assert_tag_match([post1], "commentaryupdater:#{user1.name}")
+      assert_tag_match([post2], "commentaryupdater:#{user2.name}")
+      assert_tag_match([post2], "-commentaryupdater:#{user1.name}")
+      assert_tag_match([post1], "-commentaryupdater:#{user2.name}")
+
+      assert_tag_match([post1], "artcomm:#{user1.name}")
+      assert_tag_match([post2], "artcomm:#{user2.name}")
+      assert_tag_match([post2], "-artcomm:#{user1.name}")
+      assert_tag_match([post1], "-artcomm:#{user2.name}")
+
+      assert_tag_match([post2, post1], "commentaryupdater:any")
+      assert_tag_match([], "commentaryupdater:none")
     end
 
     should "return posts for the date:<d> metatag" do