alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

router: ensure the AP sharedinbox path is registered first

See merge request pleroma/pleroma!1458
This commit is contained in:
kaniini 2019-07-21 04:18:12 +00:00
parent fe548f322e bc6c5c513a
commit 1689a11a80
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/pleroma/web/router.ex
View File

@ -663,6 +663,12 @@ defmodule Pleroma.Web.Router do
end end
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 scope "/relay", Pleroma.Web.ActivityPub do
pipe_through(:ap_service_actor) pipe_through(:ap_service_actor)
@ -677,12 +683,6 @@ defmodule Pleroma.Web.Router do
post("/inbox", ActivityPubController, :inbox) post("/inbox", ActivityPubController, :inbox)
end 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 scope "/.well-known", Pleroma.Web do
pipe_through(:well_known) pipe_through(:well_known)