summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHélène <pleroma-dev@helene.moe>2022-07-24 13:31:35 +0200
committerHélène <pleroma-dev@helene.moe>2022-07-24 13:36:06 +0200
commit388bbc4978a97eb82554c6d8ebc8bb6c9d429080 (patch)
tree88b601406c4b0d4ecedd077674a803549546c8db /lib
parent301ce5bc627d91b21c33af73eeb266025cd14728 (diff)
downloadpleroma-388bbc4978a97eb82554c6d8ebc8bb6c9d429080.tar.gz
pleroma-388bbc4978a97eb82554c6d8ebc8bb6c9d429080.zip
EmojiReactValidator: fix emoji qualification
Tries fully-qualifying emoji when receiving them, by adding the emoji variation sequence to the received reaction emoji. This issue arises when other instance software, such as Misskey, tries reacting with emoji that have unqualified or minimally qualified variants, like a red heart. Pleroma only accepts fully qualified emoji in emoji reactions, and refused those emoji. Now, Pleroma will attempt to properly qualify them first, and reject them if checks still fail. This commit contains changes to tests proposed by lanodan. Co-authored-by: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex19
1 files changed, 19 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex b/lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex
index ed072b888..2eb4f6842 100644
--- a/lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex
+++ b/lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex
@@ -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,24 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.EmojiReactValidator do
end
end
+ defp fix_emoji_qualification(%{"content" => emoji} = data) do
+ # Emoji variation sequence
+ new_emoji = emoji <> "\uFE0F"
+
+ cond do
+ Pleroma.Emoji.is_unicode_emoji?(emoji) ->
+ data
+
+ Pleroma.Emoji.is_unicode_emoji?(new_emoji) ->
+ data |> Map.put("content", new_emoji)
+
+ true ->
+ data
+ end
+ end
+
+ defp fix_emoji_qualification(data), do: data
+
defp validate_emoji(cng) do
content = get_field(cng, :content)