diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-11-05 18:40:38 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-11-05 18:40:38 +0000 |
| commit | 03702e4c4a3f7ca80d6adcdcd77b39e6a60809c6 (patch) | |
| tree | 9c6fb949fd8f18ba015821956cc130e75fb879a5 /lib/pleroma/web/twitter_api/controllers/util_controller.ex | |
| parent | bd97b3614f2353619ab524844d100b6f25527592 (diff) | |
| parent | fd0e7d18d96fb242088d8c6bb7ea5e1eb7053ce8 (diff) | |
| download | pleroma-03702e4c4a3f7ca80d6adcdcd77b39e6a60809c6.tar.gz | |
Merge branch 'runtime-emojis' into 'develop'
Runtime configured emojis
See merge request pleroma/pleroma!425
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/util_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 01cd17121..e84438e97 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -6,7 +6,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do alias Pleroma.Web.WebFinger alias Pleroma.Web.CommonAPI alias Comeonin.Pbkdf2 - alias Pleroma.Formatter + alias Pleroma.{Formatter, Emoji} alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.{Repo, PasswordResetToken, User} @@ -212,7 +212,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do end def emoji(conn, _params) do - json(conn, Enum.into(Formatter.get_custom_emoji(), %{})) + json(conn, Enum.into(Emoji.get_all(), %{})) end def follow_import(conn, %{"list" => %Plug.Upload{} = listfile}) do |