X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FJsonLD.php;h=25ce74fcc7c1c044cebc7843f953e361e0a4baac;hb=b5ad8c3e153976cf3e63753597377f09852d98d7;hp=cf1e058a1478711535a950c5cb63bfe2f1c7f0f6;hpb=478ee7b6fc147a22b699709786ddefd6b48b081c;p=friendica.git

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index cf1e058a14..25ce74fcc7 100644
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -24,6 +24,7 @@ namespace Friendica\Util;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Exception;
+use Friendica\Core\System;
 use Friendica\DI;
 
 /**
@@ -51,9 +52,23 @@ class JsonLD
 			case 'https://www.w3.org/ns/activitystreams':
 				$url = DI::baseUrl() . '/static/activitystreams.jsonld';
 				break;
-			default:
-				Logger::info('Got url', ['url' =>$url]);
+			case 'https://funkwhale.audio/ns':
+				$url = DI::baseUrl() . '/static/funkwhale.audio.jsonld';
 				break;
+			default:
+				switch (parse_url($url, PHP_URL_PATH)) {
+					case '/schemas/litepub-0.1.jsonld';
+						$url = DI::baseUrl() . '/static/litepub-0.1.jsonld';
+						break;
+					case '/apschema/v1.2':
+					case '/apschema/v1.9':
+					case '/apschema/v1.10':
+							$url = DI::baseUrl() . '/static/apschema.jsonld';
+						break;
+					default:
+						Logger::info('Got url', ['url' =>$url]);
+						break;
+				}
 		}
 
 		$recursion = 0;
@@ -69,7 +84,7 @@ class JsonLD
 
 		if ($recursion > 5) {
 			Logger::error('jsonld bomb detected at: ' . $url);
-			exit();
+			System::exit();
 		}
 
 		$result = DI::cache()->get('documentLoader:' . $url);
@@ -120,11 +135,12 @@ class JsonLD
 	 * Compacts a given JSON array
 	 *
 	 * @param array $json
+	 * @param bool  $logfailed
 	 *
 	 * @return array Compacted JSON array
 	 * @throws Exception
 	 */
-	public static function compact($json)
+	public static function compact($json, bool $logfailed = true)
 	{
 		jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader');
 
@@ -141,25 +157,35 @@ 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;
+
 		// Preparation for adding possibly missing content to the context
 		if (!empty($json['@context']) && is_string($json['@context'])) {
 			$json['@context'] = [$json['@context']];
 		}
 
-		// Workaround for servers with missing context
-		// See issue https://github.com/nextcloud/social/issues/330
 		if (!empty($json['@context']) && is_array($json['@context'])) {
-			$json['@context'][] = 'https://w3id.org/security/v1';
-		}
+			// Remove empty entries from the context (a problem with WriteFreely)
+			$json['@context'] = array_filter($json['@context']);
 
-		// Trying to avoid memory problems with large content fields
-		if (!empty($json['object']['source']['content'])) {
-			$content = $json['object']['source']['content'];
-			$json['object']['source']['content'] = '';
+			// Workaround for servers with missing context
+			// See issue https://github.com/nextcloud/social/issues/330
+			if (!in_array('https://w3id.org/security/v1', $json['@context'])) {
+				$json['@context'][] = 'https://w3id.org/security/v1';
+			}
 		}
 
+		// 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 {
@@ -167,15 +193,16 @@ class JsonLD
 		}
 		catch (Exception $e) {
 			$compacted = false;
-			Logger::notice('compacting error', ['line' => $e->getLine(), 'exception' => $e]);
+			Logger::notice('compacting error', ['msg' => $e->getMessage(), 'previous' => $e->getPrevious(), 'line' => $e->getLine()]);
+			if ($logfailed && DI::config()->get('debug', 'ap_log_failure')) {
+				$tempfile = tempnam(System::getTempPath(), 'failed-jsonld');
+				file_put_contents($tempfile, json_encode(['json' => $orig_json, 'callstack' => System::callstack(20), 'msg' => $e->getMessage(), 'previous' => $e->getPrevious()], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));
+				Logger::notice('Failed message stored', ['file' => $tempfile]);
+			}
 		}
 
 		$json = json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
 
-		if (isset($json['as:object']['as:source']['as:content']) && !empty($content)) {
-			$json['as:object']['as:source']['as:content'] = $content;
-		}
-
 		return $json;
 	}