jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3157 from r888888888/more_metatags

Browse Source 
Add more support for negated existing metatags
This commit is contained in:
Albert Yi
2017-06-15 11:36:14 -07:00
committed by GitHub
parent a7b8a0d9f7 bf6add5273
commit 56b1651cd4
2 changed files with 53 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/logical/post_query_builder.rb
View File

@@ -322,13 +322,21 @@ class PostQueryBuilder
if q[:parent] == "none"
relation = relation.where("posts.parent_id IS NULL")
elsif q[:parent_neg] == "none" || q[:parent] == "any"
elsif q[:parent] == "any"
relation = relation.where("posts.parent_id IS NOT NULL")
elsif q[:parent]
relation = relation.where("(posts.id = ? or posts.parent_id = ?)", q[:parent].to_i, q[:parent].to_i)
has_constraints!
end
if q[:parent_neg_ids]
neg_ids = q[:parent_neg_ids].map(&:to_i)
neg_ids.delete(0)
if neg_ids.present?
relation = relation.where("posts.id not in (?) and (posts.parent_id is null or posts.parent_id not in (?))", neg_ids, neg_ids)
end
end
if q[:child] == "none"
relation = relation.where("posts.has_children = FALSE")
elsif q[:child] == "any"

55
app/models/tag.rb
View File

@@ -436,9 +436,15 @@ class Tag < ActiveRecord::Base
q[:uploader_id] = user_id unless user_id.blank?
when "-approver"
q[:approver_id_neg] ||= []
user_id = User.name_to_id($2)
q[:approver_id_neg] << user_id unless user_id.blank?
if $2 == "none"
q[:approver_id] = "any"
elsif $2 == "any"
q[:approver_id] = "none"
else
q[:approver_id_neg] ||= []
user_id = User.name_to_id($2)
q[:approver_id_neg] << user_id unless user_id.blank?
end
when "approver"
if $2 == "none"
@@ -463,9 +469,17 @@ class Tag < ActiveRecord::Base
end
when "-flagger"
q[:flagger_ids_neg] ||= []
user_id = User.name_to_id($2)
q[:flagger_ids_neg] << user_id unless user_id.blank?
if $2 == "none"
q[:flagger_ids] ||= []
q[:flagger_ids] << "any"
elsif $2 == "any"
q[:flagger_ids] ||= []
q[:flagger_ids] << "none"
else
q[:flagger_ids_neg] ||= []
user_id = User.name_to_id($2)
q[:flagger_ids_neg] << user_id unless user_id.blank?
end
when "appealer"
q[:appealer_ids] ||= []
@@ -480,9 +494,17 @@ class Tag < ActiveRecord::Base
end
when "-appealer"
q[:appealer_ids_neg] ||= []
user_id = User.name_to_id($2)
q[:appealer_ids_neg] << user_id unless user_id.blank?
if $2 == "none"
q[:appealer_ids] ||= []
q[:appealer_ids] << "any"
elsif $2 == "any"
q[:appealer_ids] ||= []
q[:appealer_ids] << "none"
else
q[:appealer_ids_neg] ||= []
user_id = User.name_to_id($2)
q[:appealer_ids_neg] << user_id unless user_id.blank?
end
when "commenter", "comm"
q[:commenter_ids] ||= []
@@ -519,7 +541,11 @@ class Tag < ActiveRecord::Base
q[:artcomm_ids] << user_id unless user_id.blank?
when "-pool"
if $2.downcase == "series"
if $2.downcase == "none"
q[:pool] = "any"
elsif $2.downcase == "any"
q[:pool] = "none"
elsif $2.downcase == "series"
q[:tags][:exclude] << "pool:series"
elsif $2.downcase == "collection"
q[:tags][:exclude] << "pool:collection"
@@ -648,7 +674,14 @@ class Tag < ActiveRecord::Base
q[:parent] = $2.downcase
when "-parent"
q[:parent_neg] = $2.downcase
if $2.downcase == "none"
q[:parent] = "any"
elsif $2.downcase == "any"
q[:parent] = "none"
else
q[:parent_neg_ids] ||= []
q[:parent_neg_ids] << $2.downcase
end
when "child"
q[:child] = $2.downcase