aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-06-07 23:51:03 +0300
committerrinpatch <rinpatch@sdf.org>2020-06-08 00:58:31 +0300
commitf10b40828fd5f1e4fc7c4ffa9deb543d6a18eb17 (patch)
tree8e491fad3cbabba5981d1ae0e3393f7c1ab36104
parent9396b2f8cf0fa26f6fb5e372112b394b74ae8a4e (diff)
downloadpleroma-f10b40828fd5f1e4fc7c4ffa9deb543d6a18eb17.tar.gz
[stable rewrite]: fix streamer streaming out announces from a muted thread
Use parent object instead of activity because context is null of Announce activity from Mastodon.
-rw-r--r--lib/pleroma/web/streamer/worker.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/streamer/worker.ex b/lib/pleroma/web/streamer/worker.ex
index abfed21c8..c669e917d 100644
--- a/lib/pleroma/web/streamer/worker.ex
+++ b/lib/pleroma/web/streamer/worker.ex
@@ -147,7 +147,7 @@ defmodule Pleroma.Web.Streamer.Worker do
false <- Pleroma.Web.ActivityPub.MRF.subdomain_match?(domain_blocks, item_host),
false <- Pleroma.Web.ActivityPub.MRF.subdomain_match?(domain_blocks, parent_host),
true <- thread_containment(item, user),
- false <- CommonAPI.thread_muted?(user, item) do
+ false <- CommonAPI.thread_muted?(user, parent) do
true
else
_ -> false