aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-04-09 23:20:31 +0300
committerrinpatch <rinpatch@sdf.org>2019-04-09 23:20:31 +0300
commitb57b43027cf958d3a3a82b95f155ae27b235b543 (patch)
tree0f738219927609fa056d371d19b93380a1c4452d /lib
parent144648de92abea7330cf264b7608634a27bb6bdf (diff)
downloadpleroma-b57b43027cf958d3a3a82b95f155ae27b235b543.tar.gz
Change response format of /api/pleroma/emoji to the one that actually makes sense
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/twitter_api/controllers/util_controller.ex3
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 26407aebd..e6057e072 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