diff options
| author | lain <lain@soykaf.club> | 2020-01-28 16:40:44 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-01-28 16:40:44 +0100 |
| commit | 77f24525ca6636f5fb0b3864c346be683566efd3 (patch) | |
| tree | 58151a016ad7793f153e7b1836ecae25d4a24317 /lib | |
| parent | d9cb8acd3e43f2b3502f2b08ce469483c67789f6 (diff) | |
| download | pleroma-77f24525ca6636f5fb0b3864c346be683566efd3.tar.gz | |
Streamer: Correctly handle reblog mutes
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 a1b445f2f..5392c1ec3 100644 --- a/lib/pleroma/web/streamer/worker.ex +++ b/lib/pleroma/web/streamer/worker.ex @@ -138,7 +138,8 @@ defmodule Pleroma.Web.Streamer.Worker do with parent <- Object.normalize(item) || item, true <- - Enum.all?([blocked_ap_ids, muted_ap_ids, reblog_muted_ap_ids], &(item.actor not in &1)), + Enum.all?([blocked_ap_ids, muted_ap_ids], &(item.actor not in &1)), + true <- item.data["type"] != "Announce" || item.actor not in reblog_muted_ap_ids, true <- Enum.all?([blocked_ap_ids, muted_ap_ids], &(parent.data["actor"] not in &1)), true <- MapSet.disjoint?(recipients, recipient_blocks), %{host: item_host} <- URI.parse(item.actor), |