From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 4 Oct 2019 15:42:25 +0000 (+0000)
Subject: streamer: worker: actually use should_send? consistently
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=abb967671a9791aac8627b4f9f909bf54b861a30;p=akkoma

streamer: worker: actually use should_send? consistently
---

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