[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon...

# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub_controller.ex

diff --cc lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 4dc01a85bee8682629bd0c10a45cc1788bcb206d,01b34fb1d475df01dc3d2ce5f87f762e359360e8..5ea749141f60664428efdfe2ee1fea4a84f30548
--- 1/lib/pleroma/web/activity_pub/activity_pub_controller.ex
--- 2/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@@ -23,13 -24,12 +24,17 @@@ defmodule Pleroma.Web.ActivityPub.Activ
  
    action_fallback(:errors)
  
-   plug(Pleroma.Plugs.Cache, [query_params: false] when action in [:activity, :object])
+   plug(
+     Pleroma.Plugs.Cache,
+     [query_params: false, tracking_fun: &__MODULE__.track_object_fetch/2]
+     when action in [:activity, :object]
+   )
  
 +  plug(
 +    Pleroma.Plugs.OAuthScopesPlug,
 +    %{scopes: ["read:accounts"]} when action in [:followers, :following]
 +  )
 +
    plug(Pleroma.Web.FederatingPlug when action in [:inbox, :relay])
    plug(:set_requester_reachable when action in [:inbox])
    plug(:relay_active? when action in [:relay])

diff --cc lib/pleroma/web/admin_api/admin_api_controller.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
Simple merge

diff --cc lib/pleroma/web/twitter_api/controllers/util_controller.ex
Simple merge

diff --cc test/web/twitter_api/util_controller_test.exs
Simple merge