From: William Pitcock <nenolod@dereferenced.org>
Date: Mon, 6 Aug 2018 08:20:21 +0000 (+0000)
Subject: relay: reintroduce @allow_relay
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=5abf9ad6025eb7464deee7fb5a77e651272f44a1;p=akkoma

relay: reintroduce @allow_relay
---

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 48c3fb9a5..eb9860864 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -323,9 +323,11 @@ defmodule Pleroma.Web.Router do
   end
 
   if @federating do
-    scope "/relay", Pleroma.Web.ActivityPub do
-      pipe_through(:ap_relay)
-      get("/", ActivityPubController, :relay)
+    if @allow_relay do
+      scope "/relay", Pleroma.Web.ActivityPub do
+        pipe_through(:ap_relay)
+        get("/", ActivityPubController, :relay)
+      end
     end
 
     scope "/", Pleroma.Web.ActivityPub do