X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frouter.ex;h=40350ad0c9461755942eb35fa03c25c828c3e89f;hb=1388054796feed8f03d659171bbbc0c21056dd2f;hp=c34f03cbba02aa1cf9ddd9fc0e6c1b2b61e8be0a;hpb=e2e0cd75b77778cb7adf911cf279d0ccc008dab1;p=akkoma

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index c34f03cbb..40350ad0c 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -21,15 +21,23 @@ defmodule Pleroma.Web.Router do
 
   scope "/api", Pleroma.Web do
     pipe_through :api
-    get "/statuses/public_timeline.json", TwitterAPI.Controller, :public_timeline
-    get "/statuses/public_and_external_timeline.json", TwitterAPI.Controller, :public_timeline
+    get "/statuses/public_timeline", TwitterAPI.Controller, :public_timeline
+    get "/statuses/public_and_external_timeline", TwitterAPI.Controller, :public_timeline
+    get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status
+    get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation
+    get "/statusnet/config", TwitterAPI.Controller, :config
   end
 
   scope "/api", Pleroma.Web do
     pipe_through :authenticated_api
 
-    post "/account/verify_credentials.json", TwitterAPI.Controller, :verify_credentials
-    post "/statuses/update.json", TwitterAPI.Controller, :status_update
-    get "/statuses/friends_timeline.json", TwitterAPI.Controller, :friends_timeline
+    get "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
+    post "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
+    post "/statuses/update", TwitterAPI.Controller, :status_update
+    get "/statuses/home_timeline", TwitterAPI.Controller, :friends_timeline
+    get "/statuses/friends_timeline", TwitterAPI.Controller, :friends_timeline
+    post "/friendships/create", TwitterAPI.Controller, :follow
+    post "/friendships/destroy", TwitterAPI.Controller, :unfollow
+    post "/statusnet/media/upload", TwitterAPI.Controller, :upload
   end
 end