diff options
| author | lain <lain@soykaf.club> | 2021-01-07 11:09:18 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-01-07 11:09:18 +0000 |
| commit | cf0eb0c1c5c945c660295f51c99fe157b2b8229c (patch) | |
| tree | 9b9ad23ec0f83628db7f7878498e0382bec4cb1d /lib/pleroma/web/streamer.ex | |
| parent | 4d56aca9040f87708e38a050071aa9d3dc977c45 (diff) | |
| parent | d44850d7a5d1303c1c9d185fc5eb6642823b3ec4 (diff) | |
| download | pleroma-cf0eb0c1c5c945c660295f51c99fe157b2b8229c.tar.gz | |
Merge branch 'object-normalize-refactor' into 'develop'
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
Diffstat (limited to 'lib/pleroma/web/streamer.ex')
| -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 7d4a1304a..1fb8ac1c5 100644 --- a/lib/pleroma/web/streamer.ex +++ b/lib/pleroma/web/streamer.ex @@ -151,7 +151,7 @@ defmodule Pleroma.Web.Streamer do recipients = MapSet.new(item.recipients) domain_blocks = Pleroma.Web.ActivityPub.MRF.subdomains_regex(user.domain_blocks) - with parent <- Object.normalize(item) || item, + with parent <- Object.normalize(item, fetch: false) || item, true <- Enum.all?([blocked_ap_ids, muted_ap_ids], &(item.actor not in &1)), true <- item.data["type"] != "Announce" || item.actor not in reblog_muted_ap_ids, true <- |