X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frouter.ex;h=52030d684ac16d093977094286974f7bcd94dde8;hb=32aa83f3a2a6ab14e36a3452708ea3be94ad4c43;hp=e7d0b94377210d8955e96c211c5884077743d9f1;hpb=30650e5bc610810d129bf02891a73ac11340710b;p=akkoma

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index e7d0b9437..52030d684 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -21,17 +21,20 @@ 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
   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
-    post "/friendships/create.json", TwitterAPI.Controller, :follow
-    post "/friendships/destroy.json", TwitterAPI.Controller, :unfollow
+    post "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
+    post "/statuses/update", TwitterAPI.Controller, :status_update
+    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