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

This commit is contained in:
Roger Braun 2017-10-23 16:28:32 +02:00
commit 5912dd0f5d
3 changed files with 14 additions and 3 deletions

View file

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

View file

@ -33,14 +33,15 @@ def user_fetcher(username) do
plug :accepts, ["html", "json"] plug :accepts, ["html", "json"]
end end
pipeline :password_reset do pipeline :pleroma_api do
plug :accepts, ["html"] plug :accepts, ["html", "json"]
end end
scope "/api/pleroma", Pleroma.Web.TwitterAPI do scope "/api/pleroma", Pleroma.Web.TwitterAPI do
pipe_through :password_reset pipe_through :pleroma_api
get "/password_reset/:token", UtilController, :show_password_reset get "/password_reset/:token", UtilController, :show_password_reset
post "/password_reset", UtilController, :password_reset post "/password_reset", UtilController, :password_reset
get "/emoji", UtilController, :emoji
end end
scope "/oauth", Pleroma.Web.OAuth do scope "/oauth", Pleroma.Web.OAuth do

View file

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