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

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 327987d1d..c20ec3e80 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -23,20 +23,44 @@ 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
 
-    get "/help/test", TwitterAPI.Controller, :help_test
-    get "/statusnet/config", TwitterAPI.Controller, :config
+  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
+    get "/statuses/networkpublic_timeline", TwitterAPI.Controller, :public_and_external_timeline
     get "/statuses/user_timeline", TwitterAPI.Controller, :user_timeline
+    get "/qvitter/statuses/user_timeline", TwitterAPI.Controller, :user_timeline
 
     get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status
     get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation
 
     post "/account/register", TwitterAPI.Controller, :register
+
+    get "/externalprofile/show", TwitterAPI.Controller, :external_profile
   end
 
   scope "/api", Pleroma.Web do
@@ -45,6 +69,12 @@ 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
     get "/statuses/friends_timeline", TwitterAPI.Controller, :friends_timeline
     get "/statuses/mentions", TwitterAPI.Controller, :mentions_timeline
@@ -52,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
@@ -64,16 +95,20 @@ defmodule Pleroma.Web.Router do
     post "/favorites/destroy/:id", TwitterAPI.Controller, :unfavorite
 
     post "/qvitter/update_avatar", TwitterAPI.Controller, :update_avatar
+
+    get "/statuses/followers", TwitterAPI.Controller, :followers
+    get "/statuses/friends", TwitterAPI.Controller, :friends
   end
 
   pipeline :ostatus do
-    plug :accepts, ["xml", "atom"]
+    plug :accepts, ["xml", "atom", "html"]
   end
 
   scope "/", Pleroma.Web do
     pipe_through :ostatus
 
     get "/objects/:uuid", OStatus.OStatusController, :object
+    get "/activities/:uuid", OStatus.OStatusController, :activity
 
     get "/users/:nickname/feed", OStatus.OStatusController, :feed
     get "/users/:nickname", OStatus.OStatusController, :feed_redirect
@@ -93,10 +128,15 @@ defmodule Pleroma.Web.Router do
   scope "/", Fallback do
     get "/*path", RedirectController, :redirector
   end
-
 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