aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/controllers/util_controller.ex
diff options
context:
space:
mode:
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/util_controller.ex')
-rw-r--r--lib/pleroma/web/twitter_api/controllers/util_controller.ex5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index 11d8fa6c2..792ae2a64 100644
--- 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