hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix-streaming-reblog' into 'develop'

Browse source 
Streamer: Correctly handle reblog mutes

Closes #1129 and #1438

See merge request pleroma/pleroma!2156
This commit is contained in:
Haelwenn 2020-01-29 20:21:32 +00:00 • committed by rinpatch
commit 1e74bbc495
2 changed files with 66 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/streamer/worker.ex
View file

@ -137,8 +137,9 @@ defmodule Pleroma.Web.Streamer.Worker do
domain_blocks = Pleroma.Web.ActivityPub.MRF.subdomains_regex(user.info.domain_blocks)
with parent <- Object.normalize(item) || item,
true <- Enum.all?([blocks, mutes, reblog_mutes], &(item.actor not in &1)),
true <- Enum.all?([blocks, mutes], &(item.actor not in &1)),
true <- Enum.all?([blocks, mutes], &(parent.data["actor"] not in &1)),
true <- item.data["type"] != "Announce" || item.actor not in reblog_mutes,
true <- MapSet.disjoint?(recipients, recipient_blocks),
%{host: item_host} <- URI.parse(item.actor),
%{host: parent_host} <- URI.parse(parent.data["actor"]),