commit: 5912dd0f5dfaecc3732d2174867490c5a6b88c11
parent: 64bc38e009208fa4f4409f6930d5117dc291c2f5
Author: Roger Braun <rbraun@Bobble.local>
Date: Mon, 23 Oct 2017 16:28:32 +0200
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
Diffstat:
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
@@ -122,4 +122,9 @@ defmodule Pleroma.Formatter 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
diff --git 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
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/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 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
_ -> json(conn, version)
end
end
+
+ def emoji(conn, _params) do
+ json conn, Formatter.get_custom_emoji()
+ end
end