diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-11-03 17:09:57 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-11-03 17:09:57 +0000 |
| commit | 8dd7c099a77faea2ad5c0466121832ddabb09945 (patch) | |
| tree | 5149e9c86f0c78547c5f60d957ccd83d8474cf5b /lib | |
| parent | 74135e13188a573313a40f147fe76a9a31b909d4 (diff) | |
| parent | 4bf942583fdae27813f4af1f901c78eaff391b76 (diff) | |
| download | pleroma-8dd7c099a77faea2ad5c0466121832ddabb09945.tar.gz | |
Merge branch 'bugfix/streamer-follows' into 'develop'
streamer: use direct object for filter checks when there is no valid child object in an activity
Closes #1291
See merge request pleroma/pleroma!1931
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/streamer/worker.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/streamer/worker.ex b/lib/pleroma/web/streamer/worker.ex index c2ee9e1f5..33b24840d 100644 --- a/lib/pleroma/web/streamer/worker.ex +++ b/lib/pleroma/web/streamer/worker.ex @@ -136,7 +136,7 @@ defmodule Pleroma.Web.Streamer.Worker do recipients = MapSet.new(item.recipients) domain_blocks = Pleroma.Web.ActivityPub.MRF.subdomains_regex(user.domain_blocks) - with parent when not is_nil(parent) <- Object.normalize(item), + with parent <- Object.normalize(item) || item, true <- Enum.all?([blocks, mutes, reblog_mutes], &(item.actor not in &1)), true <- Enum.all?([blocks, mutes], &(parent.data["actor"] not in &1)), true <- MapSet.disjoint?(recipients, recipient_blocks), |