diff options
| author | lambda <lain@soykaf.club> | 2019-04-10 06:22:51 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-04-10 06:22:51 +0000 |
| commit | c8440b5e0c97c5d5c03e4b99e30a61df6ab95319 (patch) | |
| tree | b52b9e6306b5e237fa3b5dbea375bf89f53d5c11 /lib | |
| parent | 0ab563d3341f7cf9bb3e9f85a869499701cbb7d9 (diff) | |
| parent | b57b43027cf958d3a3a82b95f155ae27b235b543 (diff) | |
| download | pleroma-c8440b5e0c97c5d5c03e4b99e30a61df6ab95319.tar.gz | |
Merge branch 'fix/emoji-api-nonsense' into 'develop'
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 3 |
1 files changed, 2 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 bb71742ec..d066d35f5 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -286,8 +286,9 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do emoji = Emoji.get_all() |> Enum.map(fn {short_code, path, tags} -> - %{short_code => %{image_url: path, tags: String.split(tags, ",")}} + {short_code, %{image_url: path, tags: String.split(tags, ",")}} end) + |> Enum.into(%{}) json(conn, emoji) end |