diff --git a/app/logical/post_query_builder.rb b/app/logical/post_query_builder.rb index 8065305bc..4bf668402 100644 --- a/app/logical/post_query_builder.rb +++ b/app/logical/post_query_builder.rb @@ -274,6 +274,10 @@ class PostQueryBuilder relation = add_tag_string_search_relation(q[:tags], relation) + if q[:ordfav].present? + relation = relation.joins(:favorites).where("favorites.user_id = ?", q[:ordfav].to_i).order("favorites.id DESC") + end + if q[:order] == "rank" relation = relation.where("posts.score > 0 and posts.created_at >= ?", 2.days.ago) elsif q[:order] == "landscape" || q[:order] == "portrait" diff --git a/app/models/post.rb b/app/models/post.rb index 90b9c2eae..6d8a78a41 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -31,6 +31,7 @@ class Post < ActiveRecord::Base has_many :comments, :order => "comments.id", :dependent => :destroy has_many :children, :class_name => "Post", :foreign_key => "parent_id", :order => "posts.id" has_many :disapprovals, :class_name => "PostDisapproval", :dependent => :destroy + has_many :favorites validates_uniqueness_of :md5 validate :post_is_not_its_own_parent attr_accessible :source, :rating, :tag_string, :old_tag_string, :last_noted_at, :parent_id, :as => [:member, :builder, :gold, :platinum, :contributor, :janitor, :moderator, :admin, :default] diff --git a/app/models/tag.rb b/app/models/tag.rb index 84a1c94bb..4b1842845 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|-pool|pool|-fav|fav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|score|favcount|filesize|source|-source|id|-id|date|age|order|-status|status|tagcount|gentags|arttags|chartags|copytags|parent|-parent|pixiv_id|pixiv" + METATAGS = "-user|user|-approver|approver|commenter|comm|noter|-pool|pool|-fav|fav|ordfav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|score|favcount|filesize|source|-source|id|-id|date|age|order|-status|status|tagcount|gentags|arttags|chartags|copytags|parent|-parent|pixiv_id|pixiv" attr_accessible :category, :as => [:moderator, :janitor, :contributor, :gold, :member, :anonymous, :default, :builder, :admin] attr_accessible :is_locked, :as => [:moderator, :janitor, :admin] has_one :wiki_page, :foreign_key => "title", :primary_key => "name" @@ -387,6 +387,11 @@ class Tag < ActiveRecord::Base when "fav" q[:tags][:related] << "fav:#{User.name_to_id($2)}" + when "ordfav" + user_id = User.name_to_id($2) + q[:tags][:related] << "fav:#{user_id}" + q[:ordfav] = user_id + when "sub" q[:subscriptions] ||= [] q[:subscriptions] << $2