diff options
| author | Karen Konou <konoukaren@gmail.com> | 2019-03-09 16:31:53 +0100 |
|---|---|---|
| committer | Karen Konou <konoukaren@gmail.com> | 2019-03-15 14:18:53 +0100 |
| commit | aa71139e4a9913cc5baf3f5f567bcef4ae59a8c0 (patch) | |
| tree | 5a2f334a176dcffc1f5905f979e5513f94d17384 | |
| parent | fe4c1d26fcbe5ce260bde94e75f617ae0fcb338f (diff) | |
| download | pleroma-aa71139e4a9913cc5baf3f5f567bcef4ae59a8c0.tar.gz | |
Fix elixir 1.8 vs 1.7 format conflict
| -rw-r--r-- | lib/pleroma/web/streamer.ex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/web/streamer.ex b/lib/pleroma/web/streamer.ex index bd91e1f50..a04ee1b6e 100644 --- a/lib/pleroma/web/streamer.ex +++ b/lib/pleroma/web/streamer.ex @@ -204,8 +204,7 @@ 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 - not ActivityPub.contain_activity(item, user) or - parent.data["actor"] in blocks 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 |