aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/router.ex
diff options
context:
space:
mode:
Diffstat (limited to 'lib/pleroma/web/router.ex')
-rw-r--r--lib/pleroma/web/router.ex13
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 6081016d6..a8577c30b 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -28,10 +28,6 @@ defmodule Pleroma.Web.Router do
plug :accepts, ["json", "xml"]
end
- pipeline :masto_config do
- plug :accepts, ["json"]
- end
-
pipeline :oauth do
plug :accepts, ["html", "json"]
end
@@ -42,11 +38,10 @@ defmodule Pleroma.Web.Router do
post "/token", OAuthController, :token_exchange
end
- scope "/api/v1", Pleroma.Web do
- pipe_through :masto_config
- # TODO: Move this
- get "/instance", TwitterAPI.UtilController, :masto_instance
- post "/apps", MastodonAPI.MastodonAPIController, :create_app
+ scope "/api/v1", Pleroma.Web.MastodonAPI do
+ pipe_through :api
+ get "/instance", MastodonAPO.Controller, :masto_instance
+ post "/apps", MastodonAPIController, :create_app
end
scope "/api/v1", Pleroma.Web.MastodonAPI do