From: Ariadne Conill <ariadne@dereferenced.org>
Date: Sun, 21 Jul 2019 03:52:06 +0000 (+0000)
Subject: router: ensure the AP sharedinbox path is registered first
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=bc6c5c513ae69e7a868c63f878a009dce8dd8c63;p=akkoma

router: ensure the AP sharedinbox path is registered first
---

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 518720d38..a33b5ddd7 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -663,6 +663,12 @@ defmodule Pleroma.Web.Router do
     end
   end
 
+  scope "/", Pleroma.Web.ActivityPub do
+    pipe_through(:activitypub)
+    post("/inbox", ActivityPubController, :inbox)
+    post("/users/:nickname/inbox", ActivityPubController, :inbox)
+  end
+
   scope "/relay", Pleroma.Web.ActivityPub do
     pipe_through(:ap_service_actor)
 
@@ -677,12 +683,6 @@ defmodule Pleroma.Web.Router do
     post("/inbox", ActivityPubController, :inbox)
   end
 
-  scope "/", Pleroma.Web.ActivityPub do
-    pipe_through(:activitypub)
-    post("/inbox", ActivityPubController, :inbox)
-    post("/users/:nickname/inbox", ActivityPubController, :inbox)
-  end
-
   scope "/.well-known", Pleroma.Web do
     pipe_through(:well_known)