about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-10-02 22:35:27 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-10-02 22:35:27 +0200
commit9fd3d7b6cdb97a8f0f47425a32f34fc5c54b94de (patch)
treea5be5b8c4f1a832771de0720d33d495244d59974 /app/models
parenta0f85774c482716505b0c8c8faf59616f06245d9 (diff)
Add since_id param to feeds
Diffstat (limited to 'app/models')
-rw-r--r--app/models/concerns/paginable.rb7
-rw-r--r--app/models/feed.rb7
2 files changed, 10 insertions, 4 deletions
diff --git a/app/models/concerns/paginable.rb b/app/models/concerns/paginable.rb
index 54552ae3d..2d35d349f 100644
--- a/app/models/concerns/paginable.rb
+++ b/app/models/concerns/paginable.rb
@@ -2,6 +2,11 @@ module Paginable
   extend ActiveSupport::Concern
 
   included do
-    scope :paginate_by_max_id, -> (limit, max_id) { order('id desc').limit(limit).where(max_id.nil? ? '1=1' : ['id < ?', max_id]) }
+    def self.paginate_by_max_id(limit, max_id = nil, since_id = nil)
+      query = order('id desc').limit(limit)
+      query = query.where('id < ?', max_id) unless max_id.blank?
+      query = query.where('id > ?', since_id) unless since_id.blank?
+      query
+    end
   end
 end
diff --git a/app/models/feed.rb b/app/models/feed.rb
index e1c915c09..4466ea14e 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -4,9 +4,10 @@ class Feed
     @account = account
   end
 
-  def get(limit, max_id = nil)
-    max_id     = '+inf' if max_id.nil?
-    unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", '-inf', limit: [0, limit], with_scores: true).collect(&:last).map(&:to_i)
+  def get(limit, max_id = nil, since_id = nil)
+    max_id     = '+inf' if max_id.blank?
+    since_id   = '-inf' if since_id.blank?
+    unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", "(#{since_id}", limit: [0, limit], with_scores: true).collect(&:last).map(&:to_i)
     status_map = {}
 
     # If we're after most recent items and none are there, we need to precompute the feed