Browse Source

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

router: ensure the AP sharedinbox path is registered first

See merge request pleroma/pleroma!1458
tags/v1.1.4
kaniini 5 years ago
parent
commit
1689a11a80
1 changed files with 6 additions and 6 deletions
  1. +6
    -6
      lib/pleroma/web/router.ex

+ 6
- 6
lib/pleroma/web/router.ex View File

@@ -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)



Loading…
Cancel
Save