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

Add ordpool: metatag, fixes #2089

Browse Source
This commit is contained in:
Toks
2014-01-11 14:04:25 -05:00
parent cb629613bd
commit f1d7216244
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/logical/post_query_builder.rb
View File

@@ -304,6 +304,11 @@ class PostQueryBuilder
relation = add_tag_string_search_relation(q[:tags], relation)
if q[:ordpool].present?
pool_id = q[:ordpool].to_i
relation = relation.order("position(' '||posts.id||' ' in ' '||(select post_ids from pools where id = #{pool_id})||' ')")
end
if q[:ordfav].present?
user_id = q[:ordfav].to_i
relation = relation.joins(:favorites).where("favorites.user_id % 100 = ? and favorites.user_id = ?", user_id % 100, user_id).order("favorites.id DESC")

7
app/models/tag.rb
View File

@@ -1,5 +1,5 @@
class Tag < ActiveRecord::Base
METATAGS = "-user|user|-approver|approver|commenter|comm|noter|noteupdater|artcomm|-pool|pool|-fav|fav|ordfav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|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|-fav|fav|ordfav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|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"
attr_accessible :category, :as => [:moderator, :janitor, :contributor, :gold, :member, :anonymous, :default, :builder, :admin]
attr_accessible :is_locked, :as => [:moderator, :janitor, :admin]
@@ -407,6 +407,11 @@ class Tag < ActiveRecord::Base
q[:tags][:related] << "pool:#{Pool.name_to_id($2)}"
end
when "ordpool"
pool_id = Pool.name_to_id($2)
q[:tags][:related] << "pool:#{pool_id}"
q[:ordpool] = pool_id
when "-fav"
q[:tags][:exclude] << "fav:#{User.name_to_id($2)}"