aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/controllers/util_controller.ex
diff options
context:
space:
mode:
authorAlex S <alex.strizhakov@gmail.com>2019-04-01 17:17:57 +0700
committerAlex S <alex.strizhakov@gmail.com>2019-04-01 17:17:57 +0700
commit3601f03147bd104f6acff64e7c8d5d4d3e1f53a2 (patch)
tree9575002d2291587dc3080fdd3b65144d6535bfef /lib/pleroma/web/twitter_api/controllers/util_controller.ex
parentdc39d8d3fb941bad9fe26586c321bb00a0b92fe4 (diff)
downloadpleroma-3601f03147bd104f6acff64e7c8d5d4d3e1f53a2.tar.gz
Adding tag to emoji ets table
changes in apis
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/util_controller.ex')
-rw-r--r--lib/pleroma/web/twitter_api/controllers/util_controller.ex8
1 files changed, 7 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 faa733fec..e58d9e4cd 100644
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -266,7 +266,13 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
end
def emoji(conn, _params) do
- json(conn, Enum.into(Emoji.get_all(), %{}))
+ emoji =
+ Emoji.get_all()
+ |> Enum.map(fn {short_code, path, tags} ->
+ %{short_code => %{image_url: path, tags: String.split(tags, ",")}}
+ end)
+
+ json(conn, emoji)
end
def follow_import(conn, %{"list" => %Plug.Upload{} = listfile}) do