Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Make public timelines API not require user context/app credentials (#1291)

Browse source 
* Make /api/v1/timelines/public and /api/v1/timelines/tag/:id public
Fix #1156 - respect query params when generating pagination links in API

* Apply pagination fix to more APIs
This commit is contained in:
Eugen 2017-04-08 23:39:31 +02:00 • committed by GitHub
parent 9acdb166e8
commit b89f007862
8 changed files with 74 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/api/v1/blocks_controller.rb
View file

@ -11,11 +11,15 @@ class Api::V1::BlocksController < ApiController
accounts = Account.where(id: results.map(&:target_account_id)).map { |a| [a.id, a] }.to_h
@accounts = results.map { |f| accounts[f.target_account_id] }.compact
# set_account_counters_maps(@accounts)
next_path = api_v1_blocks_url(max_id: results.last.id) if results.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
prev_path = api_v1_blocks_url(since_id: results.first.id) unless results.empty?
next_path = api_v1_blocks_url(pagination_params(max_id: results.last.id)) if results.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
prev_path = api_v1_blocks_url(pagination_params(since_id: results.first.id)) unless results.empty?
set_pagination_headers(next_path, prev_path)
end
private
def pagination_params(core_params)
params.permit(:limit).merge(core_params)
end
end