From: Nutomic Date: Tue, 29 Mar 2022 15:48:29 +0000 (+0000) Subject: Add test files for Friendica federation (fixes #2144) (#2167) X-Git-Url: http://these/git/%22%7Burl%7D/static/git-logo.png?a=commitdiff_plain;h=610120067c7bf354058520c7b5740182d97be262;p=lemmy.git Add test files for Friendica federation (fixes #2144) (#2167) --- diff --git a/crates/apub/assets/friendica/activities/create_page_1.json b/crates/apub/assets/friendica/activities/create_page_1.json new file mode 100644 index 00000000..062b521e --- /dev/null +++ b/crates/apub/assets/friendica/activities/create_page_1.json @@ -0,0 +1,80 @@ +{ + "@context": [ + "https://www.w3.org/ns/activitystreams", + "https://w3id.org/security/v1", + { + "vcard": "http://www.w3.org/2006/vcard/ns#", + "dfrn": "http://purl.org/macgirvin/dfrn/1.0/", + "diaspora": "https://diasporafoundation.org/ns/", + "litepub": "http://litepub.social/ns#", + "toot": "http://joinmastodon.org/ns#", + "schema": "http://schema.org#", + "manuallyApprovesFollowers": "as:manuallyApprovesFollowers", + "sensitive": "as:sensitive", + "Hashtag": "as:Hashtag", + "directMessage": "litepub:directMessage", + "discoverable": "toot:discoverable", + "PropertyValue": "schema:PropertyValue", + "value": "schema:value" + } + ], + "id": "https://pirati.ca/objects/ec054ce7-8062-3c1b-016c-910426317080/Create", + "type": "Create", + "actor": "https://pirati.ca/profile/heluecht", + "published": "2022-03-24T07:17:21Z", + "instrument": { + "type": "Service", + "name": "Friendica 'Siberian Iris' 2022.05-dev-1452", + "url": "https://pirati.ca" + }, + "to": [ + "https://ds9.lemmy.ml/c/testcom" + ], + "cc": [ + "https://www.w3.org/ns/activitystreams#Public", + "https://ds9.lemmy.ml/c/testcom/followers" + ], + "object": { + "id": "https://pirati.ca/objects/ec054ce7-8062-3c1b-016c-910426317080", + "type": "Page", + "summary": "", + "inReplyTo": null, + "diaspora:guid": "ec054ce7-8062-3c1b-016c-910426317080", + "published": "2022-03-24T07:17:21Z", + "url": "https://www.nasaspaceflight.com/2022/03/us-eva-80/", + "attributedTo": "https://pirati.ca/profile/heluecht", + "sensitive": false, + "context": "https://pirati.ca/objects/ec054ce7-8062-3c1b-016c-910426317080#context", + "name": "ISS astronauts perform final spacewalk of Expedition 66", + "content": "Expedition 66 astronauts Raja Chari and Matthias Maurer ventured outside the International Space Station on Wednesday, performing a spacewalk to carry out repairs and upgrades on the space station.", + "contentMap": { + "de": "!testcom Expedition 66 astronauts Raja Chari and Matthias Maurer ventured outside the International Space Station on Wednesday, performing a spacewalk to carry out repairs and upgrades on the space station.
ISS astronauts perform final spacewalk of Expedition 66" + }, + "source": { + "content": "![url=https://ds9.lemmy.ml/c/testcom]testcom[/url] Expedition 66 astronauts Raja Chari and Matthias Maurer ventured outside the International Space Station on Wednesday, performing a spacewalk to carry out repairs and upgrades on the space station.\n[attachment type='link' url='https://www.nasaspaceflight.com/2022/03/us-eva-80/' title='ISS astronauts perform final spacewalk of Expedition 66' publisher_name='NASASpaceFlight.com' publisher_url='https://www.nasaspaceflight.com/' publisher_img='https://www.nasaspaceflight.com/wp-content/uploads/2017/12/logo.svg' author_name='Justin Davenport' author_url='https://www.nasaspaceflight.com/author/justin/' author_img='https://secure.gravatar.com/avatar/5dc0dc04b38dbb016bf6f15552555883?s=96&d=mm&r=g' image='https://www.nasaspaceflight.com/wp-content/uploads/2022/03/51941297402_fa7a00c1ee_o-scaled.jpg']Expedition 66 astronauts Raja Chari and Matthias Maurer ventured outside the International Space Station on…[/attachment]", + "mediaType": "text/bbcode" + }, + "attachment": [], + "tag": [ + { + "type": "Mention", + "href": "https://ds9.lemmy.ml/c/testcom", + "name": "@testcom@ds9.lemmy.ml" + } + ], + "to": [ + "https://ds9.lemmy.ml/c/testcom" + ], + "cc": [ + "https://www.w3.org/ns/activitystreams#Public", + "https://ds9.lemmy.ml/c/testcom/followers" + ] + }, + "signature": { + "type": "RsaSignature2017", + "nonce": "e68dbf66bac13fd0811863c32bbc59ab56dc0ced4a7f0df06a49b015dd142e29", + "creator": "https://pirati.ca/profile/heluecht#main-key", + "created": "2022-03-24T07:18:24Z", + "signatureValue": "T+TZbRA0DhaCG3bRRPXQmxE2bsdIk8j/cueqsXTKCOSbrWvels2B9cg3twAYIfEmtyZ/f6iKz67MnMzAc4wDS5Gm5lJ/bVoweG3+OVtgfpzYUwR85az6qEX7NS0yLNdciqpZnh5J46F8lk+SKuLGEvlGuHVAd5yYXJoSJc0slM3rVvPv1s8toLHsJzM9H9aITLfZdEo99DmGgcAcSm1lrpFlXXMc+nWGAABpvK4eTrhj1auWOs6qb4q9GUyjfg2OdYrEq+vj4tir8uP/2azJHUea2JwIYbu0Cqt13OAPWC4Znz9MZdI6NQcQvipwFRq1tvfjsonzWIkBotDK9seBxTyj1kJfDd9hcPFXQdaNI549U4JJMxenKH5Yj5tj5Df0lg2hiFOCZ5fka5qmVpqDdPni4fnkCICzKpdJwUpwDaJlwbK8tnMlS5stQv+5+fX3O7sTy2z5PiFFYR/DdHHrMAz4eEoYe9AfrUGB5XzSyHRq0YThDMW4expIGm9KZxhfYgnKPVSqmmZLDKMYD69zwV7IMGfj+W9KqbnhrW+v1JQmWSziYmz4g+ESmo+F72kaVqu1UxIi0qToOA/QDp/HOZSM+YJUCQoCL41faO5+7MNrISL8TIjAa8Y5lXrx5oAKEXEx0biqBaxinOdzuqDl8dvyVtPa/DMez8enTbcGzdQ=" + } +} diff --git a/crates/apub/assets/friendica/activities/create_page_2.json b/crates/apub/assets/friendica/activities/create_page_2.json new file mode 100644 index 00000000..9982feae --- /dev/null +++ b/crates/apub/assets/friendica/activities/create_page_2.json @@ -0,0 +1,80 @@ +{ + "@context": [ + "https://www.w3.org/ns/activitystreams", + "https://w3id.org/security/v1", + { + "vcard": "http://www.w3.org/2006/vcard/ns#", + "dfrn": "http://purl.org/macgirvin/dfrn/1.0/", + "diaspora": "https://diasporafoundation.org/ns/", + "litepub": "http://litepub.social/ns#", + "toot": "http://joinmastodon.org/ns#", + "schema": "http://schema.org#", + "manuallyApprovesFollowers": "as:manuallyApprovesFollowers", + "sensitive": "as:sensitive", + "Hashtag": "as:Hashtag", + "directMessage": "litepub:directMessage", + "discoverable": "toot:discoverable", + "PropertyValue": "schema:PropertyValue", + "value": "schema:value" + } + ], + "id": "https://pirati.ca/objects/ec054ce7-5162-3bf2-504c-16d024994850/Create", + "type": "Create", + "actor": "https://pirati.ca/profile/heluecht", + "published": "2022-03-24T04:23:44Z", + "instrument": { + "type": "Service", + "name": "Friendica 'Siberian Iris' 2022.05-dev-1452", + "url": "https://pirati.ca" + }, + "to": [ + "https://ds9.lemmy.ml/c/testcom" + ], + "cc": [ + "https://www.w3.org/ns/activitystreams#Public", + "https://ds9.lemmy.ml/c/testcom/followers" + ], + "object": { + "id": "https://pirati.ca/objects/ec054ce7-5162-3bf2-504c-16d024994850", + "type": "Article", + "summary": "", + "inReplyTo": null, + "diaspora:guid": "ec054ce7-5162-3bf2-504c-16d024994850", + "published": "2022-03-24T04:23:44Z", + "url": "https://pirati.ca/display/ec054ce7-5162-3bf2-504c-16d024994850", + "attributedTo": "https://pirati.ca/profile/heluecht", + "sensitive": false, + "context": "https://pirati.ca/objects/ec054ce7-5162-3bf2-504c-16d024994850#context", + "name": "From Friendica to Lemmy", + "content": "Hello Lemmy!", + "contentMap": { + "de": "!testcom Hello Lemmy!" + }, + "source": { + "content": "![url=https://ds9.lemmy.ml/c/testcom]testcom[/url] Hello Lemmy!", + "mediaType": "text/bbcode" + }, + "attachment": [], + "tag": [ + { + "type": "Mention", + "href": "https://ds9.lemmy.ml/c/testcom", + "name": "@testcom@ds9.lemmy.ml" + } + ], + "to": [ + "https://ds9.lemmy.ml/c/testcom" + ], + "cc": [ + "https://www.w3.org/ns/activitystreams#Public", + "https://ds9.lemmy.ml/c/testcom/followers" + ] + }, + "signature": { + "type": "RsaSignature2017", + "nonce": "d1b75df08009e59510606604758732d499c3c385b4ce6ee374e6d8c2ee86230b", + "creator": "https://pirati.ca/profile/heluecht#main-key", + "created": "2022-03-24T04:26:55Z", + "signatureValue": "nmAyEh/6Zq5Ki0AYtTFDxGom67HOTuWDzToGuEorm0cOzsNv7OIUgGjkOtKOVJA91J7NaS1hCCSMrhM7HCurIQyE3wDa3NAzhDQORVbbRF6+NxpB70nlJaOaInAS4bmVsed0rBg2aYQfrai0QB4F8zhN8JIa6zu0EAtLMh0vkzDFOCeGbvahLkSJO+sZKEqAWsr3VfMmJ8TCd+JWUKyy2/Hd87czj58oMk8yKzKKHlL0z+rbP2LbpaZspHCT+kfkZy0IOjrdcvgENCwCsPA9Y5kJmH08NXkKG6D6CGIti2zhnkNMxBuZ5sPU6PcE535J/UjfrGN3ikGoxjO3bRqFI42TbhTxBRk/yMv0BVIPLzAbPAJdJ6VAwq5UAjI6G4ejjQ9LKRqjxlG96PNo+YVKFhKTmmSMWLmdWckC8PRL2nZvq4UtIf4cd+p1pQ+TnfjD8ZHadb10tHJEXrUIz9Q/pWmfLvTSodbdYRSurWFNYaJ3gCEjSoCoHxA7GeEoivSA0IuuDRKo0tFEv09/BA9m8m04kjQ8q/ZxAb2P4TICcPZrhGKoDkRTc1P5vSNeuw8GFV/5Dy7NWKarJUlzCA1OoHo/cKWhY3fVc/lANssTyxsMakp4ofN0zRoToQAx6hDLgESJcn04tUO4JvluYkGggBEhPfhLNSyc6yUWahjh9Gc=" + } +} diff --git a/crates/apub/assets/friendica/activities/delete.json b/crates/apub/assets/friendica/activities/delete.json new file mode 100644 index 00000000..2c6d5217 --- /dev/null +++ b/crates/apub/assets/friendica/activities/delete.json @@ -0,0 +1,49 @@ +{ + "@context": [ + "https://www.w3.org/ns/activitystreams", + "https://w3id.org/security/v1", + { + "vcard": "http://www.w3.org/2006/vcard/ns#", + "dfrn": "http://purl.org/macgirvin/dfrn/1.0/", + "diaspora": "https://diasporafoundation.org/ns/", + "litepub": "http://litepub.social/ns#", + "toot": "http://joinmastodon.org/ns#", + "schema": "http://schema.org#", + "manuallyApprovesFollowers": "as:manuallyApprovesFollowers", + "sensitive": "as:sensitive", + "Hashtag": "as:Hashtag", + "directMessage": "litepub:directMessage", + "discoverable": "toot:discoverable", + "PropertyValue": "schema:PropertyValue", + "value": "schema:value" + } + ], + "id": "https://pirati.ca/objects/ec054ce7-4762-3c1c-3c25-0cc665717210/Delete", + "type": "Delete", + "actor": "https://pirati.ca/profile/heluecht", + "published": "2022-03-24T07:22:36Z", + "instrument": { + "type": "Service", + "name": "Friendica 'Siberian Iris' 2022.05-dev-1453", + "url": "https://pirati.ca" + }, + "to": [ + "https://pirati.ca/profile/test8", + "https://ds9.lemmy.ml/c/testcom" + ], + "cc": [ + "https://www.w3.org/ns/activitystreams#Public", + "https://ds9.lemmy.ml/c/testcom/followers" + ], + "object": { + "id": "https://pirati.ca/objects/ec054ce7-4762-3c1c-3c25-0cc665717210", + "type": "Tombstone" + }, + "signature": { + "type": "RsaSignature2017", + "nonce": "eecfe411c2f5b4a21354f2580593c5d6cbbafef1dfc2266c3a29d3136270e489", + "creator": "https://pirati.ca/profile/heluecht#main-key", + "created": "2022-03-24T21:43:46Z", + "signatureValue": "SCu1Qj4V4JJl+GbJB/Wy//L6DFSKc0T4lTSxI2FWD+2lyeumtDu3raqg2Kfg2uR1abWgf2T0cDLJn31wpjzAQ6QpR3tGgM7o3yHV9KIZZa0QJ7Oa/cGW0ZJijiNAETKw67cthb+hy4z6dx1M+s7wCSEQZoEZqmgn/5BMY8o0NMw/BSV797uF1tJRq29AsdIgJpjX4eX2kVmVTtYMqHc8T5/l1z3FsZFyL0UkW5BypT0T3lhGlKflov47oNSPsadHgL2A8RPdiY59OLbHCJZnQgcHA3BgeMBnwlmtpGqcfsJKUo+43zXkfKikPOO03WQ+w+LzS9UOLWhhP5yfVBLmwhM5oPfps9VUjJ/gOyWtw8pPAK/LL65sUiooxdR3fqskctVRlTDGJ8WTZPsJwsH9zygBiHOmVnkIdHkNdsA80GD9iGmnPTHixEIY124QWu+o53kydEOAbOiZo7vowjSN4ViPzkhh9xI5xkkPLeIQSEgmSsxBN98xpRVBg17qjkhBWVMCwTIqFsmzlp3oWFdp0m0xwhKJLKwlcKReoaWUCUINBgBUIfAQuWHpv7Clv7xw4pcZ1w/hiZU+1ZOnEjwGQILaGpJvK2C80z5RkhCDSamT5vetS2TrkxbjkJIY6ffUzxJQ/Ox/zN4KWyaYV6DfYELfGkybBXKo3EFhLQDARos=" + } +} diff --git a/crates/apub/assets/friendica/activities/dislike_page.json b/crates/apub/assets/friendica/activities/dislike_page.json new file mode 100644 index 00000000..f663e7c9 --- /dev/null +++ b/crates/apub/assets/friendica/activities/dislike_page.json @@ -0,0 +1,48 @@ +{ + "@context": [ + "https://www.w3.org/ns/activitystreams", + "https://w3id.org/security/v1", + { + "vcard": "http://www.w3.org/2006/vcard/ns#", + "dfrn": "http://purl.org/macgirvin/dfrn/1.0/", + "diaspora": "https://diasporafoundation.org/ns/", + "litepub": "http://litepub.social/ns#", + "toot": "http://joinmastodon.org/ns#", + "schema": "http://schema.org#", + "manuallyApprovesFollowers": "as:manuallyApprovesFollowers", + "sensitive": "as:sensitive", + "Hashtag": "as:Hashtag", + "directMessage": "litepub:directMessage", + "discoverable": "toot:discoverable", + "PropertyValue": "schema:PropertyValue", + "value": "schema:value" + } + ], + "id": "https://pirati.ca/objects/ec054ce7-5762-3ce2-b3e4-87e268433367", + "type": "Dislike", + "actor": "https://pirati.ca/profile/heluecht", + "published": "2022-03-24T21:29:23Z", + "instrument": { + "type": "Service", + "name": "Friendica 'Siberian Iris' 2022.05-dev-1453", + "url": "https://pirati.ca" + }, + "to": [ + "https://pirati.ca/profile/test8", + "https://ds9.lemmy.ml/c/testcom" + ], + "cc": [ + "https://www.w3.org/ns/activitystreams#Public", + "https://ds9.lemmy.ml/c/testcom/followers" + ], + "diaspora:guid": "ec054ce7-1862-3ce2-b3e4-870035437794", + "diaspora:like": "{\"author\":\"heluecht@pirati.ca\",\"guid\":\"ec054ce7-1862-3ce2-b3e4-870035437794\",\"parent_guid\":\"ec054ce7-2062-3bfa-8687-ca8313624820\",\"parent_type\":\"Post\",\"positive\":\"false\",\"author_signature\":\"KWp5AQ71Tn4kFgGxzgLDLQUvULKMtsb4DYwP\\/Ap9QNGStMQuKvYE2VBthRBaIvX9LmknZ3cBvuqKvNaL2Nj7B2R2Goa7\\/eWYDCogwafbp6Pj93vWvdy2+fGTkHGSxobnvgLvFIqv9IOy2Lk4QjWj7o64dUCiopR0OKjL8+vPM+l8iF+7bYeG+xSqy8SX8Fai5XOoNhy9anaJzK9ASLah8VeXKdfjGrvYsx2X\\/PaP+B8xFySP2XM95kGPKxyExi7Hk0j2igvjHqC2s3Cdg9+nwuUijnUycqGHUq3djMTLoPRjMHOJquZ1t2BNY575iRbYJTlteIgQkPHf50WALkzxn8zY5MkudBzffxm8B1Q6bnwoQHK8TR7KU2gMPwnQm6\\/ncygHuq1flVm3dqrF9xG6Cp2wC2SgTcErhrS\\/6in7FzrgBIOl570cxY0ovFICrE6rinuBdJkjfWYE3CZGCo6fVTAXUmje48c0611JmGD3PM6XQigFXGE32fjjaQoIkXf8TWI01kIqJDmZn80S6NXaYSrf9maWN1CB5gQ2E6B6Zk586sTZ2nnnJNol2KTkM1BPCTSMkrdiLtpjkUEGeo1tTe87oUzFHx++rgSO\\/lM94Dw5oN2jifGQquDBgIHY5ovxXVN3xrTgfrLEx+HWxdsiuIYpPx4lu4Qe0CVgZwPMqR4=\"}", + "object": "https://pirati.ca/objects/ec054ce7-2062-3bfa-8687-ca8313624820", + "signature": { + "type": "RsaSignature2017", + "nonce": "02cae41f51765647ceeac26de13e29757cb47b7da1b54703116a7ae185fe967e", + "creator": "https://pirati.ca/profile/heluecht#main-key", + "created": "2022-03-24T21:32:43Z", + "signatureValue": "C27zo2Ks9twwhMs3WndG3c8l6y6PVM/4fUZKIxHuh50eEx2g9hIRUD0GFgxR5Mbx76E0PDePbJtrEaad+H97USmylFYw+Opp12zAkpFMMsKQgZfSG6ARyKfn/AK6qn/+5gmxAvX5qTMw29Qsbhh9w7mlyYfqZb+A5xmdxi/kV7FAa5AEK9UR8wsCb6FeHhpRPBmSGFqluFyPY0m8uYHwLILZac+KkvQz2+dVQkpt5S+C2N4POxFYQwd1mEoone4HQQtSEfnrlbxLbyCgLKM4Vf6SJnzzyufTzurSySp4kmsnTxfUKsR200TUAozwWBde9UyEjdcv/j1m/ZX18YHzwE4OwAGF6G1LCDAXcwzmH3RvjJwGsFuTz68lZJ5qcAbHvsGxymPJf2RTfLS0I7E2JWZ/yStcwtm9siHNBhusUq7lwJWWkwYw4iuoZBHNT24gj0uTbj82jB5UAIlFyIXbIbR8Di70Jg2ucvQK36XKm6/6TGntkoJ3VGa1qIhB/r0KiVTBPwPSrf8v0sHB6zc3osirpyG8Gzd+FVMs11UaGDQOIur4Bu1/StmuWdh3VFwFE9t4XaR1OEIRexYh4717B8ImfPbSTtyqsc8mE0Hvp+3wkLaD4l889Zu0BGNK9KXvT2ifKGhCg/Q8mM89oNnb4Fsl3Uu5fp8GtE3RPBt4a/g=" + } +} diff --git a/crates/apub/assets/friendica/activities/like_page.json b/crates/apub/assets/friendica/activities/like_page.json new file mode 100644 index 00000000..4ad98e26 --- /dev/null +++ b/crates/apub/assets/friendica/activities/like_page.json @@ -0,0 +1,48 @@ +{ + "@context": [ + "https://www.w3.org/ns/activitystreams", + "https://w3id.org/security/v1", + { + "vcard": "http://www.w3.org/2006/vcard/ns#", + "dfrn": "http://purl.org/macgirvin/dfrn/1.0/", + "diaspora": "https://diasporafoundation.org/ns/", + "litepub": "http://litepub.social/ns#", + "toot": "http://joinmastodon.org/ns#", + "schema": "http://schema.org#", + "manuallyApprovesFollowers": "as:manuallyApprovesFollowers", + "sensitive": "as:sensitive", + "Hashtag": "as:Hashtag", + "directMessage": "litepub:directMessage", + "discoverable": "toot:discoverable", + "PropertyValue": "schema:PropertyValue", + "value": "schema:value" + } + ], + "id": "https://pirati.ca/objects/ec054ce7-2062-3ce2-7f10-2b4451595945", + "type": "Like", + "actor": "https://pirati.ca/profile/heluecht", + "published": "2022-03-24T21:28:31Z", + "instrument": { + "type": "Service", + "name": "Friendica 'Siberian Iris' 2022.05-dev-1453", + "url": "https://pirati.ca" + }, + "to": [ + "https://pirati.ca/profile/test8", + "https://ds9.lemmy.ml/c/testcom" + ], + "cc": [ + "https://www.w3.org/ns/activitystreams#Public", + "https://ds9.lemmy.ml/c/testcom/followers" + ], + "diaspora:guid": "ec054ce7-1062-3ce2-7f10-2a6640956978", + "diaspora:like": "{\"author\":\"heluecht@pirati.ca\",\"guid\":\"ec054ce7-1062-3ce2-7f10-2a6640956978\",\"parent_guid\":\"ec054ce7-2062-3bfa-8687-ca8313624820\",\"parent_type\":\"Post\",\"positive\":\"true\",\"author_signature\":\"F7e4x++hte0pSoUwbB6BcK0gl1c4+FjxlhwjTMvmxnB4HL58Kxk8UJ\\/SiTS5g4IoDoRcvQdIgntuHZJfKx3SsIDyWQUP1U9+RrBJh1gskcVmTT15gb2E5qq30PNM8DFV0opewp33KCVWvqqkZ2DIhjiRqqF8eUASUNkdwQci732krkMul\\/B211qBbSndxLPdrqv5Wkl0F2mZJZLIiWRoIjaFNV60lUkOwdqz8p7OuD\\/DdR\\/T8g4s7ofuvKaZ\\/scpxqixYHvv7+0cWXBlsKllW97dH1VHo7SdvJKhApk2IQz9BT8JWcBhBYjkb71olF2gajo6EQxaXt2svEOtRi+mDVQ4Lb6gk\\/Fp5aC5BVAe5Fe4Wr2GUOLmo5P6Fc6IweaoTgcqH2os2OYc\\/isJtQ2jtUtw8smY7kPSa2Qo\\/FMLWyCI8XRrWI9XGo8uSA84E+eiSVuGfqYNQNDkhzr5qCZfiF457SsxFpGa3XI53IA24Iatkj91VGSMQ8OWppK7SERwax2mVc5tn7mSq+2va0k9DiLyLoHVdEdzQcjEGCWEW7rPz7ndKBT3cW\\/jjsww3znAOko7jloXWremEtiqBIZkmHhA+Ec9UnOcShedqz\\/oIB\\/IYVUhwD3STG7EpRjh6J6G0FoU1MieCKjtpSadHN+2GN4COzNTE9iIi9Uqonf4Xio=\"}", + "object": "https://pirati.ca/objects/ec054ce7-2062-3bfa-8687-ca8313624820", + "signature": { + "type": "RsaSignature2017", + "nonce": "3913cfa1f27e2e83ef770a414e477d4aac9878d1270e9056fc793fdf0a4e07d5", + "creator": "https://pirati.ca/profile/heluecht#main-key", + "created": "2022-03-24T21:33:58Z", + "signatureValue": "uJBDZ4NIKTmcoh2ONypglOZ0El3RtgGeF5X2XSdy8V6QmLD6meUWVMQlcbs0LosSzXX1wxMJsj6QtnFPWEAneRW/gBa5N+F/+vkrnnodbO9CvDfwRIfmWqCNC5Hg4uGVukHbhCwsQkgKoRj9YjQVt0FSSrC5X/NcwiS7ZJkwsHuzv+ZZZE+GArkSQLcf4eOrK7wT1NY0fGGbjeO7+KpJH75kAGI+Yi1BuiGy7tl3dTIdGYb66j+e5RpeZR1AlueLKBB2lN2eT8DS0PwaGVjrgKQQ+riIUV8pWhrlWsoWj1u9ZELXOYUuFsjqzmNPeSU3cnxGcLSvAKmc7j2dm6ErCLFiadaodamYDR0Fqb9yd/IM3ojyxmAQRAMABCnhIppQWkOw5l1koJ2gHmnljh162sFsnifo7ccNuRHYUJjJxwsdQ9aLaAWHySqXDfRk+Hvf5G67+edlETr3XYmVtW96J0ZyQALp/I0QMbPR2Xa/b8RClms0QxNOBwVn8YswLWRZ2XgjQfxoCkRHSbY5nU6e65I4QBiAlSzHNOffNO4LYxj0GPDbEFZy9dFiv9EC9eN/FtIhkykV46PJTuM+hKneh1PLCmkkICWrj7dvPXT/00eQmvZcQTq/tNKlrbzBWQ8DnG6/3GZMyBPgsWk/E0aUwvwGlcQEwYWmzI1NWBe/XMc=" + } +} diff --git a/crates/apub/assets/friendica/activities/undo_dislike_page.json b/crates/apub/assets/friendica/activities/undo_dislike_page.json new file mode 100644 index 00000000..958d22b2 --- /dev/null +++ b/crates/apub/assets/friendica/activities/undo_dislike_page.json @@ -0,0 +1,67 @@ +{ + "@context": [ + "https://www.w3.org/ns/activitystreams", + "https://w3id.org/security/v1", + { + "vcard": "http://www.w3.org/2006/vcard/ns#", + "dfrn": "http://purl.org/macgirvin/dfrn/1.0/", + "diaspora": "https://diasporafoundation.org/ns/", + "litepub": "http://litepub.social/ns#", + "toot": "http://joinmastodon.org/ns#", + "schema": "http://schema.org#", + "manuallyApprovesFollowers": "as:manuallyApprovesFollowers", + "sensitive": "as:sensitive", + "Hashtag": "as:Hashtag", + "directMessage": "litepub:directMessage", + "discoverable": "toot:discoverable", + "PropertyValue": "schema:PropertyValue", + "value": "schema:value" + } + ], + "id": "https://pirati.ca/objects/ec054ce7-5762-3ce2-b3e4-87e268433367/Undo", + "type": "Undo", + "actor": "https://pirati.ca/profile/heluecht", + "published": "2022-03-24T21:29:23Z", + "instrument": { + "type": "Service", + "name": "Friendica 'Siberian Iris' 2022.05-dev-1453", + "url": "https://pirati.ca" + }, + "to": [ + "https://pirati.ca/profile/test8", + "https://ds9.lemmy.ml/c/testcom" + ], + "cc": [ + "https://www.w3.org/ns/activitystreams#Public", + "https://ds9.lemmy.ml/c/testcom/followers" + ], + "object": { + "id": "https://pirati.ca/objects/ec054ce7-5762-3ce2-b3e4-87e268433367", + "type": "Dislike", + "actor": "https://pirati.ca/profile/heluecht", + "published": "2022-03-24T21:29:23Z", + "instrument": { + "type": "Service", + "name": "Friendica 'Siberian Iris' 2022.05-dev-1453", + "url": "https://pirati.ca" + }, + "to": [ + "https://pirati.ca/profile/test8", + "https://ds9.lemmy.ml/c/testcom" + ], + "cc": [ + "https://www.w3.org/ns/activitystreams#Public", + "https://ds9.lemmy.ml/c/testcom/followers" + ], + "diaspora:guid": "ec054ce7-1862-3ce2-b3e4-870035437794", + "diaspora:like": "{\"author\":\"heluecht@pirati.ca\",\"guid\":\"ec054ce7-1862-3ce2-b3e4-870035437794\",\"parent_guid\":\"ec054ce7-2062-3bfa-8687-ca8313624820\",\"parent_type\":\"Post\",\"positive\":\"false\",\"author_signature\":\"KWp5AQ71Tn4kFgGxzgLDLQUvULKMtsb4DYwP\\/Ap9QNGStMQuKvYE2VBthRBaIvX9LmknZ3cBvuqKvNaL2Nj7B2R2Goa7\\/eWYDCogwafbp6Pj93vWvdy2+fGTkHGSxobnvgLvFIqv9IOy2Lk4QjWj7o64dUCiopR0OKjL8+vPM+l8iF+7bYeG+xSqy8SX8Fai5XOoNhy9anaJzK9ASLah8VeXKdfjGrvYsx2X\\/PaP+B8xFySP2XM95kGPKxyExi7Hk0j2igvjHqC2s3Cdg9+nwuUijnUycqGHUq3djMTLoPRjMHOJquZ1t2BNY575iRbYJTlteIgQkPHf50WALkzxn8zY5MkudBzffxm8B1Q6bnwoQHK8TR7KU2gMPwnQm6\\/ncygHuq1flVm3dqrF9xG6Cp2wC2SgTcErhrS\\/6in7FzrgBIOl570cxY0ovFICrE6rinuBdJkjfWYE3CZGCo6fVTAXUmje48c0611JmGD3PM6XQigFXGE32fjjaQoIkXf8TWI01kIqJDmZn80S6NXaYSrf9maWN1CB5gQ2E6B6Zk586sTZ2nnnJNol2KTkM1BPCTSMkrdiLtpjkUEGeo1tTe87oUzFHx++rgSO\\/lM94Dw5oN2jifGQquDBgIHY5ovxXVN3xrTgfrLEx+HWxdsiuIYpPx4lu4Qe0CVgZwPMqR4=\"}", + "object": "https://pirati.ca/objects/ec054ce7-2062-3bfa-8687-ca8313624820" + }, + "signature": { + "type": "RsaSignature2017", + "nonce": "1e0f4ed490473423292524d96f3d13f7fb1425599dfadd614b174ad77eb77019", + "creator": "https://pirati.ca/profile/heluecht#main-key", + "created": "2022-03-24T21:41:48Z", + "signatureValue": "PAA2RTSvWKABq84fxlbvR1UZbIvDhoECyP5rSr5mP2nGFMo+BBhOq4Enq7SO/fiNOctILaLP4cdExyHZdYs7J64jCdfScuz6h2WZIlnKGEsR7mfDeUANboXqRbTKoyisA8vS3+BSSi4T2gjiyF3GGJLxUEcpOpD7T6G2BHQCQGbDSfue71Pygs6Z2RjCdLG1NiT6basjCKamrwxC+UYqzN3mCYLqpzBB3YD8/ql+1uqPPo3TI8CyQqq8ThEzYvXOI1eJcn0H9itD3WForGs9EQ/P39YGqrT40kx+mzhMBl16BnSO9sFHwJGd+Udi0DPrwlbCdJTuTEXJyvt6VRsyXYXe50aci+msm7MS2F+WaZZpbkxCbQNkJYfF2+yV/bDmhbvexT3avObytKGZURR+jo1UCRTwD5x4LZU/8Bvg6epsYmIXqLuuifbsrELpk+zhoHZD2drbRLWJM9KGHIK2EYtQlfvk7bDCQ/ukRns9G74JZYykqLxGhLFqd51JW2yUohmv4YoEFStXVCpInQGVQigxxO7qoCTbNiFhO7mTpd0gdx2kR4g83QJpPq6ZPaqag7z+zf3IPxA9WsZgfS66CAl6lqOK5jYkLr7JOejOU7oguHUfF6P89F2MDRoBTp6wVFL1z+rTGozyPr5mpgAAN1ambv/3ouUJdJ0Q9c6vvcE=" + } +} diff --git a/crates/apub/assets/friendica/activities/update_note.json b/crates/apub/assets/friendica/activities/update_note.json new file mode 100644 index 00000000..6c006096 --- /dev/null +++ b/crates/apub/assets/friendica/activities/update_note.json @@ -0,0 +1,88 @@ +{ + "@context": [ + "https://www.w3.org/ns/activitystreams", + "https://w3id.org/security/v1", + { + "vcard": "http://www.w3.org/2006/vcard/ns#", + "dfrn": "http://purl.org/macgirvin/dfrn/1.0/", + "diaspora": "https://diasporafoundation.org/ns/", + "litepub": "http://litepub.social/ns#", + "toot": "http://joinmastodon.org/ns#", + "schema": "http://schema.org#", + "manuallyApprovesFollowers": "as:manuallyApprovesFollowers", + "sensitive": "as:sensitive", + "Hashtag": "as:Hashtag", + "directMessage": "litepub:directMessage", + "discoverable": "toot:discoverable", + "PropertyValue": "schema:PropertyValue", + "value": "schema:value" + } + ], + "id": "https://pirati.ca/objects/ec054ce7-4762-3c1c-3c25-0cc665717210/Update", + "type": "Update", + "actor": "https://pirati.ca/profile/heluecht", + "published": "2022-03-24T07:22:36Z", + "instrument": { + "type": "Service", + "name": "Friendica 'Siberian Iris' 2022.05-dev-1453", + "url": "https://pirati.ca" + }, + "to": [ + "https://pirati.ca/profile/test8", + "https://ds9.lemmy.ml/c/testcom" + ], + "cc": [ + "https://www.w3.org/ns/activitystreams#Public", + "https://ds9.lemmy.ml/c/testcom/followers" + ], + "object": { + "id": "https://pirati.ca/objects/ec054ce7-4762-3c1c-3c25-0cc665717210", + "type": "Note", + "summary": "", + "inReplyTo": "https://pirati.ca/objects/ec054ce7-2062-3bfa-8687-ca8313624820", + "diaspora:guid": "ec054ce7-4762-3c1c-3c25-0cc665717210", + "published": "2022-03-24T07:22:36Z", + "updated": "2022-03-24T21:37:34Z", + "url": "https://pirati.ca/display/ec054ce7-4762-3c1c-3c25-0cc665717210", + "attributedTo": "https://pirati.ca/profile/heluecht", + "sensitive": false, + "context": "https://pirati.ca/objects/ec054ce7-2062-3bfa-8687-ca8313624820#context", + "content": "@test8 This is an edited comment.", + "contentMap": { + "de": "This is an edited comment." + }, + "source": { + "content": "This is an edited comment.", + "mediaType": "text/bbcode" + }, + "diaspora:comment": "{\"author\":\"heluecht@pirati.ca\",\"guid\":\"ec054ce7-4762-3c1c-3c25-0cc665717210\",\"created_at\":\"2022-03-24T07:22:36Z\",\"edited_at\":\"2022-03-24T07:22:36Z\",\"parent_guid\":\"ec054ce7-2062-3bfa-8687-ca8313624820\",\"text\":\"This is a comment.\",\"author_signature\":\"oqthcfSIjETYRshGeN0Zq9yGJ9+bbghdzMH4Vfl\\/kxDyNQe7tsvK6M5cQlM46h2+jmpK2Okb4mK7K6Yenh+6aH2sJKIyMUdKIINzhp9Gav31sUtHf4\\/A0x1aqqTp1oLvnc5uKdKdIGaSdODUZY\\/ABmDjin5sE1gjIBlAkAlhvdhy\\/k+4c3UCFtazjawb1oXbh94uSgu4DxseBec4Kn5laWNwLhZLdx9PMSN1mhNqz2rnF6gWAlrlaLLeRDawh2AS5t2TUPH92QY818DW9b0rF9Gz4w1PtEIkzXDd6u\\/VEMMrwmRtd8SSDgnDPFzH4HqZDf1Y4TnQixZIqgUyv9zsiNT0pg0vOXTkuQ7hJ7hj6BI92SISTtQnEVhZBmW+i22roFs87EbSb5e6Yy4+2YphjCUd2NWlyrtG1UTR1hzCN+kzKIQU34zgXTtnwvYhi6wz71Lh3w1VoQbLthxpG1t1WRsXQ\\/QZNUNInyHyIgzWTcWAS6MdzVnmXSV+1080PQ5zFWbR6Tft3YySyk8iIyhdhTAjfEDGTRGHciiPtLBPQFlHMPTiMZjEWFnBZuhDhOrA6OazONXHRO09Xr6S\\/+ZudMvEOAG1FvcBec6gWRZdcma6UBi+2M3ay3dYFJw4+fG4XZh3H\\/sCA\\/q8MUgreP3t9q\\/wzxCW\\/BXZAv4u2FvwKvw=\"}", + "attachment": [], + "tag": [ + { + "type": "Mention", + "href": "https://pirati.ca/profile/test8", + "name": "@test8@pirati.ca" + }, + { + "type": "Mention", + "href": "https://ds9.lemmy.ml/c/testcom", + "name": "@testcom@ds9.lemmy.ml" + } + ], + "to": [ + "https://pirati.ca/profile/test8", + "https://ds9.lemmy.ml/c/testcom" + ], + "cc": [ + "https://www.w3.org/ns/activitystreams#Public", + "https://ds9.lemmy.ml/c/testcom/followers" + ] + }, + "signature": { + "type": "RsaSignature2017", + "nonce": "534f3e33435fa56911a12094d9918002b2d734794609019793603116b6509a54", + "creator": "https://pirati.ca/profile/heluecht#main-key", + "created": "2022-03-24T21:37:50Z", + "signatureValue": "lhLotVmAv22CmiYCSmQgQA/X38ype7o89iJIC0I2FzIWGQkvZz58YAxpmW047Z2hT2qm15sV02bPgyoOBXAdXd+M8WNwz+cNwU1cE7QNZ7102Y+tQRgpTfHz+e57QwUXESo46xAG0qSVu0UQMm+3uCUFYWKgHEmAXy89sp//3J/vJtI2+3jbaC9YWdsBe8XwcoHeelnX7f8LNniRnZIkKTLfoOhcEIHAJkEV4otSCOfzwGHN0SqbGlK9xWBPQhgtN3GvnOZU9zhNQMsQiX+9Wb2X4NLXs0tTRkDubF78stH+0xbep7ZfyvRNLoebPtecN8dMnfHQs8y0a9iG9tuNjcwht2ezIwf1h140+iB8znav35sA6LzgcfEyzU8O6JYF9p9x3tCw2rcMMiy/f7mvOLCP/05d0GEoUNZXrfuXf/osysMYp1Y05Lkze5WqTMu7sEW6jDx8r1NTE6s88wqZAJa56G5NVxG5vU3Cj7yscI6LQiqaUDilVHLa+DzR0pQEUSSh2J1PgBFT2KKPZIY22UinDgI1QNl+Dhfj2nPzf/xXssuDTvWyU8vJzXc2MZNqFz7ds7tNdea6laLiMl7nOnMo1wz1f+w1bn4Y1YR/iwFgaqo2WEt+cIzAaN4dUw00WlXPCNNhrgaXHxlXI6SeFtviUfwz/dehcfbxMTxX7e0=" + } +} diff --git a/crates/apub/assets/friendica/objects/note.json b/crates/apub/assets/friendica/objects/note.json index 4c23babe..17c66956 100644 --- a/crates/apub/assets/friendica/objects/note.json +++ b/crates/apub/assets/friendica/objects/note.json @@ -53,4 +53,4 @@ "cc": [ "https://soc.schuerz.at/followers/jakob" ] -} \ No newline at end of file +} diff --git a/crates/apub/assets/friendica/objects/page_1.json b/crates/apub/assets/friendica/objects/page_1.json new file mode 100644 index 00000000..eeb98757 --- /dev/null +++ b/crates/apub/assets/friendica/objects/page_1.json @@ -0,0 +1,55 @@ +{ + "@context": [ + "https://www.w3.org/ns/activitystreams", + "https://w3id.org/security/v1", + { + "vcard": "http://www.w3.org/2006/vcard/ns#", + "dfrn": "http://purl.org/macgirvin/dfrn/1.0/", + "diaspora": "https://diasporafoundation.org/ns/", + "litepub": "http://litepub.social/ns#", + "toot": "http://joinmastodon.org/ns#", + "schema": "http://schema.org#", + "manuallyApprovesFollowers": "as:manuallyApprovesFollowers", + "sensitive": "as:sensitive", + "Hashtag": "as:Hashtag", + "directMessage": "litepub:directMessage", + "discoverable": "toot:discoverable", + "PropertyValue": "schema:PropertyValue", + "value": "schema:value" + } + ], + "id": "https://pirati.ca/objects/ec054ce7-8062-3c1b-016c-910426317080", + "type": "Page", + "summary": "", + "inReplyTo": null, + "diaspora:guid": "ec054ce7-8062-3c1b-016c-910426317080", + "published": "2022-03-24T07:17:21Z", + "url": "https://www.nasaspaceflight.com/2022/03/us-eva-80/", + "attributedTo": "https://pirati.ca/profile/heluecht", + "sensitive": false, + "context": "https://pirati.ca/objects/ec054ce7-8062-3c1b-016c-910426317080#context", + "name": "ISS astronauts perform final spacewalk of Expedition 66", + "content": "Expedition 66 astronauts Raja Chari and Matthias Maurer ventured outside the International Space Station on Wednesday, performing a spacewalk to carry out repairs and upgrades on the space station.", + "contentMap": { + "de": "!testcom Expedition 66 astronauts RajaChari and Matthias Maurer ventured outside the International Space Station on Wednesday, performing a spacewalk to carry out repairs and upgrades on the space station.
ISS astronauts perform final spacewalk of Expedition 66" + }, + "source": { + "content": "![url=https://ds9.lemmy.ml/c/testcom]testcom[/url] Expedition 66 astronauts Raja Chari and Matthias Maurer ventured outside the International Space Station on Wednesday, performing a spacewalk to carry out repairs and upgrades on the space station.\n[attachment type='link' url='https://www.nasaspaceflight.com/2022/03/us-eva-80/' title='ISS astronauts perform final spacewalk of Expedition 66' publisher_name='NASASpaceFlight.com' publisher_url='https://www.nasaspaceflight.com/' publisher_img='https://www.nasaspaceflight.com/wp-content/uploads/2017/12/logo.svg' author_name='Justin Davenport' author_url='https://www.nasaspaceflight.com/author/justin/' author_img='https://secure.gravatar.com/avatar/5dc0dc04b38dbb016bf6f15552555883?s=96&d=mm&r=g' image='https://www.nasaspaceflight.com/wp-content/uploads/2022/03/51941297402_fa7a00c1ee_o-scaled.jpg']Expedition 66 astronauts Raja Chari and Matthias Maurer ventured outside the International Space Station on…[/attachment]", + "mediaType": "text/bbcode" + }, + "attachment": [], + "tag": [ + { + "type": "Mention", + "href": "https://ds9.lemmy.ml/c/testcom", + "name": "@testcom@ds9.lemmy.ml" + } + ], + "to": [ + "https://ds9.lemmy.ml/c/testcom" + ], + "cc": [ + "https://www.w3.org/ns/activitystreams#Public", + "https://ds9.lemmy.ml/c/testcom/followers" + ] +} diff --git a/crates/apub/assets/friendica/objects/page_2.json b/crates/apub/assets/friendica/objects/page_2.json new file mode 100644 index 00000000..92fcfc7f --- /dev/null +++ b/crates/apub/assets/friendica/objects/page_2.json @@ -0,0 +1,55 @@ +{ + "@context": [ + "https://www.w3.org/ns/activitystreams", + "https://w3id.org/security/v1", + { + "vcard": "http://www.w3.org/2006/vcard/ns#", + "dfrn": "http://purl.org/macgirvin/dfrn/1.0/", + "diaspora": "https://diasporafoundation.org/ns/", + "litepub": "http://litepub.social/ns#", + "toot": "http://joinmastodon.org/ns#", + "schema": "http://schema.org#", + "manuallyApprovesFollowers": "as:manuallyApprovesFollowers", + "sensitive": "as:sensitive", + "Hashtag": "as:Hashtag", + "directMessage": "litepub:directMessage", + "discoverable": "toot:discoverable", + "PropertyValue": "schema:PropertyValue", + "value": "schema:value" + } + ], + "id": "https://pirati.ca/objects/ec054ce7-5162-3bf2-504c-16d024994850", + "type": "Article", + "summary": "", + "inReplyTo": null, + "diaspora:guid": "ec054ce7-5162-3bf2-504c-16d024994850", + "published": "2022-03-24T04:23:44Z", + "url": "https://pirati.ca/display/ec054ce7-5162-3bf2-504c-16d024994850", + "attributedTo": "https://pirati.ca/profile/heluecht", + "sensitive": false, + "context": "https://pirati.ca/objects/ec054ce7-5162-3bf2-504c-16d024994850#context", + "name": "From Friendica to Lemmy", + "content": "Hello Lemmy!", + "contentMap": { + "de": "!testcom Hello Lemmy!" + }, + "source": { + "content": "![url=https://ds9.lemmy.ml/c/testcom]testcom[/url] Hello Lemmy!", + "mediaType": "text/bbcode" + }, + "attachment": [], + "tag": [ + { + "type": "Mention", + "href": "https://ds9.lemmy.ml/c/testcom", + "name": "@testcom@ds9.lemmy.ml" + } + ], + "to": [ + "https://ds9.lemmy.ml/c/testcom" + ], + "cc": [ + "https://www.w3.org/ns/activitystreams#Public", + "https://ds9.lemmy.ml/c/testcom/followers" + ] +} diff --git a/crates/apub/src/protocol/activities/mod.rs b/crates/apub/src/protocol/activities/mod.rs index 38c9e345..4301ed59 100644 --- a/crates/apub/src/protocol/activities/mod.rs +++ b/crates/apub/src/protocol/activities/mod.rs @@ -21,7 +21,7 @@ mod tests { create_or_update::{comment::CreateOrUpdateComment, post::CreateOrUpdatePost}, deletion::delete::Delete, following::{follow::FollowCommunity, undo_follow::UndoFollowCommunity}, - voting::vote::Vote, + voting::{undo_vote::UndoVote, vote::Vote}, }, tests::test_json, }; @@ -54,7 +54,14 @@ mod tests { #[test] fn test_parse_friendica_activities() { + test_json::("assets/friendica/activities/create_page_1.json").unwrap(); + test_json::("assets/friendica/activities/create_page_2.json").unwrap(); test_json::("assets/friendica/activities/create_note.json").unwrap(); + test_json::("assets/friendica/activities/update_note.json").unwrap(); + test_json::("assets/friendica/activities/delete.json").unwrap(); + test_json::("assets/friendica/activities/like_page.json").unwrap(); + test_json::("assets/friendica/activities/dislike_page.json").unwrap(); + test_json::("assets/friendica/activities/undo_dislike_page.json").unwrap(); } #[test] diff --git a/crates/apub/src/protocol/objects/mod.rs b/crates/apub/src/protocol/objects/mod.rs index 2d5f9be3..e7971366 100644 --- a/crates/apub/src/protocol/objects/mod.rs +++ b/crates/apub/src/protocol/objects/mod.rs @@ -72,6 +72,8 @@ mod tests { #[test] fn test_parse_object_friendica() { test_json::("assets/friendica/objects/person.json").unwrap(); + test_json::("assets/friendica/objects/page_1.json").unwrap(); + test_json::("assets/friendica/objects/page_2.json").unwrap(); test_json::("assets/friendica/objects/note.json").unwrap(); } diff --git a/crates/apub/src/protocol/objects/page.rs b/crates/apub/src/protocol/objects/page.rs index a8a8b772..58b39226 100644 --- a/crates/apub/src/protocol/objects/page.rs +++ b/crates/apub/src/protocol/objects/page.rs @@ -19,6 +19,7 @@ use url::Url; #[derive(Clone, Debug, Deserialize, Serialize)] pub enum PageType { Page, + Article, Note, }