diff options
| author | William Pearson <uiri00@gmail.com> | 2019-01-20 04:28:34 +0000 |
|---|---|---|
| committer | William Pearson <uiri00@gmail.com> | 2019-03-03 20:54:53 +0000 |
| commit | 818a7894da13c10961a411bd2876f74e74494495 (patch) | |
| tree | 894e971aa3582e7140f46e5f97d9e00eed52f3ad /lib | |
| parent | f38c316e6edbc88f1808a0c39488231ce17e4f35 (diff) | |
| download | pleroma-818a7894da13c10961a411bd2876f74e74494495.tar.gz | |
Don't stream muted accounts
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/streamer.ex | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/pleroma/web/streamer.ex b/lib/pleroma/web/streamer.ex index 477481bb9..27e8020f4 100644 --- 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 |