From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Tue, 17 Sep 2019 19:53:26 +0000 (+0300)
Subject: [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=01c1078015c1ddbaa195125034489a14233df206;p=akkoma

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

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

01c1078015c1ddbaa195125034489a14233df206
diff --cc lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 4dc01a85b,01b34fb1d..5ea749141
--- a/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])