From b13e7dda1f33be43d1667b754b67df71f3187a5c Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 9 Nov 2016 17:48:44 +0100 Subject: API pagination for all collections using Link header --- app/models/feed.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'app/models/feed.rb') diff --git a/app/models/feed.rb b/app/models/feed.rb index e7a39f5da..408403873 100644 --- a/app/models/feed.rb +++ b/app/models/feed.rb @@ -12,11 +12,13 @@ class Feed # If we're after most recent items and none are there, we need to precompute the feed if unhydrated.empty? && max_id == '+inf' && since_id == '-inf' RegenerationWorker.perform_async(@account.id, @type) - Status.send("as_#{@type}_timeline", @account).paginate_by_max_id(limit, nil, nil) + @statuses = Status.send("as_#{@type}_timeline", @account).paginate_by_max_id(limit, nil, nil) else status_map = Status.where(id: unhydrated).with_includes.with_counters.map { |status| [status.id, status] }.to_h - unhydrated.map { |id| status_map[id] }.compact + @statuses = unhydrated.map { |id| status_map[id] }.compact end + + @statuses end private -- cgit