diff options
| author | Karen Konou <konoukaren@gmail.com> | 2019-03-11 19:59:25 +0100 |
|---|---|---|
| committer | Karen Konou <konoukaren@gmail.com> | 2019-03-15 14:18:53 +0100 |
| commit | be465c762be19eda6725d4f323798caa23241715 (patch) | |
| tree | 43a6feadd7fcf5590e585c57d9274bc61a87cb69 /lib | |
| parent | 15b21d1983fad08e71f6fd7adffbcfd6f2d8cba1 (diff) | |
| download | pleroma-be465c762be19eda6725d4f323798caa23241715.tar.gz | |
formatting
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/streamer.ex | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/pleroma/web/streamer.ex b/lib/pleroma/web/streamer.ex index b87db941b..fa0fb2ac8 100644 --- a/lib/pleroma/web/streamer.ex +++ b/lib/pleroma/web/streamer.ex @@ -205,9 +205,8 @@ defmodule Pleroma.Web.Streamer do parent = Object.normalize(item.data["object"]) unless is_nil(parent) or item.actor in blocks or item.actor in mutes or - item.actor in reblog_mutes or - not ActivityPub.contain_activity(item, user) or parent.data["actor"] in blocks or - parent.data["actor"] in mutes do + item.actor in reblog_mutes or not ActivityPub.contain_activity(item, user) or + parent.data["actor"] in blocks or parent.data["actor"] in mutes do send(socket.transport_pid, {:text, represent_update(item, user)}) end else |