]> cat aescling's git repositories - mastodon.git/commitdiff
Fix error in REST API for an account's statuses (#11700)
authorEugen Rochko <eugen@zeonfederated.com>
Fri, 30 Aug 2019 00:49:44 +0000 (02:49 +0200)
committerGitHub <noreply@github.com>
Fri, 30 Aug 2019 00:49:44 +0000 (02:49 +0200)
app/controllers/api/v1/accounts/statuses_controller.rb

index 13cb4caf1203c03b018fa42bf152fbd3a8494b63..0787cd636f7731b22da847975e0e43664a96ef2a 100644 (file)
@@ -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