diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-10-20 10:35:03 -0400 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-10-20 10:35:03 -0400 |
| commit | d0d50f8a6b1d22b4c45f7e2c2b2757d188f29349 (patch) | |
| tree | cdefa4c3313b03c01fb960c49b8bbce1e7b33450 /lib/pleroma/web/twitter_api/controllers/util_controller.ex | |
| parent | 38f3908c14d3b8fcfe522d4c92bde022dcc682e3 (diff) | |
| parent | fe7804e42d27ca46290cfe52ffc01d4e520849b5 (diff) | |
| download | pleroma-d0d50f8a6b1d22b4c45f7e2c2b2757d188f29349.tar.gz | |
Merge branch 'develop' into 'develop'
Add an API endpoint for emoji.
See merge request lambadalambda/pleroma!28
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/util_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 5 |
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 |