Merge pull request mastodon#1300 from pixiv/improve_status_pin_query

Improve status pin query

Author: abcang

app/controllers/activitypub/collections_controller.rb

@@ -38,9 +38,9 @@ def set_size
   def scope_for_collection
     case params[:id]
     when 'featured'
-      @account.statuses.permitted_for(@account, signed_request_account).tap do |scope|
-        scope.merge!(@account.pinned_statuses)
-      end
+      return Status.none if @account.blocking?(signed_request_account)
+
+      @account.pinned_statuses
     else
       raise ActiveRecord::NotFound
     end

app/controllers/api/v1/accounts/statuses_controller.rb

@@ -69,6 +69,8 @@ def account_media_status_ids
   end
 
   def pinned_scope
+    return Status.none if @account.blocking?(current_account)
+
     @account.pinned_statuses
   end