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

Move visible_posts defaults into a defaults hash, mostly

Browse source
This commit is contained in:
Raphael Sofaer 2011-06-01 12:24:07 -07:00
parent 158401e17d
commit 9aad7810c0
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,15 +13,20 @@ module Diaspora
end end
def visible_posts(opts = {}) def visible_posts(opts = {})
opts = opts.dup defaults = {
opts[:type] ||= ['StatusMessage', 'Photo'] :type => ['StatusMessage', 'Photo'],
opts[:limit] ||= 15 :order => 'updated_at DESC',
opts[:order] ||= 'updated_at DESC' :limit => 15,
:hidden => false
}
opts = defaults.merge(opts)
order_field = opts[:order].split.first.to_sym order_field = opts[:order].split.first.to_sym
opts[:hidden] ||= false
order_with_table = 'posts.' + opts[:order] order_with_table = 'posts.' + opts[:order]
opts[:max_time] = Time.at(opts[:max_time]) if opts[:max_time].is_a?(Integer) opts[:max_time] = Time.at(opts[:max_time]) if opts[:max_time].is_a?(Integer)
opts[:max_time] ||= Time.now + 1 opts[:max_time] ||= Time.now + 1
select_clause ='DISTINCT posts.id, posts.updated_at AS updated_at, posts.created_at AS created_at' select_clause ='DISTINCT posts.id, posts.updated_at AS updated_at, posts.created_at AS created_at'
posts_from_others = Post.joins(:contacts).where( :post_visibilities => {:hidden => opts[:hidden]}, :contacts => {:user_id => self.id}) posts_from_others = Post.joins(:contacts).where( :post_visibilities => {:hidden => opts[:hidden]}, :contacts => {:user_id => self.id})