Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline

[akkoma] / lib / pleroma / web / router.ex

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 3c560349f0c4a7d316132f465dd8611ecfe14782..1ced7f3ea35da1a32c0bc6ac4faf6a59086a54f9 100644 (file)
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -25,6 +25,7 @@ defmodule Pleroma.Web.Router do
     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
@@ -35,6 +36,7 @@ defmodule Pleroma.Web.Router do
     post "/statuses/update", TwitterAPI.Controller, :status_update
     get "/statuses/home_timeline", TwitterAPI.Controller, :friends_timeline
     get "/statuses/friends_timeline", TwitterAPI.Controller, :friends_timeline
+    get "/statuses/user_timeline", TwitterAPI.Controller, :user_timeline
     post "/friendships/create", TwitterAPI.Controller, :follow
     post "/friendships/destroy", TwitterAPI.Controller, :unfollow
     post "/statusnet/media/upload", TwitterAPI.Controller, :upload