From 95f902b12be2766a4f9e122140b825f3a4a6d313 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 14 May 2022 03:24:40 -0600 Subject: [PATCH] Fix json-ld attributes, fixes #3423 --- app/Transformer/ActivityPub/Verb/CreateNote.php | 8 ++++---- app/Transformer/ActivityPub/Verb/CreateQuestion.php | 10 +++++----- app/Transformer/ActivityPub/Verb/DeleteNote.php | 7 ++----- app/Transformer/ActivityPub/Verb/Note.php | 8 ++++---- app/Transformer/ActivityPub/Verb/Question.php | 10 +++++----- 5 files changed, 20 insertions(+), 23 deletions(-) diff --git a/app/Transformer/ActivityPub/Verb/CreateNote.php b/app/Transformer/ActivityPub/Verb/CreateNote.php index e7d542414..6a1a0e67b 100644 --- a/app/Transformer/ActivityPub/Verb/CreateNote.php +++ b/app/Transformer/ActivityPub/Verb/CreateNote.php @@ -60,10 +60,10 @@ class CreateNote extends Fractal\TransformerAbstract 'Hashtag' => 'as:Hashtag', 'sensitive' => 'as:sensitive', 'commentsEnabled' => 'sc:Boolean', - 'capabilities' => [ - 'announce' => ['@type' => '@id'], - 'like' => ['@type' => '@id'], - 'reply' => ['@type' => '@id'] + '@capabilities' => [ + '@announce' => '@id', + '@like' => '@id', + '@reply' => '@id', ], 'toot' => 'http://joinmastodon.org/ns#', 'Emoji' => 'toot:Emoji' diff --git a/app/Transformer/ActivityPub/Verb/CreateQuestion.php b/app/Transformer/ActivityPub/Verb/CreateQuestion.php index a1aaccdc2..1ef2efc43 100644 --- a/app/Transformer/ActivityPub/Verb/CreateQuestion.php +++ b/app/Transformer/ActivityPub/Verb/CreateQuestion.php @@ -23,11 +23,11 @@ class CreateQuestion extends Fractal\TransformerAbstract 'Hashtag' => 'as:Hashtag', 'sensitive' => 'as:sensitive', 'commentsEnabled' => 'sc:Boolean', - 'capabilities' => [ - 'announce' => ['@type' => '@id'], - 'like' => ['@type' => '@id'], - 'reply' => ['@type' => '@id'] - ] + '@capabilities' => [ + '@announce' => '@id', + '@like' => '@id', + '@reply' => '@id', + ], ] ], 'id' => $status->permalink(), diff --git a/app/Transformer/ActivityPub/Verb/DeleteNote.php b/app/Transformer/ActivityPub/Verb/DeleteNote.php index 01a2704f2..d34673aae 100644 --- a/app/Transformer/ActivityPub/Verb/DeleteNote.php +++ b/app/Transformer/ActivityPub/Verb/DeleteNote.php @@ -10,10 +10,7 @@ class DeleteNote extends Fractal\TransformerAbstract public function transform(Status $status) { return [ - '@context' => [ - 'https://www.w3.org/ns/activitystreams', - 'https://w3id.org/security/v1', - ], + '@context' => 'https://www.w3.org/ns/activitystreams', 'id' => $status->permalink('#delete'), 'type' => 'Delete', 'actor' => $status->profile->permalink(), @@ -24,4 +21,4 @@ class DeleteNote extends Fractal\TransformerAbstract ]; } -} \ No newline at end of file +} diff --git a/app/Transformer/ActivityPub/Verb/Note.php b/app/Transformer/ActivityPub/Verb/Note.php index 2c34412f5..464bf6df4 100644 --- a/app/Transformer/ActivityPub/Verb/Note.php +++ b/app/Transformer/ActivityPub/Verb/Note.php @@ -61,10 +61,10 @@ class Note extends Fractal\TransformerAbstract 'Hashtag' => 'as:Hashtag', 'sensitive' => 'as:sensitive', 'commentsEnabled' => 'sc:Boolean', - 'capabilities' => [ - 'announce' => ['@type' => '@id'], - 'like' => ['@type' => '@id'], - 'reply' => ['@type' => '@id'], + '@capabilities' => [ + '@announce' => '@id', + '@like' => '@id', + '@reply' => '@id', ], 'toot' => 'http://joinmastodon.org/ns#', 'Emoji' => 'toot:Emoji' diff --git a/app/Transformer/ActivityPub/Verb/Question.php b/app/Transformer/ActivityPub/Verb/Question.php index fd78ce2ff..32898d138 100644 --- a/app/Transformer/ActivityPub/Verb/Question.php +++ b/app/Transformer/ActivityPub/Verb/Question.php @@ -40,11 +40,11 @@ class Question extends Fractal\TransformerAbstract 'Hashtag' => 'as:Hashtag', 'sensitive' => 'as:sensitive', 'commentsEnabled' => 'sc:Boolean', - 'capabilities' => [ - 'announce' => ['@type' => '@id'], - 'like' => ['@type' => '@id'], - 'reply' => ['@type' => '@id'] - ] + '@capabilities' => [ + '@announce' => '@id', + '@like' => '@id', + '@reply' => '@id', + ], ] ], 'id' => $status->url(),