diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-11-15 21:38:54 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-11-15 21:38:54 +0300 |
commit | c31ddce51ea18f052c1c3ad30a221b77c7a94e71 (patch) | |
tree | 12a4d97437762e252bd4b2ad36268cbd89d99ccf /lib/pleroma/web/streamer | |
parent | 5cf2c7422b006d477498af8d7618a0d6f7659290 (diff) | |
download | pleroma-c31ddce51ea18f052c1c3ad30a221b77c7a94e71.tar.gz |
[#1335] Reorganized `users.mutes` as relation to UserMute entity.
Diffstat (limited to 'lib/pleroma/web/streamer')
-rw-r--r-- | lib/pleroma/web/streamer/worker.ex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/web/streamer/worker.ex b/lib/pleroma/web/streamer/worker.ex index 672dd52ee..45f9c7c53 100644 --- a/lib/pleroma/web/streamer/worker.ex +++ b/lib/pleroma/web/streamer/worker.ex @@ -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) |