about summary refs log tree commit diff
path: root/app/models/feed.rb
diff options
context:
space:
mode:
authortateisu <tateisu@gmail.com>2020-09-13 00:09:49 +0900
committerGitHub <noreply@github.com>2020-09-12 17:09:49 +0200
commitfa0c71f0d92ed5587859710dde3b076ec64b1498 (patch)
treef2ffcd1a106281213c8192e771bf59211410e8a6 /app/models/feed.rb
parent4e4b3a0c8e69a724e229f028896ce774ef26df3b (diff)
allow pagination by min_id and max_id (#14776)
* allow pagination by min_id and max_id

* also AccountConversation allows min_id,max_id pair

* also home,list TL allows min_id,max_id pair
Diffstat (limited to 'app/models/feed.rb')
-rw-r--r--app/models/feed.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/feed.rb b/app/models/feed.rb
index 36e0c1e0a..f51dcfab1 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -20,12 +20,12 @@ class Feed
   protected
 
   def from_redis(limit, max_id, since_id, min_id)
+    max_id = '+inf' if max_id.blank?
     if min_id.blank?
-      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).map(&:first).map(&:to_i)
     else
-      unhydrated = redis.zrangebyscore(key, "(#{min_id}", '+inf', limit: [0, limit], with_scores: true).map(&:first).map(&:to_i)
+      unhydrated = redis.zrangebyscore(key, "(#{min_id}", "(#{max_id}", limit: [0, limit], with_scores: true).map(&:first).map(&:to_i)
     end
 
     Status.where(id: unhydrated).cache_ids