diff options
| author | pluralcafe-docker <git@plural.cafe> | 2018-10-13 01:09:02 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2018-10-13 01:09:02 +0000 |
| commit | 7c96ee7815c216d6ac3b748d7dd6959376d3914e (patch) | |
| tree | fd36bade02afa1536198e7f3beafb208973b68c5 /app/controllers/api/v1/accounts | |
| parent | f9275cb762a311cbf298b3929552a153703c0726 (diff) | |
| parent | 70d346ea951ebfa002225759310d72882a435a5c (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/controllers/api/v1/accounts')
| -rw-r--r-- | app/controllers/api/v1/accounts/statuses_controller.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb index 06fa6c762..b68a8805f 100644 --- a/app/controllers/api/v1/accounts/statuses_controller.rb +++ b/app/controllers/api/v1/accounts/statuses_controller.rb @@ -28,10 +28,9 @@ class Api::V1::Accounts::StatusesController < Api::BaseController def account_statuses statuses = truthy_param?(:pinned) ? pinned_scope : permitted_account_statuses - statuses = statuses.paginate_by_max_id( + statuses = statuses.paginate_by_id( limit_param(DEFAULT_STATUSES_LIMIT), - params[:max_id], - params[:since_id] + params_slice(:max_id, :since_id, :min_id) ) statuses.merge!(only_media_scope) if truthy_param?(:only_media) @@ -82,7 +81,7 @@ class Api::V1::Accounts::StatusesController < Api::BaseController def prev_path unless @statuses.empty? - api_v1_account_statuses_url pagination_params(since_id: pagination_since_id) + api_v1_account_statuses_url pagination_params(min_id: pagination_since_id) end end |