Merge branch 'recipients-experiments' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Fri, 12 Jun 2020 16:57:13 +0000 (16:57 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Fri, 12 Jun 2020 16:57:13 +0000 (16:57 +0000)
ActivityPub: Don't show announces of your own objects in timeline.

See merge request pleroma/pleroma!2637

1  2 
lib/pleroma/web/activity_pub/activity_pub.ex
test/web/activity_pub/activity_pub_test.exs

index a5f8ba40a0efab5366c16a3ffd482e3bb57acbc8,4182275bcdfe62f424c86ae3b7b6cb6a6f911233..e7d0a9caa1b68fbb1343bd36e750d7a03746309e
@@@ -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