diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-08 18:48:10 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-08 18:48:10 +0700 |
| commit | 9abf832b034bf3867272bd178d168c641129eff0 (patch) | |
| tree | decc2cc28908a79df003ad668fb06cb74fa97159 /lib/pleroma/web/twitter_api/controllers | |
| parent | c3d5c3513a3205313f0a2e28bb328ad5b48f2055 (diff) | |
| parent | e19590c93f9adc5d743867b048aad9528810fc53 (diff) | |
| download | pleroma-9abf832b034bf3867272bd178d168c641129eff0.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 8 |
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 3cdd7a2f2..26407aebd 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -283,7 +283,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 |