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

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index d9a3968a7..52030d684 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -24,6 +24,7 @@ defmodule Pleroma.Web.Router do
     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
@@ -34,5 +35,6 @@ defmodule Pleroma.Web.Router do
     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