Merge branch 'staging' into patch-4

CHANGELOG.md

@@ -9,6 +9,8 @@
 - Hardcode UTC application timezone to prevent timezone issues ([b0d2c5e1](https://github.com/pixelfed/pixelfed/commit/b0d2c5e1))
 - Remove arbitrary metro url redirect timeout ([84209c24](https://github.com/pixelfed/pixelfed/commit/84209c24))
 - Add trusted proxies flag to admin dashboard diagnostics ([#3450](https://github.com/pixelfed/pixelfed/pull/3450))
+- Fix json-ld attributes, fixes #3423 ([95f902b1](https://github.com/pixelfed/pixelfed/commit/95f902b1))
+- Update exp config, enforce mastoapi compatibility by default ([a160b233](https://github.com/pixelfed/pixelfed/commit/a160b233))
 
 ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3)
 

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'		=> [
+					'@capabilities'		=> [
-						'announce'		=> ['@type' => '@id'],
+						'@announce'			=> '@id',
-						'like'			=> ['@type' => '@id'],
+						'@like'				=> '@id',
-						'reply'			=> ['@type' => '@id']
+						'@reply'			=> '@id',
 					],
 					'toot' 				=> 'http://joinmastodon.org/ns#',
 					'Emoji'				=> 'toot:Emoji'

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'		=> [
+					'@capabilities'		=> [
-						'announce'		=> ['@type' => '@id'],
+						'@announce'			=> '@id',
-						'like'			=> ['@type' => '@id'],
+						'@like'				=> '@id',
-						'reply'			=> ['@type' => '@id']
+						'@reply'			=> '@id',
-					]
+					],
 				]
 			],
 			'id' 					=> $status->permalink(),

app/Transformer/ActivityPub/Verb/DeleteNote.php

@@ -10,10 +10,7 @@ class DeleteNote extends Fractal\TransformerAbstract
 	public function transform(Status $status)
 	{
 		return [
-			'@context' => [
+			'@context' => 'https://www.w3.org/ns/activitystreams',
-				'https://www.w3.org/ns/activitystreams',
-				'https://w3id.org/security/v1',
-			],
 			'id' 					=> $status->permalink('#delete'),
 			'type' 					=> 'Delete',
 			'actor' 				=> $status->profile->permalink(),
@@ -24,4 +21,4 @@ class DeleteNote extends Fractal\TransformerAbstract
 		];
 	}
 
-}
+}

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'		=> [
+					'@capabilities'		=> [
-						'announce'		=> ['@type' => '@id'],
+						'@announce'			=> '@id',
-						'like'			=> ['@type' => '@id'],
+						'@like'				=> '@id',
-						'reply'			=> ['@type' => '@id'],
+						'@reply'			=> '@id',
 					],
 					'toot' 				=> 'http://joinmastodon.org/ns#',
 					'Emoji'				=> 'toot:Emoji'

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'		=> [
+						'@capabilities'		=> [
-							'announce'		=> ['@type' => '@id'],
+							'@announce'			=> '@id',
-							'like'			=> ['@type' => '@id'],
+							'@like'				=> '@id',
-							'reply'			=> ['@type' => '@id']
+							'@reply'			=> '@id',
-						]
+						],
 					]
 				],
 				'id' 				=> $status->url(),

app/Transformer/Api/Mastodon/v1/StatusTransformer.php

@@ -38,7 +38,6 @@ class StatusTransformer extends Fractal\TransformerAbstract
 				'website'   => null
 			 ],
 			'mentions'                  => [],
-			'tags'                      => [],
 			'emojis'                    => [],
 			'card'                      => null,
 			'poll'                      => null,

config/exp.php

@@ -32,6 +32,5 @@ return [
 	'spa' => true,
 
 	// Enforce Mastoapi Compatibility (alpha)
-	// Note: this may break 3rd party apps who use non-mastodon compliant fields
+	'emc' => env('EXP_EMC', true),
-	'emc' => env('EXP_EMC', false),
 ];