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

Allow searching by negated favgroup: metatag

Browse Source
This commit is contained in:
Toks
2015-08-07 16:54:22 -04:00
parent 7215a39d98
commit 5bc0eea161
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/logical/post_query_builder.rb
View File

@@ -312,6 +312,14 @@ class PostQueryBuilder
relation = relation.order("position(' '||posts.id||' ' in ' '||(select post_ids from pools where id = #{pool_id})||' ')") relation = relation.order("position(' '||posts.id||' ' in ' '||(select post_ids from pools where id = #{pool_id})||' ')")
end end
if q[:favgroup_neg].present?
favgroup_id = q[:favgroup_neg].to_i
favgroup = FavoriteGroup.where("favorite_groups.id = ?", favgroup_id).first
if favgroup
relation = relation.where("posts.id NOT in (?)", favgroup.post_id_array)
end
end
if q[:favgroup].present? if q[:favgroup].present?
favgroup_id = q[:favgroup].to_i favgroup_id = q[:favgroup].to_i
favgroup = FavoriteGroup.where("favorite_groups.id = ?", favgroup_id).first favgroup = FavoriteGroup.where("favorite_groups.id = ?", favgroup_id).first

6
app/models/tag.rb
View File

@@ -1,5 +1,5 @@
class Tag < ActiveRecord::Base class Tag < ActiveRecord::Base
METATAGS = "-user|user|-approver|approver|commenter|comm|noter|noteupdater|artcomm|-pool|pool|ordpool|favgroup|-fav|fav|ordfav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|ratio|score|favcount|filesize|source|-source|id|-id|date|age|order|limit|-status|status|tagcount|gentags|arttags|chartags|copytags|parent|-parent|child|pixiv_id|pixiv" METATAGS = "-user|user|-approver|approver|commenter|comm|noter|noteupdater|artcomm|-pool|pool|ordpool|-favgroup|favgroup|-fav|fav|ordfav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|ratio|score|favcount|filesize|source|-source|id|-id|date|age|order|limit|-status|status|tagcount|gentags|arttags|chartags|copytags|parent|-parent|child|pixiv_id|pixiv"
SUBQUERY_METATAGS = "commenter|comm|noter|noteupdater|artcomm" SUBQUERY_METATAGS = "commenter|comm|noter|noteupdater|artcomm"
attr_accessible :category, :as => [:moderator, :janitor, :contributor, :gold, :member, :anonymous, :default, :builder, :admin] attr_accessible :category, :as => [:moderator, :janitor, :contributor, :gold, :member, :anonymous, :default, :builder, :admin]
attr_accessible :is_locked, :as => [:moderator, :admin] attr_accessible :is_locked, :as => [:moderator, :admin]
@@ -460,6 +460,10 @@ class Tag < ActiveRecord::Base
q[:tags][:related] << "pool:#{pool_id}" q[:tags][:related] << "pool:#{pool_id}"
q[:ordpool] = pool_id q[:ordpool] = pool_id
when "-favgroup"
favgroup_id = FavoriteGroup.name_to_id($2)
q[:favgroup_neg] = favgroup_id
when "favgroup" when "favgroup"
favgroup_id = FavoriteGroup.name_to_id($2) favgroup_id = FavoriteGroup.name_to_id($2)
q[:favgroup] = favgroup_id q[:favgroup] = favgroup_id