From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Fri, 12 Jun 2020 16:57:13 +0000 (+0000)
Subject: Merge branch 'recipients-experiments' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=4115701f71a68135324c5ac04eac2e8fd7089280;p=akkoma

Merge branch 'recipients-experiments' into 'develop'

ActivityPub: Don't show announces of your own objects in timeline.

See merge request pleroma/pleroma!2637
---

4115701f71a68135324c5ac04eac2e8fd7089280
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
index a5f8ba40a,4182275bc..e7d0a9caa
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@@ -1144,9 -1114,9 +1145,10 @@@ defmodule Pleroma.Web.ActivityPub.Activ
      |> restrict_pinned(opts)
      |> restrict_muted_reblogs(restrict_muted_reblogs_opts)
      |> restrict_instance(opts)
+     |> restrict_announce_object_actor(opts)
      |> Activity.restrict_deactivated_users()
      |> exclude_poll_votes(opts)
 +    |> exclude_chat_messages(opts)
      |> exclude_invisible_actors(opts)
      |> exclude_visibility(opts)
    end