Merge remote-tracking branch 'tootsuite/main' into custom/quote

# Conflicts: # app/services/fetch_link_card_service.rb
2022-02-01 05:20:21 +00:00
parent e7eab1a6ae 54581d43e7
commit 71530857a5
760 changed files with 23758 additions and 10910 deletions
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -49,9 +49,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