diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-25 02:13:30 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-25 02:13:30 +0100 |
commit | a08e724476f47b85de9bb334eeadaf882a7a23ee (patch) | |
tree | d779668fa289d2b7077c878b19fc6691a57142b7 /app/models/feed.rb | |
parent | 9594f0e858172b9295c5598fcb6ab10506d3046d (diff) |
Fix subscriptions:clear task, refactor feeds, refactor streamable activites
and atom feed generation to some extent, as well as the way mentions are stored
Diffstat (limited to 'app/models/feed.rb')
-rw-r--r-- | app/models/feed.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/app/models/feed.rb b/app/models/feed.rb index 206f287e7..1d6c2cfbf 100644 --- a/app/models/feed.rb +++ b/app/models/feed.rb @@ -4,21 +4,24 @@ class Feed @account = account end - def get(limit, max_id = '+inf') + def get(limit, max_id) + max_id = '+inf' if max_id.nil? unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", '-inf', limit: [0, limit]) status_map = Hash.new # If we're after most recent items and none are there, we need to precompute the feed - return PrecomputeFeedService.new.(@type, @account).take(limit) if unhydrated.empty? && max_id == '+inf' - - Status.where(id: unhydrated).with_includes.with_counters.each { |status| status_map[status.id.to_s] = status } - return unhydrated.map { |id| status_map[id] }.compact + if unhydrated.empty? && max_id == '+inf' + PrecomputeFeedService.new.(@type, @account, limit) + else + Status.where(id: unhydrated).with_includes.with_counters.each { |status| status_map[status.id.to_s] = status } + unhydrated.map { |id| status_map[id] }.compact + end end private def key - "feed:#{@type}:#{@account.id}" + FeedManager.key(@type, @account.id) end def redis |