Browse Source

Improve status pin query (#11972)

pull/4/head
abcang 4 years ago
committed by Eugen Rochko
parent
commit
059945c97c
2 changed files with 5 additions and 3 deletions
  1. +3
    -3
      app/controllers/activitypub/collections_controller.rb
  2. +2
    -0
      app/controllers/api/v1/accounts/statuses_controller.rb

+ 3
- 3
app/controllers/activitypub/collections_controller.rb View File

@ -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

+ 2
- 0
app/controllers/api/v1/accounts/statuses_controller.rb View File

@ -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

Loading…
Cancel
Save