projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5a0c018
)
streamer: worker: actually use should_send? consistently
author
Ariadne Conill
<ariadne@dereferenced.org>
Fri, 4 Oct 2019 15:42:25 +0000
(15:42 +0000)
committer
Ariadne Conill
<ariadne@dereferenced.org>
Fri, 4 Oct 2019 15:42:25 +0000
(15:42 +0000)
lib/pleroma/web/streamer/worker.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/streamer/worker.ex
b/lib/pleroma/web/streamer/worker.ex
index 3d2c8f473d483f98219d9742a12d0126e663e281..0ea224874ed9ce430d840ac88e5a296f4f3e3774 100644
(file)
--- 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