aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAriadne Conill <ariadne@dereferenced.org>2019-10-04 15:42:25 +0000
committerAriadne Conill <ariadne@dereferenced.org>2019-10-04 16:06:20 +0000
commitabb967671a9791aac8627b4f9f909bf54b861a30 (patch)
tree04e353b0950682eb07d45ab658a84ccac1fc2ee4
parentd0e874c7f20fa696e7e378d10e6fcd145d71e643 (diff)
downloadpleroma-abb967671a9791aac8627b4f9f909bf54b861a30.tar.gz
streamer: worker: actually use should_send? consistently
-rw-r--r--lib/pleroma/web/streamer/worker.ex5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/pleroma/web/streamer/worker.ex b/lib/pleroma/web/streamer/worker.ex
index 3d2c8f473..0ea224874 100644
--- a/lib/pleroma/web/streamer/worker.ex
+++ b/lib/pleroma/web/streamer/worker.ex
@@ -201,11 +201,8 @@ defmodule Pleroma.Web.Streamer.Worker do
# Get the current user so we have up-to-date blocks etc.
if socket_user do
user = User.get_cached_by_ap_id(socket_user.ap_id)
- blocks = user.info.blocks || []
- mutes = user.info.mutes || []
- with true <- Enum.all?([blocks, mutes], &(item.actor not in &1)),
- true <- thread_containment(item, user) do
+ if should_send?(user, item) do
send(transport_pid, {:text, StreamerView.render("update.json", item, user)})
end
else