diff options
| author | sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-07-24 11:35:16 +0100 |
|---|---|---|
| committer | sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-07-24 11:35:16 +0100 |
| commit | f5d574f4ed9aa997a47d03f02adeb701d96f6789 (patch) | |
| tree | 9e8103753ae7e2278e57155119247a57ab44dd9c /lib | |
| parent | 48bd3be9cb9b378dfde78e769e2f00ed77129ab9 (diff) | |
| download | pleroma-f5d574f4ed9aa997a47d03f02adeb701d96f6789.tar.gz | |
check both item and parent domain blocks
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/streamer.ex | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/web/streamer.ex b/lib/pleroma/web/streamer.ex index e4259e869..9ee331030 100644 --- a/lib/pleroma/web/streamer.ex +++ b/lib/pleroma/web/streamer.ex @@ -239,8 +239,10 @@ defmodule Pleroma.Web.Streamer do 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), + %{host: item_host} <- URI.parse(item.actor), + %{host: parent_host} <- URI.parse(parent.data["actor"]), + 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) do true else |