X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frouter.ex;h=f96ec72138de2ef7effbd8354bc4b3d5eba3a679;hb=6dfa62800ad6cdcef9e73ecdabe45363c574a528;hp=3de77d220375e77ff76f3b6e923d86a109845b46;hpb=c20530e7080e7c37f33a944933a5a84c95f0e387;p=akkoma

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 3de77d220..f96ec7213 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -33,6 +33,17 @@ defmodule Pleroma.Web.Router do
     plug :accepts, ["html", "json"]
   end
 
+  pipeline :pleroma_api do
+    plug :accepts, ["html", "json"]
+  end
+
+  scope "/api/pleroma", Pleroma.Web.TwitterAPI do
+    pipe_through :pleroma_api
+    get "/password_reset/:token", UtilController, :show_password_reset
+    post "/password_reset", UtilController, :password_reset
+    get "/emoji", UtilController, :emoji
+  end
+
   scope "/oauth", Pleroma.Web.OAuth do
     get "/authorize", OAuthController, :authorize
     post "/authorize", OAuthController, :create_authorization
@@ -44,20 +55,26 @@ defmodule Pleroma.Web.Router do
 
     get "/accounts/verify_credentials", MastodonAPIController, :verify_credentials
     get "/accounts/relationships", MastodonAPIController, :relationships
+    get "/accounts/search", MastodonAPIController, :account_search
     post "/accounts/:id/follow", MastodonAPIController, :follow
     post "/accounts/:id/unfollow", MastodonAPIController, :unfollow
-    post "/accounts/:id/block", MastodonAPIController, :relationship_noop
-    post "/accounts/:id/unblock", MastodonAPIController, :relationship_noop
+    post "/accounts/:id/block", MastodonAPIController, :block
+    post "/accounts/:id/unblock", MastodonAPIController, :unblock
     post "/accounts/:id/mute", MastodonAPIController, :relationship_noop
     post "/accounts/:id/unmute", MastodonAPIController, :relationship_noop
 
-    get "/blocks", MastodonAPIController, :empty_array
+    post "/follows", MastodonAPIController, :follow
+
+    get "/blocks", MastodonAPIController, :blocks
+
     get "/domain_blocks", MastodonAPIController, :empty_array
     get "/follow_requests", MastodonAPIController, :empty_array
     get "/mutes", MastodonAPIController, :empty_array
 
     get "/timelines/home", MastodonAPIController, :home_timeline
 
+    get "/favourites", MastodonAPIController, :favourites
+
     post "/statuses", MastodonAPIController, :post_status
     delete "/statuses/:id", MastodonAPIController, :delete_status
 
@@ -87,6 +104,8 @@ defmodule Pleroma.Web.Router do
     get "/accounts/:id/followers", MastodonAPIController, :followers
     get "/accounts/:id/following", MastodonAPIController, :following
     get "/accounts/:id", MastodonAPIController, :user
+
+    get "/search", MastodonAPIController, :search
   end
 
   scope "/api", Pleroma.Web do
@@ -117,6 +136,8 @@ defmodule Pleroma.Web.Router do
       post "/account/register", TwitterAPI.Controller, :register
     end
 
+    get "/search", TwitterAPI.Controller, :search
+    get "/statusnet/tags/timeline/:tag", TwitterAPI.Controller, :public_and_external_timeline
     get "/externalprofile/show", TwitterAPI.Controller, :external_profile
   end