X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frouter.ex;h=a8577c30b32d20750d5c98c6aba43ea4d56e5cd6;hb=2652d9e4edf34531057d472c6e23812873019fd5;hp=6081016d68de1f4da0e7d05d809125b18f4a6852;hpb=2a298d70f9938d1b6d5af04d8b8863fdd3299f46;p=akkoma

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