pleroma

commit: dd5865535eb16f535ff996eb3dec5e947a905268
parent: 8543e7f7608207a7b72987141e9d11263ad52a72
Author: kaniini <nenolod@gmail.com>
Date:   Sun,  3 Mar 2019 21:10:10 +0000

Merge branch 'muting' into 'develop'

Don't stream muted accounts

See merge request pleroma/pleroma!888
Diffstat:
M
lib/pleroma/web/streamer.ex
7
+++++--

1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/web/streamer.ex b/lib/pleroma/web/streamer.ex
@@ -197,10 +197,12 @@ defmodule Pleroma.Web.Streamer do
       if socket.assigns[:user] do
         user = User.get_cached_by_ap_id(socket.assigns[:user].ap_id)
         blocks = user.info.blocks || []
+        mutes = user.info.mutes || []
 
         parent = Object.normalize(item.data["object"])
 
-        unless is_nil(parent) or item.actor in blocks or parent.data["actor"] in blocks do
+        unless is_nil(parent) or item.actor in blocks or item.actor in mutes or
+                 parent.data["actor"] in blocks or parent.data["actor"] in mutes do
           send(socket.transport_pid, {:text, represent_update(item, user)})
         end
       else
@@ -224,8 +226,9 @@ defmodule Pleroma.Web.Streamer do
       if socket.assigns[:user] do
         user = User.get_cached_by_ap_id(socket.assigns[:user].ap_id)
         blocks = user.info.blocks || []
+        mutes = user.info.mutes || []
 
-        unless item.actor in blocks do
+        unless item.actor in blocks or item.actor in mutes do
           send(socket.transport_pid, {:text, represent_update(item, user)})
         end
       else