diff options
author | href <href@random.sh> | 2018-11-05 13:24:00 +0100 |
---|---|---|
committer | href <href@random.sh> | 2018-11-05 13:24:00 +0100 |
commit | 763fc7b44fb5931f1a2f869d4c67a5ca9a0b5206 (patch) | |
tree | c5e3aa419de92a3e6dd835127c6b0dbc79bb6561 /lib/pleroma/web/twitter_api/controllers | |
parent | bd97b3614f2353619ab524844d100b6f25527592 (diff) | |
download | pleroma-763fc7b44fb5931f1a2f869d4c67a5ca9a0b5206.tar.gz |
Runtime configured emojis
The changes are a bit heavy since the emojis were loaded into module
attributes from filesystem.
This introduces a GenServer using an ETS table to cache in memory the
emojis, and allows a runtime-reload with `Pleroma.Emoji.reload()`.
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers')
-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 |