Unfloyded/Legamunt
0
0
Fork 0
Code Activity

API now respects ?limit param as long as it's within 2x default limit

Browse source
This commit is contained in:
Eugen Rochko 2017-01-24 04:22:10 +01:00
parent d9022884c6
commit 1f5792c834
7 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,13 +7,13 @@ class Api::V1::BlocksController < ApiController
respond_to :json
def index
results = Block.where(account: current_account).paginate_by_max_id(DEFAULT_ACCOUNTS_LIMIT, params[:max_id], params[:since_id])
results = Block.where(account: current_account).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
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] }
set_account_counters_maps(@accounts)
next_path = api_v1_blocks_url(max_id: results.last.id) if results.size == DEFAULT_ACCOUNTS_LIMIT
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?
set_pagination_headers(next_path, prev_path)