[stable rewrite]: fix streamer streaming out announces from a muted thread
authorrinpatch <rinpatch@sdf.org>
Sun, 7 Jun 2020 20:51:03 +0000 (23:51 +0300)
committerrinpatch <rinpatch@sdf.org>
Sun, 7 Jun 2020 21:58:31 +0000 (00:58 +0300)
Use parent object instead of activity because context is null of Announce activity from Mastodon.

lib/pleroma/web/streamer/worker.ex

index abfed21c8aa51eee4458848fcba33fdf4cd8e177..c669e917d253ace9dab3ba104857e9e915403fe3 100644 (file)
@@ -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