nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Limit posts in raw_visible_posts

Browse source
This commit is contained in:
danielgrippi 2011-03-29 16:25:20 -07:00
parent 2f473cadc3
commit 6df652a513
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/diaspora/user/querying.rb
View file

@ -12,6 +12,7 @@ module Diaspora
def raw_visible_posts(opts = {}) def raw_visible_posts(opts = {})
opts[:type] ||= ['StatusMessage', 'Photo'] opts[:type] ||= ['StatusMessage', 'Photo']
opts[:limit] ||= 20
posts_from_others = Post.joins(:contacts).where(:contacts => {:user_id => self.id}) posts_from_others = Post.joins(:contacts).where(:contacts => {:user_id => self.id})
posts_from_self = self.person.posts.joins(:aspect_visibilities => :aspect).where(:aspects => {:user_id => self.id}) posts_from_self = self.person.posts.joins(:aspect_visibilities => :aspect).where(:aspects => {:user_id => self.id})
@ -22,10 +23,10 @@ module Diaspora
posts_from_self = posts_from_self.where(:aspects => {:id => opts[:by_members_of]}) posts_from_self = posts_from_self.where(:aspects => {:id => opts[:by_members_of]})
end end
post_ids = posts_from_others.select('posts.id').map{|p| p.id} post_ids = posts_from_others.select('posts.id').limit(opts[:limit]).map{|p| p.id}
post_ids += posts_from_self.select('posts.id').map{|p| p.id} post_ids += posts_from_self.select('posts.id').limit(opts[:limit]).map{|p| p.id}
Post.where(:id => post_ids, :pending => false, :type => opts[:type]).select('DISTINCT `posts`.*') Post.where(:id => post_ids, :pending => false, :type => opts[:type]).select('DISTINCT `posts`.*').limit(opts[:limit])
end end
def visible_photos def visible_photos