X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frouter.ex;h=cb818b3ccc1d6179f262ce2d9f379ee8a857db33;hb=5912dd0f5dfaecc3732d2174867490c5a6b88c11;hp=8497685a692f5578766db05c2eecdc3522ea1440;hpb=6af164f27b5a285fb1b1c8790a86db061c8fc28a;p=akkoma

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 8497685a6..cb818b3cc 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -33,14 +33,15 @@ defmodule Pleroma.Web.Router do
     plug :accepts, ["html", "json"]
   end
 
-  pipeline :password_reset do
-    plug :accepts, ["html"]
+  pipeline :pleroma_api do
+    plug :accepts, ["html", "json"]
   end
 
   scope "/api/pleroma", Pleroma.Web.TwitterAPI do
-    pipe_through :password_reset
+    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