Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop

lib/pleroma/formatter.ex

@@ -122,4 +122,9 @@ def emojify(text, additional \\ nil) do
   def get_emoji(text) do
     Enum.filter(@emoji, fn ({emoji, _}) -> String.contains?(text, ":#{emoji}:") end)
   end
+
+  def get_custom_emoji() do
+    @emoji
+    |> Enum.into %{}
+  end
 end

lib/pleroma/web/router.ex

@@ -33,14 +33,15 @@ def user_fetcher(username) do
     plug :accepts, ["html", "json"]
   end
 
-  pipeline :password_reset do
+  pipeline :pleroma_api do
-    plug :accepts, ["html"]
+    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

lib/pleroma/web/twitter_api/controllers/util_controller.ex

@@ -1,6 +1,7 @@
 defmodule Pleroma.Web.TwitterAPI.UtilController do
   use Pleroma.Web, :controller
   alias Pleroma.Web
+  alias Pleroma.Formatter
 
   alias Pleroma.{Repo, PasswordResetToken, User}
 
@@ -68,4 +69,8 @@ def version(conn, _params) do
       _ -> json(conn, version)
     end
   end
+
+  def emoji(conn, _params) do
+    json conn, Formatter.get_custom_emoji()
+  end
 end