X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FJsonLD.php;h=8d609625e04281826f16ffec98d18f787dbce180;hb=6aa1dcfad371f34fea1f8e39b73de2cc3dd05784;hp=1200a9cbed4a4c1a273e181646a15c042a8ac096;hpb=ac47aed1b4c5e9a21e1b3988870d19aa22f2a038;p=friendica.git

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index 1200a9cbed..8d609625e0 100644
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -140,7 +140,7 @@ class JsonLD
 	 * @return array Compacted JSON array
 	 * @throws Exception
 	 */
-	public static function compact($json, bool $logfailed = true)
+	public static function compact($json, bool $logfailed = true): array
 	{
 		jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader');
 
@@ -157,6 +157,8 @@ class JsonLD
 			'sc' => (object)['@id' => 'http://schema.org#', '@type' => '@id'],
 			'pt' => (object)['@id' => 'https://joinpeertube.org/ns#', '@type' => '@id'],
 			'mobilizon' => (object)['@id' => 'https://joinmobilizon.org/ns#', '@type' => '@id'],
+			'fedibird' => (object)['@id' => 'http://fedibird.com/ns#', '@type' => '@id'],
+			'misskey' => (object)['@id' => 'https://misskey-hub.net/ns#', '@type' => '@id'],
 		];
 
 		$orig_json = $json;
@@ -175,8 +177,21 @@ class JsonLD
 			if (!in_array('https://w3id.org/security/v1', $json['@context'])) {
 				$json['@context'][] = 'https://w3id.org/security/v1';
 			}
+
+			// Issue 12419: Workaround for GoToSocial
+			$pos = array_search('http://joinmastodon.org/ns', $json['@context']);
+			if (is_int($pos)) {
+				$json['@context'][$pos] = ['toot' => 'http://joinmastodon.org/ns#'];
+			}
 		}
 
+		// Bookwyrm transmits "id" fields with "null", which isn't allowed.
+		array_walk_recursive($json, function (&$value, $key) {
+			if ($key == 'id' && is_null($value)) {
+				$value = '';
+			}
+		});
+
 		$jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
 
 		try {
@@ -194,6 +209,11 @@ class JsonLD
 
 		$json = json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
 
+		if ($json === false) {
+			Logger::notice('JSON encode->decode failed', ['orig_json' => $orig_json, 'compacted' => $compacted]);
+			$json = [];
+		}
+
 		return $json;
 	}