hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'rework-emoji-management' into 'develop'

Browse source 
Remove finmoji and add a way to download emojis in packs

Closes #817 and #821

See merge request pleroma/pleroma!1073
This commit is contained in:
kaniini 2019-04-22 02:07:19 +00:00
commit 7fcbda702e
144 changed files with 422 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file

@ -190,7 +190,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
"static_url" => url,
"visible_in_picker" => true,
"url" => url,
"tags" => String.split(tags, ",")
"tags" => tags
}
end)
end

2
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View file

@ -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(%{})