From: lain <lain@soykaf.club>
Date: Sun, 18 Feb 2018 15:15:04 +0000 (+0100)
Subject: Salmon is ok!
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=8567feed474c2bebcc02c7ab177e18d35c26aec6;p=akkoma

Salmon is ok!
---

diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index 042c202be..e65916c47 100644
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -44,14 +44,14 @@ defmodule Pleroma.Web.Federator do
     with actor when not is_nil(actor) <- User.get_cached_by_ap_id(activity.data["actor"]) do
       {:ok, actor} = WebFinger.ensure_keys_present(actor)
       if ActivityPub.is_public?(activity) do
-        Logger.debug(fn -> "Sending #{activity.data["id"]} out via salmon" end)
-        Pleroma.Web.Salmon.publish(actor, activity)
-
-        Logger.debug(fn -> "Sending #{activity.data["id"]} out via websub" end)
+        Logger.info(fn -> "Sending #{activity.data["id"]} out via websub" end)
         Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity)
       end
 
-      Logger.debug(fn -> "Sending #{activity.data["id"]} out via AP" end)
+      Logger.info(fn -> "Sending #{activity.data["id"]} out via salmon" end)
+      Pleroma.Web.Salmon.publish(actor, activity)
+
+      Logger.info(fn -> "Sending #{activity.data["id"]} out via AP" end)
       Pleroma.Web.ActivityPub.ActivityPub.publish(actor, activity)
     end
   end