diff options
| author | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-07-24 11:09:06 +0100 |
|---|---|---|
| committer | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-07-24 11:09:06 +0100 |
| commit | 4af4f6166bd04b5a302856034fdda94dd61045ed (patch) | |
| tree | 99d2513418c39e33ea6b13574c51f42a07b48e5f /lib | |
| parent | 0be548b90aafda0b524e2ad85e7072961c336023 (diff) | |
| download | pleroma-4af4f6166bd04b5a302856034fdda94dd61045ed.tar.gz | |
honour domain blocks on streaming notifications
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/streamer.ex | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pleroma/web/streamer.ex b/lib/pleroma/web/streamer.ex index 86e2dc4dd..d233d2a41 100644 --- a/lib/pleroma/web/streamer.ex +++ b/lib/pleroma/web/streamer.ex @@ -234,10 +234,13 @@ defmodule Pleroma.Web.Streamer do blocks = user.info.blocks || [] 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)), + false <- Pleroma.Web.ActivityPub.MRF.subdomain_match?(domain_blocks, host), true <- thread_containment(item, user) do true else |