aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-29 15:42:43 +0000
committerlain <lain@soykaf.club>2020-05-29 15:42:43 +0000
commit219d2b3146ee72abc0bb8bd163c0ddcd986988fc (patch)
treefde1d9d9d2144c795fae5de072e9a7de3c48d4fe /lib
parent81db758e8efe31455d8778134c3285219a32a832 (diff)
parent9ca978494fee4be96ec9b6b93e74afe08dd05fcc (diff)
downloadpleroma-219d2b3146ee72abc0bb8bd163c0ddcd986988fc.tar.gz
Merge branch 'fix-streaming' into 'develop'
Fix argument error in streamer See merge request pleroma/pleroma!2609
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/streamer/streamer.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/streamer/streamer.ex b/lib/pleroma/web/streamer/streamer.ex
index 49a400df7..0cf41189b 100644
--- a/lib/pleroma/web/streamer/streamer.ex
+++ b/lib/pleroma/web/streamer/streamer.ex
@@ -136,7 +136,7 @@ defmodule Pleroma.Web.Streamer 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
false
else
_ -> true