aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreal <eal@waifu.club>2018-08-13 16:21:18 +0300
committereal <eal@waifu.club>2018-08-13 16:21:18 +0300
commit92caa2632ba559961ebceccc9c0b44fbb8af05ed (patch)
tree3bd2827e8d6d62bc3e81072d9ac09a229ad3aeee
parent1ed1ff17a4281cdbd7743e12759143dcb6534db7 (diff)
downloadpleroma-92caa2632ba559961ebceccc9c0b44fbb8af05ed.tar.gz
Use Image type for emoji icons.
-rw-r--r--lib/pleroma/web/common_api/utils.ex2
-rw-r--r--test/web/common_api/common_api_utils_test.exs4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index f6960bf41..7bab0e4ff 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -203,7 +203,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
|> Enum.map(fn {shortcode, url} ->
%{
"type" => "Emoji",
- "icon" => %{"url" => "#{Endpoint.url()}#{url}"},
+ "icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}#{url}"},
"name" => ":#{shortcode}:"
}
end)
diff --git a/test/web/common_api/common_api_utils_test.exs b/test/web/common_api/common_api_utils_test.exs
index cf97b2bfd..f7d614582 100644
--- a/test/web/common_api/common_api_utils_test.exs
+++ b/test/web/common_api/common_api_utils_test.exs
@@ -37,12 +37,12 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do
expected = [
%{
"type" => "Emoji",
- "icon" => %{"url" => "#{Endpoint.url()}/finmoji/128px/perkele-128.png"},
+ "icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}/finmoji/128px/perkele-128.png"},
"name" => ":perkele:"
},
%{
"type" => "Emoji",
- "icon" => %{"url" => "#{Endpoint.url()}/finmoji/128px/karjalanpiirakka-128.png"},
+ "icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}/finmoji/128px/karjalanpiirakka-128.png"},
"name" => ":karjalanpiirakka:"
}
]