From 621b22111eab3541c34bd501ca955357b8637342 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Sat, 18 Apr 2020 18:02:55 -0500
Subject: [PATCH] search: clean up pixiv:<any|none> handling.

Refactor so that all metatags that use parse_helper (which is most
integer-valued metatags) support the special "any" and "none" keywords.

This is mainly for consistency, since it's really only useful for using
width:none and height:none to find for certain old unsupported filetypes
that have null width/height values.
---
 app/logical/post_query_builder.rb | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/logical/post_query_builder.rb b/app/logical/post_query_builder.rb
index e653635af..e3d5289ed 100644
--- a/app/logical/post_query_builder.rb
+++ b/app/logical/post_query_builder.rb
@@ -90,8 +90,13 @@ class PostQueryBuilder
 
     case arr[0]
     when :eq
-      if arr[1].is_a?(Time)
+      case arr[1]
+      when Time
         relation.where("#{field} between ? and ?", arr[1].beginning_of_day, arr[1].end_of_day)
+      when :any
+        relation.where(["#{field} IS NOT NULL"])
+      when :none
+        relation.where(["#{field} IS NULL"])
       else
         relation.where(["#{field} = ?", arr[1]])
       end
@@ -266,6 +271,7 @@ class PostQueryBuilder
     relation = add_range_relation(q[:filesize], "posts.file_size", relation)
     relation = add_range_relation(q[:date], "posts.created_at", relation)
     relation = add_range_relation(q[:age], "posts.created_at", relation)
+    relation = add_range_relation(q[:pixiv_id], "posts.pixiv_id", relation)
     TagCategory.categories.each do |category|
       relation = add_range_relation(q["#{category}_tag_count".to_sym], "posts.tag_count_#{category}", relation)
     end
@@ -497,16 +503,6 @@ class PostQueryBuilder
       relation = relation.where("posts.has_children = TRUE")
     end
 
-    if q[:pixiv_id]
-      if q[:pixiv_id] == "any"
-        relation = relation.where("posts.pixiv_id IS NOT NULL")
-      elsif q[:pixiv_id] == "none"
-        relation = relation.where("posts.pixiv_id IS NULL")
-      else
-        relation = add_range_relation(q[:pixiv_id], "posts.pixiv_id", relation)
-      end
-    end
-
     q[:rating].to_a.each do |rating|
       relation = relation.where(rating: rating.first.downcase)
     end
@@ -1013,11 +1009,7 @@ class PostQueryBuilder
               q[:filetype_neg] = g2.downcase
 
             when "pixiv_id", "pixiv"
-              if g2.downcase == "any" || g2.downcase == "none"
-                q[:pixiv_id] = g2.downcase
-              else
-                q[:pixiv_id] = parse_helper(g2)
-              end
+              q[:pixiv_id] = parse_helper(g2)
 
             when "-upvote"
               q[:upvoter_neg] ||= []
@@ -1155,6 +1147,12 @@ class PostQueryBuilder
         when /[, ]/
           return [:in, range.split(/[, ]+/).map {|x| parse_cast(x, type)}]
 
+        when "any"
+          return [:eq, :any]
+
+        when "none"
+          return [:eq, :none]
+
         else
           # add a 5% tolerance for float and filesize values
           if type == :float || (type == :filesize && range =~ /[km]b?\z/i)