search: fix invalid username searches returning wrong results.

Partial fix for #4389.

* Fix invalid username searches returning all posts instead of no posts.
* Fix "user:A user:B" returning results for user:B instead of no results.
* Fix "approver:A approver:B" returning results for approver:B instead of no results.
* Add support for negated -commenter, -noter, -noteupdater, -upvote, -downvote metatags.
* Add support for "any" and "none" values for all username metatags,
  including negated metatags that didn't support "any" or "none" before.
* Change noter:any and commenter:any to include posts with deleted notes
  or comments. Note that commenter:<username> already included deleted
  comments before. This is so that commenter:any has the same behavior
  as commenter:<username>

app/logical/concerns/searchable.rb

@@ -1,6 +1,10 @@
 module Searchable
   extend ActiveSupport::Concern
 
+  def negate(kind = :nor)
+    unscoped.where(all.where_clause.invert(kind).ast)
+  end
+
   def where_like(attr, value)
     where("#{qualified_column_for(attr)} LIKE ? ESCAPE E'\\\\'", value.to_escaped_for_sql_like)
   end

app/logical/post_query_builder.rb

@@ -12,12 +12,13 @@ class PostQueryBuilder
   COUNT_METATAG_SYNONYMS = COUNT_METATAGS.map { |str| str.delete_suffix("_count").pluralize }
 
   METATAGS = %w[
-    -user user -approver approver commenter comm noter noteupdater artcomm
+    -user user -approver approver -commenter commenter comm -noter noter
-    -pool pool ordpool -favgroup favgroup -fav fav ordfav md5 -rating rating
+    -noteupdater noteupdater artcomm -pool pool ordpool -favgroup favgroup -fav
-    -locked locked width height mpixels ratio score favcount filesize source
+    fav ordfav md5 -rating rating -locked locked width height mpixels ratio
-    -source id -id date age order limit -status status tagcount parent -parent
+    score favcount filesize source -source id -id date age order limit -status
-    child pixiv_id pixiv search upvote downvote filetype -filetype flagger
+    status tagcount parent -parent child pixiv_id pixiv search -upvote upvote
-    -flagger appealer -appealer disapproved -disapproved embedded
+    -downvote downvote filetype -filetype flagger -flagger appealer -appealer
+    disapproved -disapproved embedded
   ] + TagCategory.short_name_list.map {|x| "#{x}tags"} + COUNT_METATAGS + COUNT_METATAG_SYNONYMS
 
   ORDER_METATAGS = %w[
@@ -88,6 +89,33 @@ class PostQueryBuilder
     array.map(&:to_escaped_for_tsquery)
   end
 
+  def add_user_relation(field, username, relation)
+    if username == "any"
+      relation.where.not(field => nil)
+    elsif username == "none"
+      relation.where(field => nil)
+    else
+      relation.where(field => User.name_matches(username))
+    end
+  end
+
+  def add_user_subquery_relation(table, username, relation, field: :creator, &block)
+    subquery = table.where("post_id = posts.id").select(1)
+
+    if username == "any"
+      relation.where("EXISTS (#{subquery.to_sql})")
+    elsif username == "none"
+      relation.where("NOT EXISTS (#{subquery.to_sql})")
+    elsif block.nil?
+      subquery = subquery.where(field => User.name_matches(username))
+      relation.where("EXISTS (#{subquery.to_sql})")
+    else
+      subquery = subquery.merge(block.call(username))
+      return relation.none if subquery.to_sql.blank?
+      relation.where("EXISTS (#{subquery.to_sql})")
+    end
+  end
+
   def add_tag_string_search_relation(tags, relation)
     tag_query_sql = []
 
@@ -289,26 +317,20 @@ class PostQueryBuilder
       relation = add_saved_search_relation(q[:saved_searches], relation)
     end
 
-    if q[:uploader_id_neg]
+    q[:user_neg].to_a.each do |username|
-      relation = relation.where.not("posts.uploader_id": q[:uploader_id_neg])
+      relation = add_user_relation(:uploader, username, relation).negate
     end
 
-    if q[:uploader_id]
+    q[:user].to_a.each do |username|
-      relation = relation.where("posts.uploader_id": q[:uploader_id])
+      relation = add_user_relation(:uploader, username, relation)
     end
 
-    if q[:approver_id_neg]
+    q[:approver_neg].to_a.each do |username|
-      relation = relation.where.not("posts.approver_id": q[:approver_id_neg])
+      relation = add_user_relation(:approver, username, relation).negate
     end
 
-    if q[:approver_id]
+    q[:approver].to_a.each do |username|
-      if q[:approver_id] == "any"
+      relation = add_user_relation(:approver, username, relation)
-        relation = relation.where("posts.approver_id is not null")
-      elsif q[:approver_id] == "none"
-        relation = relation.where("posts.approver_id is null")
-      else
-        relation = relation.where("posts.approver_id": q[:approver_id])
-      end
     end
 
     if q[:disapproved]
@@ -335,70 +357,50 @@ class PostQueryBuilder
       end
     end
 
-    q[:flaggers_neg].to_a.each do |flagger|
+    q[:flagger_neg].to_a.each do |flagger|
-      flags = PostFlag.unscoped.creator_matches(flagger, CurrentUser.user).where("post_id = posts.id").select("1")
+      relation = add_user_subquery_relation(PostFlag.unscoped.category_matches("normal"), flagger, relation) do |username|
-      relation = relation.where("NOT EXISTS (#{flags.to_sql})")
+        flagger = User.find_by_name(username)
+        PostFlag.unscoped.creator_matches(flagger, CurrentUser.user)
+      end.negate
     end
 
-    q[:flaggers].to_a.each do |flagger|
+    q[:flagger].to_a.each do |flagger|
-      if flagger == "any"
+      relation = add_user_subquery_relation(PostFlag.unscoped.category_matches("normal"), flagger, relation) do |username|
-        flags = PostFlag.unscoped.category_matches("normal").where("post_id = posts.id").select("1")
+        flagger = User.find_by_name(username)
-        relation = relation.where("EXISTS (#{flags.to_sql})")
+        PostFlag.unscoped.creator_matches(flagger, CurrentUser.user)
-      elsif flagger == "none"
-        flags = PostFlag.unscoped.category_matches("normal").where("post_id = posts.id").select("1")
-        relation = relation.where("NOT EXISTS (#{flags.to_sql})")
-      else
-        flags = PostFlag.unscoped.creator_matches(flagger, CurrentUser.user).where("post_id = posts.id").select("1")
-        relation = relation.where("EXISTS (#{flags.to_sql})")
       end
     end
 
-    if q[:appealer_ids_neg]
+    q[:appealer_neg].to_a.each do |appealer|
-      q[:appealer_ids_neg].each do |appealer_id|
+      relation = add_user_subquery_relation(PostAppeal.unscoped, appealer, relation).negate
-        relation = relation.where.not("posts.id": PostAppeal.unscoped.where(creator_id: appealer_id).select(:post_id).distinct)
-      end
     end
 
-    if q[:appealer_ids]
+    q[:appealer].to_a.each do |appealer|
-      q[:appealer_ids].each do |appealer_id|
+      relation = add_user_subquery_relation(PostAppeal.unscoped, appealer, relation)
-        if appealer_id == "any"
-          relation = relation.where('EXISTS (' + PostAppeal.unscoped.where('post_id = posts.id').select('1').to_sql + ')')
-        elsif appealer_id == "none"
-          relation = relation.where('NOT EXISTS (' + PostAppeal.unscoped.where('post_id = posts.id').select('1').to_sql + ')')
-        else
-          relation = relation.where("posts.id": PostAppeal.unscoped.where(creator_id: appealer_id).select(:post_id).distinct)
-        end
-      end
     end
 
-    if q[:commenter_ids]
+    q[:commenter_neg].to_a.each do |commenter|
-      q[:commenter_ids].each do |commenter_id|
+      relation = add_user_subquery_relation(Comment.unscoped, commenter, relation).negate
-        if commenter_id == "any"
-          relation = relation.where("posts.last_commented_at is not null")
-        elsif commenter_id == "none"
-          relation = relation.where("posts.last_commented_at is null")
-        else
-          relation = relation.where("posts.id": Comment.unscoped.where(creator_id: commenter_id).select(:post_id).distinct)
-        end
-      end
     end
 
-    if q[:noter_ids]
+    q[:commenter].to_a.each do |commenter|
-      q[:noter_ids].each do |noter_id|
+      relation = add_user_subquery_relation(Comment.unscoped, commenter, relation)
-        if noter_id == "any"
-          relation = relation.where("posts.last_noted_at is not null")
-        elsif noter_id == "none"
-          relation = relation.where("posts.last_noted_at is null")
-        else
-          relation = relation.where("posts.id": NoteVersion.unscoped.where(version: 1, updater_id: noter_id).select(:post_id).distinct)
-        end
-      end
     end
 
-    if q[:note_updater_ids]
+    q[:noter_neg].to_a.each do |noter|
-      q[:note_updater_ids].each do |note_updater_id|
+      relation = add_user_subquery_relation(NoteVersion.unscoped.where(version: 1), noter, relation, field: :updater).negate
-        relation = relation.where("posts.id": NoteVersion.unscoped.where(updater_id: note_updater_id).select("post_id").distinct)
+    end
-      end
+
+    q[:noter].to_a.each do |noter|
+      relation = add_user_subquery_relation(NoteVersion.unscoped.where(version: 1), noter, relation, field: :updater)
+    end
+
+    q[:note_updater_neg].to_a.each do |note_updater|
+      relation = add_user_subquery_relation(NoteVersion.unscoped, note_updater, relation, field: :updater).negate
+    end
+
+    q[:note_updater].to_a.each do |note_updater|
+      relation = add_user_subquery_relation(NoteVersion.unscoped, note_updater, relation, field: :updater)
     end
 
     if q[:artcomm_ids]
@@ -499,14 +501,20 @@ class PostQueryBuilder
       relation = relation.where(id: FavoriteGroup.where(id: favgroup.id).select("unnest(post_ids)"))
     end
 
-    q[:upvoter].to_a.each do |voter|
+    q[:upvoter].to_a.each do |upvoter|
-      votes = PostVote.positive.visible(CurrentUser.user).where(user: voter).where("post_id = posts.id").select("1")
+      relation = add_user_subquery_relation(PostVote.positive.visible(CurrentUser.user), upvoter, relation, field: :user)
-      relation = relation.where("EXISTS (#{votes.to_sql})")
     end
 
-    q[:downvoter].to_a.each do |voter|
+    q[:upvoter_neg].to_a.each do |upvoter|
-      votes = PostVote.negative.visible(CurrentUser.user).where(user: voter).where("post_id = posts.id").select("1")
+      relation = add_user_subquery_relation(PostVote.positive.visible(CurrentUser.user), upvoter, relation, field: :user).negate
-      relation = relation.where("EXISTS (#{votes.to_sql})")
+    end
+
+    q[:downvoter].to_a.each do |downvoter|
+      relation = add_user_subquery_relation(PostVote.negative.visible(CurrentUser.user), downvoter, relation, field: :user)
+    end
+
+    q[:downvoter_neg].to_a.each do |downvoter|
+      relation = add_user_subquery_relation(PostVote.negative.visible(CurrentUser.user), downvoter, relation, field: :user).negate
     end
 
     if q[:ordfav].present?
@@ -702,114 +710,60 @@ class PostQueryBuilder
             g2 = $2
             case g1
             when "-user"
-              q[:uploader_id_neg] ||= []
+              q[:user_neg] ||= []
-              user_id = User.name_to_id(g2)
+              q[:user_neg] << g2
-              q[:uploader_id_neg] << user_id unless user_id.blank?
 
             when "user"
-              user_id = User.name_to_id(g2)
+              q[:user] ||= []
-              q[:uploader_id] = user_id unless user_id.blank?
+              q[:user] << g2
 
             when "-approver"
-              if g2 == "none"
+              q[:approver_neg] ||= []
-                q[:approver_id] = "any"
+              q[:approver_neg] << g2
-              elsif g2 == "any"
-                q[:approver_id] = "none"
-              else
-                q[:approver_id_neg] ||= []
-                user_id = User.name_to_id(g2)
-                q[:approver_id_neg] << user_id unless user_id.blank?
-              end
 
             when "approver"
-              if g2 == "none"
+              q[:approver] ||= []
-                q[:approver_id] = "none"
+              q[:approver] << g2
-              elsif g2 == "any"
-                q[:approver_id] = "any"
-              else
-                user_id = User.name_to_id(g2)
-                q[:approver_id] = user_id unless user_id.blank?
-              end
 
             when "flagger"
-              if g2 == "none"
+              q[:flagger] ||= []
-                q[:flaggers] ||= []
+              q[:flagger] << g2
-                q[:flaggers] << "none"
-              elsif g2 == "any"
-                q[:flaggers] ||= []
-                q[:flaggers] << "any"
-              else
-                user = User.find_by_name(g2)
-                q[:flaggers] ||= []
-                q[:flaggers] << user unless user.blank?
-              end
 
             when "-flagger"
-              if g2 == "none"
+              q[:flagger_neg] ||= []
-                q[:flaggers] ||= []
+              q[:flagger_neg] << g2
-                q[:flaggers] << "any"
-              elsif g2 == "any"
-                q[:flaggers] ||= []
-                q[:flaggers] << "none"
-              else
-                user = User.find_by_name(g2)
-                q[:flaggers_neg] ||= []
-                q[:flaggers_neg] << user unless user.blank?
-              end
 
             when "appealer"
-              q[:appealer_ids] ||= []
+              q[:appealer] ||= []
-
+              q[:appealer] << g2
-              if g2 == "none"
-                q[:appealer_ids] << "none"
-              elsif g2 == "any"
-                q[:appealer_ids] << "any"
-              else
-                user_id = User.name_to_id(g2)
-                q[:appealer_ids] << user_id unless user_id.blank?
-              end
 
             when "-appealer"
-              if g2 == "none"
+              q[:appealer_neg] ||= []
-                q[:appealer_ids] ||= []
+              q[:appealer_neg] << g2
-                q[:appealer_ids] << "any"
-              elsif g2 == "any"
-                q[:appealer_ids] ||= []
-                q[:appealer_ids] << "none"
-              else
-                q[:appealer_ids_neg] ||= []
-                user_id = User.name_to_id(g2)
-                q[:appealer_ids_neg] << user_id unless user_id.blank?
-              end
 
             when "commenter", "comm"
-              q[:commenter_ids] ||= []
+              q[:commenter] ||= []
+              q[:commenter] << g2
 
-              if g2 == "none"
+            when "-commenter", "-comm"
-                q[:commenter_ids] << "none"
+              q[:commenter_neg] ||= []
-              elsif g2 == "any"
+              q[:commenter_neg] << g2
-                q[:commenter_ids] << "any"
-              else
-                user_id = User.name_to_id(g2)
-                q[:commenter_ids] << user_id unless user_id.blank?
-              end
 
             when "noter"
-              q[:noter_ids] ||= []
+              q[:noter] ||= []
+              q[:noter] << g2
 
-              if g2 == "none"
+            when "-noter"
-                q[:noter_ids] << "none"
+              q[:noter_neg] ||= []
-              elsif g2 == "any"
+              q[:noter_neg] << g2
-                q[:noter_ids] << "any"
-              else
-                user_id = User.name_to_id(g2)
-                q[:noter_ids] << user_id unless user_id.blank?
-              end
 
             when "noteupdater"
-              q[:note_updater_ids] ||= []
+              q[:note_updater] ||= []
-              user_id = User.name_to_id(g2)
+              q[:note_updater] << g2
-              q[:note_updater_ids] << user_id unless user_id.blank?
+
+            when "-noteupdater"
+              q[:note_updater_neg] ||= []
+              q[:note_updater_neg] << g2
 
             when "artcomm"
               q[:artcomm_ids] ||= []
@@ -992,15 +946,21 @@ class PostQueryBuilder
                 q[:pixiv_id] = parse_helper(g2)
               end
 
+            when "-upvote"
+              q[:upvoter_neg] ||= []
+              q[:upvoter_neg] << g2
+
             when "upvote"
-              user = User.find_by_name(g2)
               q[:upvoter] ||= []
-              q[:upvoter] << user unless user.blank?
+              q[:upvoter] << g2
+
+            when "-downvote"
+              q[:downvoter_neg] ||= []
+              q[:downvoter_neg] << g2
 
             when "downvote"
-              user = User.find_by_name(g2)
               q[:downvoter] ||= []
-              q[:downvoter] << user unless user.blank?
+              q[:downvoter] << g2
 
             when *COUNT_METATAGS
               q[g1.to_sym] = parse_helper(g2)

app/models/post_flag.rb

@@ -27,6 +27,8 @@ class PostFlag < ApplicationRecord
 
   module SearchMethods
     def creator_matches(creator, searcher)
+      return none if creator.nil?
+
       policy = Pundit.policy!([searcher, nil], PostFlag.new(creator: creator))
 
       if policy.can_view_flagger?

app/models/user.rb

@@ -145,9 +145,14 @@ class User < ApplicationRecord
         find_by_name(name).try(:id)
       end
 
-      # XXX downcasing is the wrong way to do case-insensitive comparison for unicode (should use casefolding).
+      # XXX should casefold instead of lowercasing.
+      # XXX using lower(name) instead of ilike so we can use the index.
+      def name_matches(name)
+        where("lower(name) = ?", normalize_name(name)).limit(1)
+      end
+
       def find_by_name(name)
-        where_iequals(:name, normalize_name(name)).first
+        name_matches(name).first
       end
 
       def normalize_name(name)

test/unit/post_test.rb

@@ -2133,8 +2133,8 @@ class PostTest < ActiveSupport::TestCase
       create(:comment, creator: create(:user, created_at: 2.weeks.ago), post: posts[0], is_deleted: false)
       create(:comment, creator: create(:user, created_at: 2.weeks.ago), post: posts[1], is_deleted: true)
 
-      assert_tag_match([posts[0]], "commenter:any")
+      assert_tag_match(posts.reverse, "commenter:any")
-      assert_tag_match([posts[1]], "commenter:none")
+      assert_tag_match([], "commenter:none")
     end
 
     should "return posts for the noter:<name> metatag" do
@@ -2153,8 +2153,8 @@ class PostTest < ActiveSupport::TestCase
       FactoryBot.create(:note, post: posts[0], is_active: true)
       FactoryBot.create(:note, post: posts[1], is_active: false)
 
-      assert_tag_match([posts[0]], "noter:any")
+      assert_tag_match(posts.reverse, "noter:any")
-      assert_tag_match([posts[1]], "noter:none")
+      assert_tag_match([], "noter:none")
     end
 
     should "return posts for the note_count:<N> metatag" do