X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frouter.ex;h=b0c1dcd9177b77990b11032141aaa69ee91d8bf7;hb=33c803d6da91e0253a100cbd480d253706c44964;hp=33e395218026c142e7a4ee912d60020b2e7914db;hpb=1b9cc721a0d49d786b4864c2b8aceaf49b9ff088;p=akkoma

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 33e395218..b0c1dcd91 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -27,11 +27,15 @@ defmodule Pleroma.Web.Router do
     pipe_through :api
 
     get "/help/test", TwitterAPI.Controller, :help_test
+    get "/statusnet/config", TwitterAPI.Controller, :config
+
     get "/statuses/public_timeline", TwitterAPI.Controller, :public_timeline
-    get "/statuses/public_and_external_timeline", TwitterAPI.Controller, :public_timeline
+    get "/statuses/public_and_external_timeline", TwitterAPI.Controller, :public_and_external_timeline
+    get "/statuses/user_timeline", TwitterAPI.Controller, :user_timeline
+
     get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status
     get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation
-    get "/statusnet/config", TwitterAPI.Controller, :config
+
     post "/account/register", TwitterAPI.Controller, :register
   end
 
@@ -40,17 +44,25 @@ defmodule Pleroma.Web.Router do
 
     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
+    get "/statuses/mentions", TwitterAPI.Controller, :mentions_timeline
+    get "/statuses/mentions_timeline", TwitterAPI.Controller, :mentions_timeline
+
+    post "/statuses/update", TwitterAPI.Controller, :status_update
+    post "/statuses/retweet/:id", TwitterAPI.Controller, :retweet
+
     post "/friendships/create", TwitterAPI.Controller, :follow
     post "/friendships/destroy", TwitterAPI.Controller, :unfollow
+
     post "/statusnet/media/upload", TwitterAPI.Controller, :upload
     post "/media/upload", TwitterAPI.Controller, :upload_json
+
     post "/favorites/create/:id", TwitterAPI.Controller, :favorite
     post "/favorites/create", TwitterAPI.Controller, :favorite
     post "/favorites/destroy/:id", TwitterAPI.Controller, :unfavorite
-    post "/statuses/retweet/:id", TwitterAPI.Controller, :retweet
+
     post "/qvitter/update_avatar", TwitterAPI.Controller, :update_avatar
   end
 
@@ -62,7 +74,11 @@ defmodule Pleroma.Web.Router do
     pipe_through :ostatus
 
     get "/users/:nickname/feed", OStatus.OStatusController, :feed
+    get "/users/:nickname", OStatus.OStatusController, :feed_redirect
+    post "/users/:nickname/salmon", OStatus.OStatusController, :salmon_incoming
     post "/push/hub/:nickname", Websub.WebsubController, :websub_subscription_request
+    get "/push/subscriptions/:id", Websub.WebsubController, :websub_subscription_confirmation
+    post "/push/subscriptions/:id", Websub.WebsubController, :websub_incoming
   end
 
   scope "/.well-known", Pleroma.Web do