aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-08-06 08:35:56 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-08-06 08:35:56 +0000
commit5202d4ce107d00866e6cb284b4c2a2614154a489 (patch)
tree87cfe9cf10f48e92566eb7acba3214eb7fbf6a86
parent0ca9b9ff964f7a64a2225056991068320e085d62 (diff)
downloadpleroma-5202d4ce107d00866e6cb284b4c2a2614154a489.tar.gz
relay: do not relay in test mode
-rw-r--r--lib/pleroma/web/federator/federator.ex6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index 94e3979be..078f3ec11 100644
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -71,8 +71,10 @@ defmodule Pleroma.Web.Federator do
Logger.info(fn -> "Sending #{activity.data["id"]} out via Salmon" end)
Pleroma.Web.Salmon.publish(actor, activity)
- Logger.info(fn -> "Relaying #{activity.data["id"]} out" end)
- Pleroma.Web.ActivityPub.Relay.publish(activity)
+ if Mix.env() != :test do
+ Logger.info(fn -> "Relaying #{activity.data["id"]} out" end)
+ Pleroma.Web.ActivityPub.Relay.publish(activity)
+ end
end
Logger.info(fn -> "Sending #{activity.data["id"]} out via AP" end)