X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FJsonLD.php;h=beb01f0cc1106f54683ed1454e15e9a8f1d8b111;hb=0a45bdd3b71ec0f8744abb3830858a91a4bca146;hp=1200a9cbed4a4c1a273e181646a15c042a8ac096;hpb=121607b8d943fd57e6fe3f6219c8d925f1be423d;p=friendica.git

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index 1200a9cbed..beb01f0cc1 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
  *
@@ -44,26 +44,32 @@ class JsonLD
 	{
 		switch ($url) {
 			case 'https://w3id.org/security/v1':
-				$url = DI::baseUrl() . '/static/security-v1.jsonld';
+				$url = DI::basePath() . '/static/security-v1.jsonld';
 				break;
 			case 'https://w3id.org/identity/v1':
-				$url = DI::baseUrl() . '/static/identity-v1.jsonld';
+				$url = DI::basePath() . '/static/identity-v1.jsonld';
 				break;
 			case 'https://www.w3.org/ns/activitystreams':
-				$url = DI::baseUrl() . '/static/activitystreams.jsonld';
+				$url = DI::basePath() . '/static/activitystreams.jsonld';
 				break;
 			case 'https://funkwhale.audio/ns':
-				$url = DI::baseUrl() . '/static/funkwhale.audio.jsonld';
+				$url = DI::basePath() . '/static/funkwhale.audio.jsonld';
+				break;
+			case 'http://schema.org':
+				$url = DI::basePath() . '/static/schema.jsonld';
+				break;
+			case 'http://joinmastodon.org/ns':
+				$url = DI::basePath() . '/static/joinmastodon.jsonld';
 				break;
 			default:
 				switch (parse_url($url, PHP_URL_PATH)) {
 					case '/schemas/litepub-0.1.jsonld';
-						$url = DI::baseUrl() . '/static/litepub-0.1.jsonld';
+						$url = DI::basePath() . '/static/litepub-0.1.jsonld';
 						break;
 					case '/apschema/v1.2':
 					case '/apschema/v1.9':
 					case '/apschema/v1.10':
-							$url = DI::baseUrl() . '/static/apschema.jsonld';
+						$url = DI::basePath() . '/static/apschema.jsonld';
 						break;
 					default:
 						Logger::info('Got url', ['url' =>$url]);
@@ -140,7 +146,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 +163,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;
@@ -177,6 +185,13 @@ class JsonLD
 			}
 		}
 
+		// 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;
 	}