summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2021-01-05 20:09:29 +0000
committerlain <lain@soykaf.club>2021-01-05 20:09:29 +0000
commit18296c74736fbf020c5bb99491b9c0288a687043 (patch)
tree461678b71ee102b52ee6e6f75ae50956ba8306cb /lib
parent20a269ed694127ca59ece9c2e4865a627b4daad3 (diff)
parentf9090e00e6f6bec903c8df030c4af74ac378fccf (diff)
downloadpleroma-18296c74736fbf020c5bb99491b9c0288a687043.tar.gz
pleroma-18296c74736fbf020c5bb99491b9c0288a687043.zip
Merge branch 'fix/emoji-encoding' into 'develop'
URI.encode custom emojis Closes #2381 See merge request pleroma/pleroma!3235
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/transmogrifier.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 565d32433..5499f8a08 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -919,7 +919,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
defp build_emoji_tag({name, url}) do
%{
- "icon" => %{"url" => url, "type" => "Image"},
+ "icon" => %{"url" => "#{URI.encode(url)}", "type" => "Image"},
"name" => ":" <> name <> ":",
"type" => "Emoji",
"updated" => "1970-01-01T00:00:00Z",