diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-02-09 12:15:52 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-02-09 12:15:52 +0000 |
| commit | 42f76306e7fe69fc51be00285a4fef8569f54989 (patch) | |
| tree | 416bc4048224a5fc9312c4c5834ea5207497a6b7 /lib/pleroma/web/streamer/worker.ex | |
| parent | 1629fa2412b877f69c5cf0df09782227827b272b (diff) | |
| parent | 06fec99e1d8d4be6cb71551089f2d95e936d6990 (diff) | |
| download | pleroma-1.1.9.tar.gz | |
Merge branch 'release/1.1.9' into 'stable'v1.1.9
Release/1.1.9
See merge request pleroma/pleroma!2189
Diffstat (limited to 'lib/pleroma/web/streamer/worker.ex')
| -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"]), |