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

Merge branch '3280-emoji' into 'develop'

Browse Source 
Transmogrifier: Encode Emoji id to be valid.

Closes #3280

See merge request pleroma/pleroma!4147
This commit is contained in:
lain 2024-06-12 09:15:14 +00:00
commit 38e6166d93
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/3280-fix-emoji-ids.fix Normal file
View File

@ -0,0 +1 @@
Fix Emoji object IDs not always being valid

6
lib/pleroma/web/activity_pub/transmogrifier.ex
View File

@ -913,9 +913,11 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
def add_emoji_tags(object), do: object def add_emoji_tags(object), do: object
defp build_emoji_tag({name, url}) do def build_emoji_tag({name, url}) do
url = URI.encode(url)
%{ %{
"icon" => %{"url" => "#{URI.encode(url)}", "type" => "Image"}, "icon" => %{"url" => "#{url}", "type" => "Image"},
"name" => ":" <> name <> ":", "name" => ":" <> name <> ":",
"type" => "Emoji", "type" => "Emoji",
"updated" => "1970-01-01T00:00:00Z", "updated" => "1970-01-01T00:00:00Z",

14
test/pleroma/web/activity_pub/transmogrifier/emoji_tag_building_test.exs Normal file
View File

@ -0,0 +1,14 @@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.EmojiTagBuildingTest do
use Pleroma.DataCase, async: true
alias Pleroma.Web.ActivityPub.Transmogrifier
test "it encodes the id to be a valid url" do
name = "hanapog"
url = "https://misskey.local.live/emojis/hana pog.png"
tag = Transmogrifier.build_emoji_tag({name, url})
assert tag["id"] == "https://misskey.local.live/emojis/hana%20pog.png"
end
end