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.

diff --cc app/controllers/activitypub/collections_controller.rb
index e62fba7487f0d8a434c1b90931c60d7e440e1b9e,c8b6dcc88d4fb94b6a2c29baa803f99fdc79dd33..00f3d3cba86a0c8192d6bfe7b74571189adf7a79
--- 1/app/controllers/activitypub/collections_controller.rb
--- 2/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

diff --cc app/lib/activitypub/adapter.rb
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc spec/lib/feed_manager_spec.rb
Simple merge