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

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 1e865b358..40350ad0c 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -9,18 +9,35 @@ defmodule Pleroma.Web.Router do
 
   pipeline :api do
     plug :accepts, ["json"]
+    plug :fetch_session
+    plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Pleroma.Web.Router.user_fetcher/1, optional: true}
   end
 
   pipeline :authenticated_api do
     plug :accepts, ["json"]
     plug :fetch_session
-    plug Pleroma.Plugs.AuthenticationPlug, fetcher: &Pleroma.Web.Router.user_fetcher/1
+    plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Pleroma.Web.Router.user_fetcher/1}
+  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_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 "/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