pleroma

commit: 21e587ff1ab2b874a4eb5ca811c6e98c8486b55e
parent e077da27fecd337c8cd42ec2932e5f6112cc8d76
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Fri, 22 Jul 2022 23:56:52 +0000

Merge branch 'revert-454f892f' into 'develop'

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

See merge request pleroma/pleroma!3707
Diffstat:
M
lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex
15
---------------
D
test/fixtures/emoji-reaction-unqualified.json
30
------------------------------
M
test/pleroma/web/activity_pub/transmogrifier/emoji_react_handling_test.exs
26
--------------------------

3 files changed, 0 insertions(+), 71 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
@@ -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)
 
diff --git a/test/fixtures/emoji-reaction-unqualified.json b/test/fixtures/emoji-reaction-unqualified.json
@@ -1,30 +0,0 @@
-{
-  "type": "EmojiReact",
-  "signature": {
-    "type": "RsaSignature2017",
-    "signatureValue": "fdxMfQSMwbC6wP6sh6neS/vM5879K67yQkHTbiT5Npr5wAac0y6+o3Ij+41tN3rL6wfuGTosSBTHOtta6R4GCOOhCaCSLMZKypnp1VltCzLDoyrZELnYQIC8gpUXVmIycZbREk22qWUe/w7DAFaKK4UscBlHDzeDVcA0K3Se5Sluqi9/Zh+ldAnEzj/rSEPDjrtvf5wGNf3fHxbKSRKFt90JvKK6hS+vxKUhlRFDf6/SMETw+EhwJSNW4d10yMUakqUWsFv4Acq5LW7l+HpYMvlYY1FZhNde1+uonnCyuQDyvzkff8zwtEJmAXC4RivO/VVLa17SmqheJZfI8oluVg==",
-    "creator": "http://mastodon.example.org/users/admin#main-key",
-    "created": "2018-02-17T18:57:49Z"
-  },
-  "object": "http://localtesting.pleroma.lol/objects/eb92579d-3417-42a8-8652-2492c2d4f454",
-  "content": "❤",
-  "nickname": "lain",
-  "id": "http://mastodon.example.org/users/admin#reactions/2",
-  "actor": "http://mastodon.example.org/users/admin",
-  "@context": [
-    "https://www.w3.org/ns/activitystreams",
-    "https://w3id.org/security/v1",
-    {
-      "toot": "http://joinmastodon.org/ns#",
-      "sensitive": "as:sensitive",
-      "ostatus": "http://ostatus.org#",
-      "movedTo": "as:movedTo",
-      "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
-      "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
-      "conversation": "ostatus:conversation",
-      "atomUri": "ostatus:atomUri",
-      "Hashtag": "as:Hashtag",
-      "Emoji": "toot:Emoji"
-    }
-  ]
-}
diff --git a/test/pleroma/web/activity_pub/transmogrifier/emoji_react_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/emoji_react_handling_test.exs
@@ -37,32 +37,6 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.EmojiReactHandlingTest do
     assert match?([["👌", _]], object.data["reactions"])
   end
 
-  test "it works for incoming unqualified emoji reactions" do
-    user = insert(:user)
-    other_user = insert(:user, local: false)
-    {:ok, activity} = CommonAPI.post(user, %{status: "hello"})
-
-    data =
-      File.read!("test/fixtures/emoji-reaction-unqualified.json")
-      |> Jason.decode!()
-      |> Map.put("object", activity.data["object"])
-      |> Map.put("actor", other_user.ap_id)
-
-    {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
-
-    assert data["actor"] == other_user.ap_id
-    assert data["type"] == "EmojiReact"
-    assert data["id"] == "http://mastodon.example.org/users/admin#reactions/2"
-    assert data["object"] == activity.data["object"]
-    # heart emoji with added emoji variation sequence
-    assert data["content"] == "❤\uFE0F"
-
-    object = Object.get_by_ap_id(data["object"])
-
-    assert object.data["reaction_count"] == 1
-    assert match?([["❤\uFE0F", _]], object.data["reactions"])
-  end
-
   test "it reject invalid emoji reactions" do
     user = insert(:user)
     other_user = insert(:user, local: false)