Add since_id param to feeds

This commit is contained in:
Eugen Rochko 2016-10-02 22:35:27 +02:00
parent a0f85774c4
commit 9fd3d7b6cd
4 changed files with 13 additions and 7 deletions

View File

@ -20,7 +20,7 @@ class Api::V1::AccountsController < ApiController
end end
def statuses 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 end
def follow def follow

View File

@ -45,10 +45,10 @@ class Api::V1::StatusesController < ApiController
end end
def home 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 end
def mentions 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
end end

View File

@ -2,6 +2,11 @@ module Paginable
extend ActiveSupport::Concern extend ActiveSupport::Concern
included do 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
end end

View File

@ -4,9 +4,10 @@ class Feed
@account = account @account = account
end end
def get(limit, max_id = nil) def get(limit, max_id = nil, since_id = nil)
max_id = '+inf' if max_id.nil? max_id = '+inf' if max_id.blank?
unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", '-inf', limit: [0, limit], with_scores: true).collect(&:last).map(&:to_i) 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 = {} status_map = {}
# If we're after most recent items and none are there, we need to precompute the feed # If we're after most recent items and none are there, we need to precompute the feed