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

[#1335] Reorganized users.mutes as relation to UserMute entity.

Browse source
This commit is contained in:
Ivan Tashkinov 2019-11-15 21:38:54 +03:00
commit c31ddce51e
16 changed files with 258 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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