fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-19 20:57:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve status pin query (#11972)

Browse source
This commit is contained in:
abcang 2019-09-27 22:23:30 +09:00 committed by Eugen Rochko
parent 860a77d45e
commit 059945c97c
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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