From 12559b01eae408c0f3e820ef9c6bc6e356ab889a Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 22 Mar 2016 21:38:47 +0100 Subject: Add pagination by max_id instead of offset/limit --- app/controllers/api/accounts_controller.rb | 2 +- app/controllers/api/statuses_controller.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app/controllers/api') diff --git a/app/controllers/api/accounts_controller.rb b/app/controllers/api/accounts_controller.rb index f543ea98d..5bac98f81 100644 --- a/app/controllers/api/accounts_controller.rb +++ b/app/controllers/api/accounts_controller.rb @@ -15,7 +15,7 @@ class Api::AccountsController < ApiController end def statuses - @statuses = @account.statuses.with_includes.with_counters.order('created_at desc') + @statuses = @account.statuses.with_includes.with_counters.paginate_by_max_id(20, params[:max_id]) end def follow diff --git a/app/controllers/api/statuses_controller.rb b/app/controllers/api/statuses_controller.rb index 951f7113a..ba216a7b3 100644 --- a/app/controllers/api/statuses_controller.rb +++ b/app/controllers/api/statuses_controller.rb @@ -23,11 +23,11 @@ class Api::StatusesController < ApiController def home feed = Feed.new(:home, current_user.account) - @statuses = feed.get(20, (params[:offset] || 0).to_i) + @statuses = feed.get(20, params[:max_id] || '+inf') end def mentions feed = Feed.new(:mentions, current_user.account) - @statuses = feed.get(20, (params[:offset] || 0).to_i) + @statuses = feed.get(20, params[:max_id] || '+inf') end end -- cgit