From: Thibaut Girka <thib@sitedethib.com>
Date: Mon, 7 Sep 2020 07:21:38 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e5f934ddf0aa4ef9efbf45751bc00bebff768d99;p=mastodon.git

Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict caused because we have additional code to make sure pinned
  local-only toots don't get rendered on the ActivityPub endpoints.
  Ported upstream changes.
---

e5f934ddf0aa4ef9efbf45751bc00bebff768d99
diff --cc app/controllers/activitypub/collections_controller.rb
index e62fba748,c8b6dcc88..00f3d3cba
--- a/app/controllers/activitypub/collections_controller.rb
+++ b/app/controllers/activitypub/collections_controller.rb
@@@ -20,17 -20,9 +20,9 @@@ class ActivityPub::CollectionsControlle
    def set_items
      case params[:id]
      when 'featured'
-       @items = begin
-         # Because in public fetch mode we cache the response, there would be no
-         # benefit from performing the check below, since a blocked account or domain
-         # would likely be served the cache from the reverse proxy anyway
- 
-         if authorized_fetch_mode? && !signed_request_account.nil? && (@account.blocking?(signed_request_account) || (!signed_request_account.domain.nil? && @account.domain_blocking?(signed_request_account.domain)))
-           []
-         else
-           cache_collection(@account.pinned_statuses.not_local_only, Status)
-         end
-       end
 -      @items = for_signed_account { cache_collection(@account.pinned_statuses, Status) }
++      @items = for_signed_account { cache_collection(@account.pinned_statuses.not_local_only, Status) }
+     when 'tags'
+       @items = for_signed_account { @account.featured_tags }
      when 'devices'
        @items = @account.devices
      else