diff options
| author | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-07-24 11:11:33 +0100 |
|---|---|---|
| committer | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-07-24 11:11:33 +0100 |
| commit | 48bd3be9cb9b378dfde78e769e2f00ed77129ab9 (patch) | |
| tree | f9c427860121a98350371bd9f2afd0c0de6bdf4f | |
| parent | 4af4f6166bd04b5a302856034fdda94dd61045ed (diff) | |
| download | pleroma-48bd3be9cb9b378dfde78e769e2f00ed77129ab9.tar.gz | |
move domain block check to with block
| -rw-r--r-- | lib/pleroma/web/streamer.ex | 2 |
1 files changed, 1 insertions, 1 deletions
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 |