diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-22 02:07:19 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-22 02:07:19 +0000 |
| commit | 7fcbda702e76b6390076c28832f5aea80086d15a (patch) | |
| tree | 265bf6acf11ad7987850c8733ea1b36248cc8c24 /lib/pleroma/web/twitter_api | |
| parent | 6c0e07b8bdc85f757e2d1e6993e64f2e1540deb6 (diff) | |
| parent | 3cefdc62e0dda75985221853fb123572d6fc068b (diff) | |
| download | pleroma-7fcbda702e76b6390076c28832f5aea80086d15a.tar.gz | |
Merge branch 'rework-emoji-management' into 'develop'
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
Diffstat (limited to 'lib/pleroma/web/twitter_api')
| -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 9441984c7..8665e058a 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -286,7 +286,7 @@ 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: tags}} end) |> Enum.into(%{}) |