X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=inline;f=lib%2Fpleroma%2Fweb%2Frouter.ex;h=45c47eefb11eb8bd35e25a9878028cbd593839a0;hb=813d2eaaf08efcb7aa87f6270e98c760b0b60b99;hp=e8460db1676699e48cae61978bc3f99e8e4b68f1;hpb=9f0a2a714b498edfbacc638fa79e06e3a8dc4d04;p=akkoma

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index e8460db16..45c47eefb 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
@@ -51,6 +62,8 @@ defmodule Pleroma.Web.Router do
     post "/accounts/:id/mute", MastodonAPIController, :relationship_noop
     post "/accounts/:id/unmute", MastodonAPIController, :relationship_noop
 
+    post "/follows", MastodonAPIController, :follow
+
     get "/blocks", MastodonAPIController, :empty_array
     get "/domain_blocks", MastodonAPIController, :empty_array
     get "/follow_requests", MastodonAPIController, :empty_array
@@ -58,6 +71,8 @@ defmodule Pleroma.Web.Router do
 
     get "/timelines/home", MastodonAPIController, :home_timeline
 
+    get "/favourites", MastodonAPIController, :favourites
+
     post "/statuses", MastodonAPIController, :post_status
     delete "/statuses/:id", MastodonAPIController, :delete_status
 
@@ -119,6 +134,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