diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-01-29 20:21:32 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-01-29 20:21:32 +0000 |
| commit | 946de2299cccebac6718e3a132397ff5c06c67ee (patch) | |
| tree | a23419a5bc866fab716c8e32c2c52a70620f6745 /lib | |
| parent | 505234d9759555a17a6dd436bb31307967ab660b (diff) | |
| parent | 7a60cd91ff6d28e6261a49e43b6fd048e755cf46 (diff) | |
| download | pleroma-946de2299cccebac6718e3a132397ff5c06c67ee.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 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), |