Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Hansen & Maxwell Salzberg <pair+ohaibbq+maxwell@joindiaspora.com>2011-11-03 01:36:19 +0400
committerdanielgrippi <danielgrippi@gmail.com>2011-11-03 23:31:24 +0400
commit5b8365118d77ee0b390d6354733679bae664274d (patch)
tree3b61eef09bf038d6e2e46ba08f6d60c7f1ad1407 /lib/stream/base.rb
parent0eb33b371b2c39dcef019d7b8cea770b64ec1017 (diff)
Stream#posts no longer needs to call for_a_stream
exclude blocked users from all streams
Diffstat (limited to 'lib/stream/base.rb')
-rw-r--r--lib/stream/base.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/stream/base.rb b/lib/stream/base.rb
index a117ee996..cd8076e34 100644
--- a/lib/stream/base.rb
+++ b/lib/stream/base.rb
@@ -43,7 +43,11 @@ class Stream::Base
# @return [ActiveRecord::Relation<Post>]
def posts
- []
+ Post.scoped
+ end
+
+ def stream_posts
+ self.posts.for_a_stream(max_time, order, user)
end
# @return [ActiveRecord::Association<Person>] AR association of people within stream's given aspects