summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2022-07-22 23:56:52 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2022-07-22 23:56:52 +0000
commit21e587ff1ab2b874a4eb5ca811c6e98c8486b55e (patch)
tree2dab3bbb9b4428ab9a8dfb544c6e7371d368caab /lib
parente077da27fecd337c8cd42ec2932e5f6112cc8d76 (diff)
parentcfb21d011fbb8a06ffcd63840e4db3aae3643045 (diff)
downloadpleroma-21e587ff1ab2b874a4eb5ca811c6e98c8486b55e.tar.gz
pleroma-21e587ff1ab2b874a4eb5ca811c6e98c8486b55e.zip
Merge branch 'revert-454f892f' into 'develop'
Revert "Merge branch 'fix/emoji-react-qualification' into 'develop'" See merge request pleroma/pleroma!3707
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex15
1 files changed, 0 insertions, 15 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 bf5166633..ed072b888 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,7 +49,6 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.EmojiReactValidator do
defp fix(data) do
data =
data
- |> fix_emoji_qualification()
|> CommonFixes.fix_actor()
|> CommonFixes.fix_activity_addressing()
@@ -62,20 +61,6 @@ 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)