Fix Mastodon incoming edits with inlined "likes"

Signed-off-by: mkljczk <git@mkljczk.pl>

2 files changed, 101 insertions, 0 deletions

diff --git a/test/fixtures/mastodon-update-with-likes.json b/test/fixtures/mastodon-update-with-likes.json
new file mode 100644
index 000000000..3bdb3ba3d
--- /dev/null
+++ b/test/fixtures/mastodon-update-with-likes.json
@@ -0,0 +1,90 @@
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    {
+      "atomUri": "ostatus:atomUri",
+      "conversation": "ostatus:conversation",
+      "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
+      "ostatus": "http://ostatus.org#",
+      "sensitive": "as:sensitive",
+      "toot": "http://joinmastodon.org/ns#",
+      "votersCount": "toot:votersCount"
+    },
+    "https://w3id.org/security/v1"
+  ],
+  "actor": "https://pol.social/users/mkljczk",
+  "cc": ["https://www.w3.org/ns/activitystreams#Public",
+   "https://pol.social/users/aemstuz", "https://gts.mkljczk.pl/users/mkljczk",
+   "https://pl.fediverse.pl/users/mkljczk",
+   "https://fedi.kutno.pl/users/mkljczk"],
+  "id": "https://pol.social/users/mkljczk/statuses/113907871635572263#updates/1738096776",
+  "object": {
+    "atomUri": "https://pol.social/users/mkljczk/statuses/113907871635572263",
+    "attachment": [],
+    "attributedTo": "https://pol.social/users/mkljczk",
+    "cc": ["https://www.w3.org/ns/activitystreams#Public",
+     "https://pol.social/users/aemstuz", "https://gts.mkljczk.pl/users/mkljczk",
+     "https://pl.fediverse.pl/users/mkljczk",
+     "https://fedi.kutno.pl/users/mkljczk"],
+    "content": "<p>test</p>",
+    "contentMap": {
+      "pl": "<p>test</p>"
+    },
+    "conversation": "https://fedi.kutno.pl/contexts/43c14c70-d3fb-42b4-a36d-4eacfab9695a",
+    "id": "https://pol.social/users/mkljczk/statuses/113907871635572263",
+    "inReplyTo": "https://pol.social/users/aemstuz/statuses/113907854282654767",
+    "inReplyToAtomUri": "https://pol.social/users/aemstuz/statuses/113907854282654767",
+    "likes": {
+      "id": "https://pol.social/users/mkljczk/statuses/113907871635572263/likes",
+      "totalItems": 1,
+      "type": "Collection"
+    },
+    "published": "2025-01-28T20:29:45Z",
+    "replies": {
+      "first": {
+        "items": [],
+        "next": "https://pol.social/users/mkljczk/statuses/113907871635572263/replies?only_other_accounts=true&page=true",
+        "partOf": "https://pol.social/users/mkljczk/statuses/113907871635572263/replies",
+        "type": "CollectionPage"
+      },
+      "id": "https://pol.social/users/mkljczk/statuses/113907871635572263/replies",
+      "type": "Collection"
+    },
+    "sensitive": false,
+    "shares": {
+      "id": "https://pol.social/users/mkljczk/statuses/113907871635572263/shares",
+      "totalItems": 0,
+      "type": "Collection"
+    },
+    "summary": null,
+    "tag": [
+      {
+        "href": "https://pol.social/users/aemstuz",
+        "name": "@aemstuz",
+        "type": "Mention"
+      },
+      {
+        "href": "https://gts.mkljczk.pl/users/mkljczk",
+        "name": "@mkljczk@gts.mkljczk.pl",
+        "type": "Mention"
+      },
+      {
+        "href": "https://pl.fediverse.pl/users/mkljczk",
+        "name": "@mkljczk@fediverse.pl",
+        "type": "Mention"
+      },
+      {
+        "href": "https://fedi.kutno.pl/users/mkljczk",
+        "name": "@mkljczk@fedi.kutno.pl",
+        "type": "Mention"
+      }
+    ],
+    "to": ["https://pol.social/users/mkljczk/followers"],
+    "type": "Note",
+    "updated": "2025-01-28T20:39:36Z",
+    "url": "https://pol.social/@mkljczk/113907871635572263"
+  },
+  "published": "2025-01-28T20:39:36Z",
+  "to": ["https://pol.social/users/mkljczk/followers"],
+  "type": "Update"
+}
diff --git a/test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs b/test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs
index e1dbb20c3..b1cbdbe81 100644
--- a/test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs
+++ b/test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs
@@ -128,6 +128,17 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidatorTest
     %{valid?: true} = ArticleNotePageValidator.cast_and_validate(note)
   end
 
+  test "a Note with validated likes collection validates" do
+    insert(:user, ap_id: "https://pol.social/users/mkljczk")
+
+    %{"object" => note} =
+      "test/fixtures/mastodon-update-with-likes.json"
+      |> File.read!()
+      |> Jason.decode!()
+
+    %{valid?: true} = ArticleNotePageValidator.cast_and_validate(note)
+  end
+
   test "Fedibird quote post" do
     insert(:user, ap_id: "https://fedibird.com/users/noellabo")