diff options
author | Eugen <eugen@zeonfederated.com> | 2017-01-24 21:56:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-24 21:56:06 +0100 |
commit | f8da0dd4907490f57cb14b052b767c66c95c4db3 (patch) | |
tree | 871a1b902872d22d0c28e96dbc733533d33ac397 /app/controllers/api/v1/blocks_controller.rb | |
parent | bf0f6eb62d0f5bd1f0d8e4e2a6e9e8fd3b297b6c (diff) | |
parent | 8a880a3d464daf486a10d85b8ee49305aa6b1e5b (diff) |
Merge branch 'master' into master
Diffstat (limited to 'app/controllers/api/v1/blocks_controller.rb')
-rw-r--r-- | app/controllers/api/v1/blocks_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb index 8629242ab..b9816e052 100644 --- a/app/controllers/api/v1/blocks_controller.rb +++ b/app/controllers/api/v1/blocks_controller.rb @@ -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) |