X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FJsonLD.php;h=cd3a6ec2708899d49483a7bfb3c73a92c7d762cf;hb=9feab828c88dfdc0c66fef3269f6cdf0122d2840;hp=5380c3c542734bb613aa4238fc960d8a755ceb4a;hpb=6c80601a4a9baf8ebaba5e6b0102e484f85d88db;p=friendica.git

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index 5380c3c542..cd3a6ec270 100644
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -5,6 +5,7 @@
 namespace Friendica\Util;
 
 use Friendica\Core\Cache;
+use Friendica\Core\Logger;
 use Exception;
 
 /**
@@ -33,7 +34,7 @@ class JsonLD
 		}
 
 		if ($recursion > 5) {
-			logger('jsonld bomb detected at: ' . $url);
+			Logger::log('jsonld bomb detected at: ' . $url);
 			exit();
 		}
 
@@ -43,7 +44,7 @@ class JsonLD
 		}
 
 		$data = jsonld_default_document_loader($url);
-		Cache::set('documentLoader:' . $url, $data, CACHE_DAY);
+		Cache::set('documentLoader:' . $url, $data, Cache::DAY);
 		return $data;
 	}
 
@@ -65,7 +66,7 @@ class JsonLD
 		}
 		catch (Exception $e) {
 			$normalized = false;
-			logger('normalise error:' . print_r($e, true), LOGGER_DEBUG);
+			Logger::log('normalise error:' . print_r($e, true), Logger::DEBUG);
 		}
 
 		return $normalized;
@@ -84,24 +85,37 @@ class JsonLD
 
 		$context = (object)['as' => 'https://www.w3.org/ns/activitystreams#',
 			'w3id' => 'https://w3id.org/security#',
+			'ldp' => (object)['@id' => 'http://www.w3.org/ns/ldp#', '@type' => '@id'],
 			'vcard' => (object)['@id' => 'http://www.w3.org/2006/vcard/ns#', '@type' => '@id'],
-			'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
+			'dfrn' => (object)['@id' => 'http://purl.org/macgirvin/dfrn/1.0/', '@type' => '@id'],
 			'diaspora' => (object)['@id' => 'https://diasporafoundation.org/ns/', '@type' => '@id'],
+			'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
 			'dc' => (object)['@id' => 'http://purl.org/dc/terms/', '@type' => '@id'],
-			'uuid' => (object)['@id' => 'http://schema.org/identifier', '@type' => '@id']];
+			'toot' => (object)['@id' => 'http://joinmastodon.org/ns#', '@type' => '@id']];
 
-		$jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+		// Trying to avoid memory problems with large content fields
+		if (!empty($json['object']['source']['content'])) {
+			$content = $json['object']['source']['content'];
+			$json['object']['source']['content'] = '';
+		}
 
+		$jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
 
 		try {
 			$compacted = jsonld_compact($jsonobj, $context);
 		}
 		catch (Exception $e) {
 			$compacted = false;
-			logger('compacting error:' . print_r($e, true), LOGGER_DEBUG);
+			Logger::log('compacting error:' . print_r($e, true), Logger::DEBUG);
+		}
+
+		$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_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
+		return $json;
 	}
 
 	/**