pleroma

commit: 1689a11a80be21456788d1f41c4ef231b0a0e94e
parent: fe548f322e834c7c81678a460c54c71f1198021c
Author: kaniini <ariadne@dereferenced.org>
Date:   Sun, 21 Jul 2019 04:18:12 +0000

Merge branch 'bugfix/sharedinbox-path-first' into 'develop'

router: ensure the AP sharedinbox path is registered first

See merge request pleroma/pleroma!1458
Diffstat:
M
lib/pleroma/web/router.ex
12
++++++------

1 file changed, 6 insertions(+), 6 deletions(-)
diff --git 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)