diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-17 10:01:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-17 10:01:02 +0100 |
| commit | 430d4427916b44e6a7c16db1899dfef2eec140fc (patch) | |
| tree | e53417f50f9e4ab4b95bf0e9fbb18b0e00b0ce7e /app/controllers/api/v1 | |
| parent | a85912b0d6d2ee68aa35794fbb51c5358768c092 (diff) | |
| parent | 77dd4ab8f5d09b128db1e0227b2afcf73d8531e7 (diff) | |
Merge pull request #1661 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1')
| -rw-r--r-- | app/controllers/api/v1/accounts/statuses_controller.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb index 92ccb8061..2c027ea76 100644 --- a/app/controllers/api/v1/accounts/statuses_controller.rb +++ b/app/controllers/api/v1/accounts/statuses_controller.rb @@ -46,9 +46,7 @@ class Api::V1::Accounts::StatusesController < Api::BaseController end def pinned_scope - return Status.none if @account.blocking?(current_account) - - @account.pinned_statuses + @account.pinned_statuses.permitted_for(@account, current_account) end def no_replies_scope |