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

[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.

Browse source
This commit is contained in:
Ivan Tashkinov 2019-11-18 20:38:56 +03:00
commit aad6576130
15 changed files with 239 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -129,7 +129,9 @@ defmodule Pleroma.Web.Streamer.Worker do
end
defp should_send?(%User{} = user, %Activity{} = item) do
{:ok, [blocks, mutes]} = User.related_ap_ids(user, [:blocked_users, :muted_users])
related_ap_ids = User.related_ap_ids(user, [:block, :mute])
blocks = related_ap_ids[:block] || []
mutes = related_ap_ids[:mute] || []
reblog_mutes = user.muted_reblogs || []
recipient_blocks = MapSet.new(blocks ++ mutes)
recipients = MapSet.new(item.recipients)