From: lain <lain@soykaf.club>
Date: Mon, 19 Feb 2018 10:14:46 +0000 (+0100)
Subject: Salmons can't carry private information.
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=ffa2f57c36af7f8a2f5a09fef219376eb18888ef;p=akkoma

Salmons can't carry private information.
---

diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index e65916c47..a13126048 100644
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -46,10 +46,10 @@ defmodule Pleroma.Web.Federator do
       if ActivityPub.is_public?(activity) do
         Logger.info(fn -> "Sending #{activity.data["id"]} out via websub" end)
         Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity)
-      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 salmon" end)
+        Pleroma.Web.Salmon.publish(actor, activity)
+      end
 
       Logger.info(fn -> "Sending #{activity.data["id"]} out via AP" end)
       Pleroma.Web.ActivityPub.ActivityPub.publish(actor, activity)