about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorabcang <abcang1015@gmail.com>2019-09-27 22:23:30 +0900
committerEugen Rochko <eugen@zeonfederated.com>2019-09-27 15:23:30 +0200
commit059945c97cb9a9f3cbddda729f499b44800bdc68 (patch)
tree5404932975e545aca10abfcc3f4a3cba03827d01 /app/controllers
parent860a77d45ee9d17117364868f0932b4fcbe07d3d (diff)
Improve status pin query (#11972)
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/activitypub/collections_controller.rb6
-rw-r--r--app/controllers/api/v1/accounts/statuses_controller.rb2
2 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/activitypub/collections_controller.rb b/app/controllers/activitypub/collections_controller.rb
index 989fee385..910fefb1c 100644
--- a/app/controllers/activitypub/collections_controller.rb
+++ b/app/controllers/activitypub/collections_controller.rb
@@ -33,9 +33,9 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController
   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::RecordNotFound
     end
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index 0787cd636..333db9618 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -57,6 +57,8 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
   end
 
   def pinned_scope
+    return Status.none if @account.blocking?(current_account)
+
     @account.pinned_statuses
   end