diff --git a/app/logical/post_query_builder.rb b/app/logical/post_query_builder.rb index b75527822..6f347c301 100644 --- a/app/logical/post_query_builder.rb +++ b/app/logical/post_query_builder.rb @@ -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") diff --git a/app/models/tag.rb b/app/models/tag.rb index bc7203f98..480d49e58 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -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)}"