diff options
| author | lain <lain@soykaf.club> | 2019-11-05 12:02:45 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-11-05 12:02:45 +0000 |
| commit | 21716aa594064d5f4f4a91a8b40a679775709e1d (patch) | |
| tree | 660f575029e4eaf8cf5577049ab67ed1902a04a2 /lib | |
| parent | a43b899e94c499a9b5cb1a072fe4b96f0f02696f (diff) | |
| parent | b7de4ad0828078ed5aa03d243319855ce3eb95f8 (diff) | |
| download | pleroma-21716aa594064d5f4f4a91a8b40a679775709e1d.tar.gz | |
Merge branch 'release/1.1.4' into 'stable'v1.1.4
Release/1.1.4 - user.info fix plus NOT NULL for user.info
See merge request pleroma/pleroma!1927
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 0ea224874..da7a5a6f2 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.info.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), |