diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-01-29 20:21:32 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-02-09 01:02:06 +0300 |
| commit | 1e74bbc4950768fa9af027034c46380487b336c0 (patch) | |
| tree | 396bcd489c5cc31f70634ffbb4babed2e5509dbc /lib | |
| parent | 40727b28a74f64cfe7b3feb5d54fe71199194a7e (diff) | |
| download | pleroma-1e74bbc4950768fa9af027034c46380487b336c0.tar.gz | |
Merge branch 'fix-streaming-reblog' into 'develop'
Streamer: Correctly handle reblog mutes
Closes #1129 and #1438
See merge request pleroma/pleroma!2156
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/streamer/worker.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/streamer/worker.ex b/lib/pleroma/web/streamer/worker.ex index da7a5a6f2..1e7da4852 100644 --- a/lib/pleroma/web/streamer/worker.ex +++ b/lib/pleroma/web/streamer/worker.ex @@ -137,8 +137,9 @@ defmodule Pleroma.Web.Streamer.Worker do domain_blocks = Pleroma.Web.ActivityPub.MRF.subdomains_regex(user.info.domain_blocks) with parent <- Object.normalize(item) || item, - true <- Enum.all?([blocks, mutes, reblog_mutes], &(item.actor not in &1)), + true <- Enum.all?([blocks, mutes], &(item.actor not in &1)), true <- Enum.all?([blocks, mutes], &(parent.data["actor"] not in &1)), + true <- item.data["type"] != "Announce" || item.actor not in reblog_mutes, true <- MapSet.disjoint?(recipients, recipient_blocks), %{host: item_host} <- URI.parse(item.actor), %{host: parent_host} <- URI.parse(parent.data["actor"]), |