Add an API endpoint for emoji.
This commit is contained in:
parent
38f3908c14
commit
fe7804e42d
@ -122,4 +122,9 @@ defmodule Pleroma.Formatter 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
|
||||||
|
@ -33,14 +33,15 @@ defmodule Pleroma.Web.Router 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
|
||||||
|
@ -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 @@ defmodule Pleroma.Web.TwitterAPI.UtilController 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
|
||||||
|
Loading…
Reference in New Issue
Block a user