X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frouter.ex;h=c20ec3e801904e656693a26e70def54e35c52837;hb=632e1f7943b8736d2f4084bfcb347c448eac7252;hp=84a39d81728f085c13ef6dcc2f34fba470a59651;hpb=94a394e3a8949dde95e7e6cc65b46374dd9412a2;p=akkoma

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 84a39d817..c20ec3e80 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -23,11 +23,31 @@ defmodule Pleroma.Web.Router do
     plug :accepts, ["xml", "xrd+xml"]
   end
 
+  pipeline :config do
+    plug :accepts, ["json", "xml"]
+  end
+
+  pipeline :masto_config do
+    plug :accepts, ["json"]
+  end
+
+  scope "/api/v1", Pleroma.Web do
+    pipe_through :masto_config
+    # TODO: Move this
+    get "/instance", TwitterAPI.UtilController, :masto_instance
+  end
+
   scope "/api", Pleroma.Web do
-    pipe_through :api
+    pipe_through :config
 
     get "/help/test", TwitterAPI.UtilController, :help_test
+    post "/help/test", TwitterAPI.UtilController, :help_test
     get "/statusnet/config", TwitterAPI.UtilController, :config
+    get "/statusnet/version", TwitterAPI.UtilController, :version
+  end
+
+  scope "/api", Pleroma.Web do
+    pipe_through :api
 
     get "/statuses/public_timeline", TwitterAPI.Controller, :public_timeline
     get "/statuses/public_and_external_timeline", TwitterAPI.Controller, :public_and_external_timeline
@@ -49,6 +69,10 @@ defmodule Pleroma.Web.Router do
     get "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
     post "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
 
+    post "/account/update_profile", TwitterAPI.Controller, :update_profile
+    post "/account/update_profile_banner", TwitterAPI.Controller, :update_banner
+    post "/qvitter/update_background_image", TwitterAPI.Controller, :update_background
+
     post "/account/most_recent_notification", TwitterAPI.Controller, :update_most_recent_notification
 
     get "/statuses/home_timeline", TwitterAPI.Controller, :friends_timeline
@@ -58,6 +82,7 @@ defmodule Pleroma.Web.Router do
 
     post "/statuses/update", TwitterAPI.Controller, :status_update
     post "/statuses/retweet/:id", TwitterAPI.Controller, :retweet
+    post "/statuses/destroy/:id", TwitterAPI.Controller, :delete_post
 
     post "/friendships/create", TwitterAPI.Controller, :follow
     post "/friendships/destroy", TwitterAPI.Controller, :unfollow
@@ -72,6 +97,7 @@ defmodule Pleroma.Web.Router do
     post "/qvitter/update_avatar", TwitterAPI.Controller, :update_avatar
 
     get "/statuses/followers", TwitterAPI.Controller, :followers
+    get "/statuses/friends", TwitterAPI.Controller, :friends
   end
 
   pipeline :ostatus do
@@ -106,5 +132,11 @@ end
 
 defmodule Fallback.RedirectController do
   use Pleroma.Web, :controller
-  def redirector(conn, _params), do: (if Mix.env != :test, do: send_file(conn, 200, "priv/static/index.html"))
+  def redirector(conn, _params) do
+    if Mix.env != :test do
+      conn
+      |> put_resp_content_type("text/html")
+      |> send_file(200, "priv/static/index.html")
+    end
+  end
 end