a1batross/pleroma
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Use Image type for emoji icons.

Browse Source
This commit is contained in:
eal 2018-08-13 16:21:18 +03:00
parent 1ed1ff17a4
commit 92caa2632b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/common_api/utils.ex
View File

@ -203,7 +203,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
|> Enum.map(fn {shortcode, url} -> |> Enum.map(fn {shortcode, url} ->
%{ %{
"type" => "Emoji", "type" => "Emoji",
"icon" => %{"url" => "#{Endpoint.url()}#{url}"}, "icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}#{url}"},
"name" => ":#{shortcode}:" "name" => ":#{shortcode}:"
} }
end) end)

4
test/web/common_api/common_api_utils_test.exs
View File

@ -37,12 +37,12 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do
expected = [ expected = [
%{ %{
"type" => "Emoji", "type" => "Emoji",
"icon" => %{"url" => "#{Endpoint.url()}/finmoji/128px/perkele-128.png"}, "icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}/finmoji/128px/perkele-128.png"},
"name" => ":perkele:" "name" => ":perkele:"
}, },
%{ %{
"type" => "Emoji", "type" => "Emoji",
"icon" => %{"url" => "#{Endpoint.url()}/finmoji/128px/karjalanpiirakka-128.png"}, "icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}/finmoji/128px/karjalanpiirakka-128.png"},
"name" => ":karjalanpiirakka:" "name" => ":karjalanpiirakka:"
} }
] ]