diff options
| author | eal <eal@waifu.club> | 2017-11-07 21:28:31 +0200 |
|---|---|---|
| committer | eal <eal@waifu.club> | 2017-11-07 21:55:01 +0200 |
| commit | c6210183e1d52b22133560eb31306919470e7a73 (patch) | |
| tree | 1cf0b6fc2525f2a9d86370d0d64e85c9bbbd2099 /lib/pleroma/web/twitter_api/controllers/util_controller.ex | |
| parent | ed1eb5deea35ff2c3487ef550fad3a543a80cb32 (diff) | |
| download | pleroma-c6210183e1d52b22133560eb31306919470e7a73.tar.gz | |
Add mastodon API endpoint for custom emoji.
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/util_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 792ae2a64..de2abd4d1 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -71,6 +71,6 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do end def emoji(conn, _params) do - json conn, Formatter.get_custom_emoji() + json conn, Enum.into(Formatter.get_custom_emoji(), %{}) end end |