diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-30 08:51:38 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-30 08:51:38 +0300 |
| commit | 78c80a261a5450a248c24f6d7d39bc59aed1ff88 (patch) | |
| tree | 4266d2233e8e707f541945bfcfb18f9c7ebf80d6 /lib/pleroma/web | |
| parent | c181e555db4a90f770418af67b1073ec958adb4d (diff) | |
| parent | d23b3701d8f1341f3e4565d35ffa0c25b83af51d (diff) | |
| download | pleroma-78c80a261a5450a248c24f6d7d39bc59aed1ff88.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results
Diffstat (limited to 'lib/pleroma/web')
| -rw-r--r-- | lib/pleroma/web/streamer/streamer.ex | 2 |
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 |