diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index d43306f7b8feed58177d3c949e7af69b3b01752a..6d385767515686990b46adc20d2736dce2cbddd9 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -20,7 +20,7 @@ class Api::V1::AccountsController < ApiController
end
def statuses
- @statuses = @account.statuses.with_includes.with_counters.paginate_by_max_id(20, params[:max_id] || nil).to_a
+ @statuses = @account.statuses.with_includes.with_counters.paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a
end
def follow
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 14b86b2a2808fd50d9d9184fddd9b3a11ce7a306..ec1056a42e81ea562660aba8823206bc5a5376c5 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -45,10 +45,10 @@ class Api::V1::StatusesController < ApiController
end
def home
- @statuses = Feed.new(:home, current_user.account).get(20, params[:max_id]).to_a
+ @statuses = Feed.new(:home, current_user.account).get(20, params[:max_id], params[:since_id]).to_a
end
def mentions
- @statuses = Feed.new(:mentions, current_user.account).get(20, params[:max_id]).to_a
+ @statuses = Feed.new(:mentions, current_user.account).get(20, params[:max_id], params[:since_id]).to_a
end
end
diff --git a/app/models/concerns/paginable.rb b/app/models/concerns/paginable.rb
index 54552ae3d876434d03ffed3dce6bcfb14a07fffa..2d35d349fce521c1d778b33b63967ac82c145246 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 e1c915c093c82ac6f8d5e3caaf63f8259673c673..4466ea14edd16c0d8e6f356b4b40a62ac465a2ec 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