From: Sadposter <hannah+pleroma@coffee-and-dreams.uk>
Date: Wed, 24 Jul 2019 10:11:33 +0000 (+0100)
Subject: move domain block check to with block
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=48bd3be9cb9b378dfde78e769e2f00ed77129ab9;p=akkoma

move domain block check to with block
---

diff --git a/lib/pleroma/web/streamer.ex b/lib/pleroma/web/streamer.ex
index d233d2a41..e4259e869 100644
--- a/lib/pleroma/web/streamer.ex
+++ b/lib/pleroma/web/streamer.ex
@@ -235,11 +235,11 @@ defmodule Pleroma.Web.Streamer do
     mutes = user.info.mutes || []
     reblog_mutes = user.info.muted_reblogs || []
     domain_blocks = Pleroma.Web.ActivityPub.MRF.subdomains_regex(user.info.domain_blocks)
-    %{host: host} = URI.parse(parent.data["actor"])
 
     with parent when not is_nil(parent) <- Object.normalize(item),
          true <- Enum.all?([blocks, mutes, reblog_mutes], &(item.actor not in &1)),
          true <- Enum.all?([blocks, mutes], &(parent.data["actor"] not in &1)),
+         %{host: host} <- URI.parse(parent.data["actor"]),
          false <- Pleroma.Web.ActivityPub.MRF.subdomain_match?(domain_blocks, host),
          true <- thread_containment(item, user) do
       true