Merge branch 'fix/emoji-react-qualification' into 'develop'

EmojiReactValidator: fix emoji qualification

See merge request pleroma/pleroma!3684
This commit is contained in:
Haelwenn 2022-07-21 17:45:47 +00:00
commit 454f892f37
3 changed files with 71 additions and 0 deletions

View file

@ -49,6 +49,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.EmojiReactValidator do
defp fix(data) do
data =
data
|> fix_emoji_qualification()
|> CommonFixes.fix_actor()
|> CommonFixes.fix_activity_addressing()
@ -61,6 +62,20 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.EmojiReactValidator do
end
end
defp fix_emoji_qualification(%{"content" => emoji} = data) do
# Emoji variation sequence
new_emoji = emoji <> "\uFE0F"
if Pleroma.Emoji.is_unicode_emoji?(new_emoji) do
data
|> Map.put("content", new_emoji)
else
data
end
end
defp fix_emoji_qualification(data), do: data
defp validate_emoji(cng) do
content = get_field(cng, :content)