diff options
| author | Reverite <github@reverite.sh> | 2019-09-30 16:38:09 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-09-30 16:38:09 -0700 |
| commit | 01001ba118d7adcd4966c893cf95db32fe76c273 (patch) | |
| tree | fc8b580c8f0a3c1e14a8ca20e3bea5bd7acb4ff1 /app/controllers/activitypub/collections_controller.rb | |
| parent | 1e75b3d874973dd71ea74b158ebeb501d9ac68a3 (diff) | |
| parent | 65db9df011a3e13efa79f4e56343aa69bdad7716 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/activitypub/collections_controller.rb')
| -rw-r--r-- | app/controllers/activitypub/collections_controller.rb | 6 |
1 files changed, 3 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 |