From: Karen Konou <konoukaren@gmail.com>
Date: Sat, 9 Mar 2019 15:31:53 +0000 (+0100)
Subject: Fix elixir 1.8 vs 1.7 format conflict
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=aa71139e4a9913cc5baf3f5f567bcef4ae59a8c0;p=akkoma

Fix elixir 1.8 vs 1.7 format conflict
---

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