diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-08-30 02:49:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-30 02:49:44 +0200 |
| commit | 70ae77895f3743b04a11ed5860db4b94c052b32c (patch) | |
| tree | 73331b16ff1e50a698fe57e057b69f13961be546 /app/controllers/api/v1/accounts/statuses_controller.rb | |
| parent | 60e684af5f9bfb73cd3b7cfe1cf5678c6d8f69c8 (diff) | |
Fix error in REST API for an account's statuses (#11700)
Diffstat (limited to 'app/controllers/api/v1/accounts/statuses_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/accounts/statuses_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb index 13cb4caf1..0787cd636 100644 --- a/app/controllers/api/v1/accounts/statuses_controller.rb +++ b/app/controllers/api/v1/accounts/statuses_controller.rb @@ -29,14 +29,13 @@ class Api::V1::Accounts::StatusesController < Api::BaseController def account_statuses statuses = truthy_param?(:pinned) ? pinned_scope : permitted_account_statuses - statuses = statuses.paginate_by_id(limit_param(DEFAULT_STATUSES_LIMIT), params_slice(:max_id, :since_id, :min_id)) statuses.merge!(only_media_scope) if truthy_param?(:only_media) statuses.merge!(no_replies_scope) if truthy_param?(:exclude_replies) statuses.merge!(no_reblogs_scope) if truthy_param?(:exclude_reblogs) statuses.merge!(hashtag_scope) if params[:tagged].present? - statuses + statuses.paginate_by_id(limit_param(DEFAULT_STATUSES_LIMIT), params_slice(:max_id, :since_id, :min_id)) end def permitted_account_statuses |