diff options
author | pluralcafe-docker <git@plural.cafe> | 2019-01-04 21:19:55 +0000 |
---|---|---|
committer | pluralcafe-docker <git@plural.cafe> | 2019-01-04 21:19:55 +0000 |
commit | 74134e490c49d8a7d88cc69720e22cd88cee9233 (patch) | |
tree | bd7fc8d41f7887037401ff86c81bc93d5fb00d01 /app/controllers/api/v1/accounts | |
parent | 797a8429a0deb511e6d6092edad39f856231534e (diff) | |
parent | 0acd51acdc1e670bf57f58671cb8e30743782c63 (diff) |
Merge branch 'glitch'
Diffstat (limited to 'app/controllers/api/v1/accounts')
-rw-r--r-- | app/controllers/api/v1/accounts/statuses_controller.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb index d3f1197f8..6c2a5c141 100644 --- a/app/controllers/api/v1/accounts/statuses_controller.rb +++ b/app/controllers/api/v1/accounts/statuses_controller.rb @@ -28,13 +28,11 @@ 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 = 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 end @@ -65,6 +63,10 @@ class Api::V1::Accounts::StatusesController < Api::BaseController Status.without_replies end + def no_reblogs_scope + Status.without_reblogs + end + def pagination_params(core_params) params.slice(:limit, :only_media, :exclude_replies).permit(:limit, :only_media, :exclude_replies).merge(core_params) end |