aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAriadne Conill <ariadne@dereferenced.org>2019-07-21 03:52:06 +0000
committerAriadne Conill <ariadne@dereferenced.org>2019-07-21 03:52:06 +0000
commitbc6c5c513ae69e7a868c63f878a009dce8dd8c63 (patch)
tree0bcead53084520c46307a9c5d4137361a4e140d2
parentfe548f322e834c7c81678a460c54c71f1198021c (diff)
downloadpleroma-bc6c5c513ae69e7a868c63f878a009dce8dd8c63.tar.gz
router: ensure the AP sharedinbox path is registered first
-rw-r--r--lib/pleroma/web/router.ex12
1 files changed, 6 insertions, 6 deletions
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)