aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/router.ex
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-08-06 08:13:05 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-08-06 08:22:16 +0000
commite49131bb7212ba5d1b79fc20c83223325a2e98c4 (patch)
tree86241b700b851d93337cc1f650f09bb93b3516ec /lib/pleroma/web/router.ex
parent2b628f23410edc310d10e692ae0502136e999fd3 (diff)
downloadpleroma-e49131bb7212ba5d1b79fc20c83223325a2e98c4.tar.gz
relay: move to /relay endpoint from / due to webapp issues
Diffstat (limited to 'lib/pleroma/web/router.ex')
-rw-r--r--lib/pleroma/web/router.ex9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 3cb996262..48c3fb9a5 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -283,6 +283,10 @@ defmodule Pleroma.Web.Router do
get("/externalprofile/show", TwitterAPI.Controller, :external_profile)
end
+ pipeline :ap_relay do
+ plug(:accepts, ["activity+json"])
+ end
+
pipeline :ostatus do
plug(:accepts, ["xml", "atom", "html", "activity+json"])
end
@@ -319,9 +323,8 @@ defmodule Pleroma.Web.Router do
end
if @federating do
- scope "/", Pleroma.Web.ActivityPub do
- # XXX: not really ostatus either
- pipe_through(:ostatus)
+ scope "/relay", Pleroma.Web.ActivityPub do
+ pipe_through(:ap_relay)
get("/", ActivityPubController, :relay)
end