Simplify test, move data into a json fixture

By removing the inReplyTo, tags, and cc we can simplify the test and it still passes signature validation

2 files changed, 87 insertions, 157 deletions

diff --git a/test/fixtures/bastianallgeier.json b/test/fixtures/bastianallgeier.json
deleted file mode 100644
index 6b47e7db9..000000000
--- a/test/fixtures/bastianallgeier.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-  "@context": [
-    "https://www.w3.org/ns/activitystreams",
-    "https://w3id.org/security/v1",
-    {
-      "Curve25519Key": "toot:Curve25519Key",
-      "Device": "toot:Device",
-      "Ed25519Key": "toot:Ed25519Key",
-      "Ed25519Signature": "toot:Ed25519Signature",
-      "EncryptedMessage": "toot:EncryptedMessage",
-      "PropertyValue": "schema:PropertyValue",
-      "alsoKnownAs": {
-        "@id": "as:alsoKnownAs",
-        "@type": "@id"
-      },
-      "cipherText": "toot:cipherText",
-      "claim": {
-        "@id": "toot:claim",
-        "@type": "@id"
-      },
-      "deviceId": "toot:deviceId",
-      "devices": {
-        "@id": "toot:devices",
-        "@type": "@id"
-      },
-      "discoverable": "toot:discoverable",
-      "featured": {
-        "@id": "toot:featured",
-        "@type": "@id"
-      },
-      "featuredTags": {
-        "@id": "toot:featuredTags",
-        "@type": "@id"
-      },
-      "fingerprintKey": {
-        "@id": "toot:fingerprintKey",
-        "@type": "@id"
-      },
-      "focalPoint": {
-        "@container": "@list",
-        "@id": "toot:focalPoint"
-      },
-      "identityKey": {
-        "@id": "toot:identityKey",
-        "@type": "@id"
-      },
-      "indexable": "toot:indexable",
-      "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
-      "memorial": "toot:memorial",
-      "messageFranking": "toot:messageFranking",
-      "messageType": "toot:messageType",
-      "movedTo": {
-        "@id": "as:movedTo",
-        "@type": "@id"
-      },
-      "publicKeyBase64": "toot:publicKeyBase64",
-      "schema": "http://schema.org#",
-      "suspended": "toot:suspended",
-      "toot": "http://joinmastodon.org/ns#",
-      "value": "schema:value"
-    }
-  ],
-  "attachment": [
-    {
-      "name": "Website",
-      "type": "PropertyValue",
-      "value": "<a href=\"https://bastianallgeier.com\" target=\"_blank\" rel=\"nofollow noopener noreferrer me\" translate=\"no\"><span class=\"invisible\">https://</span><span class=\"\">bastianallgeier.com</span><span class=\"invisible\"></span></a>"
-    },
-    {
-      "name": "Project",
-      "type": "PropertyValue",
-      "value": "<a href=\"https://getkirby.com\" target=\"_blank\" rel=\"nofollow noopener noreferrer me\" translate=\"no\"><span class=\"invisible\">https://</span><span class=\"\">getkirby.com</span><span class=\"invisible\"></span></a>"
-    },
-    {
-      "name": "Github",
-      "type": "PropertyValue",
-      "value": "<a href=\"https://github.com/bastianallgeier\" target=\"_blank\" rel=\"nofollow noopener noreferrer me\" translate=\"no\"><span class=\"invisible\">https://</span><span class=\"\">github.com/bastianallgeier</span><span class=\"invisible\"></span></a>"
-    }
-  ],
-  "devices": "https://mastodon.social/users/bastianallgeier/collections/devices",
-  "discoverable": true,
-  "endpoints": {
-    "sharedInbox": "https://mastodon.social/inbox"
-  },
-  "featured": "https://mastodon.social/users/bastianallgeier/collections/featured",
-  "featuredTags": "https://mastodon.social/users/bastianallgeier/collections/tags",
-  "followers": "https://mastodon.social/users/bastianallgeier/followers",
-  "following": "https://mastodon.social/users/bastianallgeier/following",
-  "icon": {
-    "mediaType": "image/jpeg",
-    "type": "Image",
-    "url": "https://files.mastodon.social/accounts/avatars/000/007/393/original/0180a20079617c71.jpg"
-  },
-  "id": "https://mastodon.social/users/bastianallgeier",
-  "image": {
-    "mediaType": "image/jpeg",
-    "type": "Image",
-    "url": "https://files.mastodon.social/accounts/headers/000/007/393/original/13d644ab46d50478.jpeg"
-  },
-  "inbox": "https://mastodon.social/users/bastianallgeier/inbox",
-  "indexable": false,
-  "manuallyApprovesFollowers": false,
-  "memorial": false,
-  "name": "Bastian Allgeier",
-  "outbox": "https://mastodon.social/users/bastianallgeier/outbox",
-  "preferredUsername": "bastianallgeier",
-  "publicKey": {
-    "id": "https://mastodon.social/users/bastianallgeier#main-key",
-    "owner": "https://mastodon.social/users/bastianallgeier",
-    "publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3fz+hpgVztO9z6HUhyzv\nwP++ERBBoIwSLKf1TyIM8bvzGFm2YXaO5uxu1HvumYFTYc3ACr3q4j8VUb7NMxkQ\nlzu4QwPjOFJ43O+fY+HSPORXEDW5fXDGC5DGpox4+i08LxRmx7L6YPRUSUuPN8nI\nWyq1Qsq1zOQrNY/rohMXkBdSXxqC3yIRqvtLt4otCgay/5tMogJWkkS6ZKyFhb9z\nwVVy1fsbV10c9C+SHy4NH26CKaTtpTYLRBMjhTCS8bX8iDSjGIf2aZgYs1ir7gEz\n9wf5CvLiENmVWGwm64t6KSEAkA4NJ1hzgHUZPCjPHZE2SmhO/oHaxokTzqtbbENJ\n1QIDAQAB\n-----END PUBLIC KEY-----\n"
-  },
-  "published": "2016-11-01T00:00:00Z",
-  "summary": "<p>Designer &amp; developer. Creator of Kirby CMS</p>",
-  "tag": [],
-  "type": "Person",
-  "url": "https://mastodon.social/@bastianallgeier"
-}
diff --git a/test/fixtures/receiver_worker_signature_activity.json b/test/fixtures/receiver_worker_signature_activity.json
index 3c3fb3fd2..19dc0087f 100644
--- a/test/fixtures/receiver_worker_signature_activity.json
+++ b/test/fixtures/receiver_worker_signature_activity.json
@@ -1,62 +1,109 @@
 {
   "@context": [
     "https://www.w3.org/ns/activitystreams",
+    "https://w3id.org/security/v1",
     {
+      "claim": {
+        "@id": "toot:claim",
+        "@type": "@id"
+      },
+      "memorial": "toot:memorial",
       "atomUri": "ostatus:atomUri",
+      "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
       "blurhash": "toot:blurhash",
-      "conversation": "ostatus:conversation",
+      "ostatus": "http://ostatus.org#",
+      "discoverable": "toot:discoverable",
       "focalPoint": {
         "@container": "@list",
         "@id": "toot:focalPoint"
       },
-      "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
-      "ostatus": "http://ostatus.org#",
+      "votersCount": "toot:votersCount",
+      "Hashtag": "as:Hashtag",
+      "Emoji": "toot:Emoji",
+      "alsoKnownAs": {
+        "@id": "as:alsoKnownAs",
+        "@type": "@id"
+      },
       "sensitive": "as:sensitive",
+      "movedTo": {
+        "@id": "as:movedTo",
+        "@type": "@id"
+      },
+      "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
+      "conversation": "ostatus:conversation",
+      "Device": "toot:Device",
+      "schema": "http://schema.org#",
       "toot": "http://joinmastodon.org/ns#",
-      "votersCount": "toot:votersCount"
-    }
-  ],
-  "atomUri": "https://chaos.social/users/distantnative/statuses/109336635639931467",
-  "attachment": [
-    {
-      "blurhash": "UAK1zS00OXIUxuMxIUM{?b-:-;W:Di?b%2M{",
-      "height": 960,
-      "mediaType": "image/jpeg",
-      "name": null,
-      "type": "Document",
-      "url": "https://assets.chaos.social/media_attachments/files/109/336/634/286/114/657/original/2e6122063d8bfb26.jpeg",
-      "width": 346
+      "cipherText": "toot:cipherText",
+      "suspended": "toot:suspended",
+      "messageType": "toot:messageType",
+      "featuredTags": {
+        "@id": "toot:featuredTags",
+        "@type": "@id"
+      },
+      "Curve25519Key": "toot:Curve25519Key",
+      "deviceId": "toot:deviceId",
+      "Ed25519Signature": "toot:Ed25519Signature",
+      "featured": {
+        "@id": "toot:featured",
+        "@type": "@id"
+      },
+      "devices": {
+        "@id": "toot:devices",
+        "@type": "@id"
+      },
+      "value": "schema:value",
+      "PropertyValue": "schema:PropertyValue",
+      "messageFranking": "toot:messageFranking",
+      "publicKeyBase64": "toot:publicKeyBase64",
+      "identityKey": {
+        "@id": "toot:identityKey",
+        "@type": "@id"
+      },
+      "Ed25519Key": "toot:Ed25519Key",
+      "indexable": "toot:indexable",
+      "EncryptedMessage": "toot:EncryptedMessage",
+      "fingerprintKey": {
+        "@id": "toot:fingerprintKey",
+        "@type": "@id"
+      }
     }
   ],
-  "attributedTo": "https://chaos.social/users/distantnative",
-  "cc": [
-    "https://chaos.social/users/distantnative/followers"
-  ],
-  "content": "<p>Favorite piece of anthropology meta discourse.</p>",
-  "contentMap": {
-    "en": "<p>Favorite piece of anthropology meta discourse.</p>"
-  },
-  "conversation": "tag:chaos.social,2022-11-13:objectId=71843781:objectType=Conversation",
-  "id": "https://chaos.social/users/distantnative/statuses/109336635639931467",
+  "actor": "https://phpc.social/users/denniskoch",
+  "cc": [],
+  "id": "https://phpc.social/users/denniskoch/statuses/112847382711461301/activity",
   "inReplyTo": null,
   "inReplyToAtomUri": null,
-  "published": "2022-11-13T13:04:20Z",
-  "replies": {
-    "first": {
-      "items": [],
-      "next": "https://chaos.social/users/distantnative/statuses/109336635639931467/replies?only_other_accounts=true&page=true",
-      "partOf": "https://chaos.social/users/distantnative/statuses/109336635639931467/replies",
-      "type": "CollectionPage"
+  "object": {
+    "atomUri": "https://phpc.social/users/denniskoch/statuses/112847382711461301",
+    "attachment": [],
+    "attributedTo": "https://phpc.social/users/denniskoch",
+    "cc": [],
+    "content": "<p><span class=\"h-card\" translate=\"no\"><a href=\"https://mastodon.social/@bastianallgeier\" class=\"u-url mention\">@<span>bastianallgeier</span></a></span> <span class=\"h-card\" translate=\"no\"><a href=\"https://chaos.social/@distantnative\" class=\"u-url mention\">@<span>distantnative</span></a></span> <span class=\"h-card\" translate=\"no\"><a href=\"https://fosstodon.org/@kev\" class=\"u-url mention\">@<span>kev</span></a></span> Another main argument: Discord is popular. Many people have an account, so you can just join an server quickly. Also you know the app and how to get around.</p>",
+    "contentMap": {
+      "en": "<p><span class=\"h-card\" translate=\"no\"><a href=\"https://mastodon.social/@bastianallgeier\" class=\"u-url mention\">@<span>bastianallgeier</span></a></span> <span class=\"h-card\" translate=\"no\"><a href=\"https://chaos.social/@distantnative\" class=\"u-url mention\">@<span>distantnative</span></a></span> <span class=\"h-card\" translate=\"no\"><a href=\"https://fosstodon.org/@kev\" class=\"u-url mention\">@<span>kev</span></a></span> Another main argument: Discord is popular. Many people have an account, so you can just join an server quickly. Also you know the app and how to get around.</p>"
     },
-    "id": "https://chaos.social/users/distantnative/statuses/109336635639931467/replies",
-    "type": "Collection"
+    "conversation": "tag:mastodon.social,2024-07-25:objectId=760068442:objectType=Conversation",
+    "id": "https://phpc.social/users/denniskoch/statuses/112847382711461301",
+    "published": "2024-07-25T13:33:29Z",
+    "replies": null,
+    "sensitive": false,
+    "tag": [],
+    "to": [
+      "https://www.w3.org/ns/activitystreams#Public"
+    ],
+    "type": "Note",
+    "url": "https://phpc.social/@denniskoch/112847382711461301"
+  },
+  "published": "2024-07-25T13:33:29Z",
+  "signature": {
+    "created": "2024-07-25T13:33:29Z",
+    "creator": "https://phpc.social/users/denniskoch#main-key",
+    "signatureValue": "slz9BKJzd2n1S44wdXGOU+bV/wsskdgAaUpwxj8R16mYOL8+DTpE6VnfSKoZGsBBJT8uG5gnVfVEz1YsTUYtymeUgLMh7cvd8VnJnZPS+oixbmBRVky/Myf91TEgQQE7G4vDmTdB4ii54hZrHcOOYYf5FKPNRSkMXboKA6LMqNtekhbI+JTUJYIB02WBBK6PUyo15f6B1RJ6HGWVgud9NE0y1EZXfrkqUt682p8/9D49ORf7AwjXUJibKic2RbPvhEBj70qUGfBm4vvgdWhSUn1IG46xh+U0+NrTSUED82j1ZVOeua/2k/igkGs8cSBkY35quXTkPz6gbqCCH66CuA==",
+    "type": "RsaSignature2017"
   },
-  "sensitive": false,
-  "summary": null,
-  "tag": [],
   "to": [
     "https://www.w3.org/ns/activitystreams#Public"
   ],
-  "type": "Note",
-  "url": "https://chaos.social/@distantnative/109336635639931467"
+  "type": "Create"
 }