X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FJsonLD.php;h=69973f4febf7d95757189a7e36b8a3ffa4c04b10;hb=295d90d496a56217383481fa7a0153e0ac48e38a;hp=cd3a6ec2708899d49483a7bfb3c73a92c7d762cf;hpb=2d9e1b8ec29d658bcbaee53f073b18bf651ac085;p=friendica.git

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index cd3a6ec270..69973f4feb 100644
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -18,7 +18,8 @@ class JsonLD
 	 *
 	 * @param $url
 	 *
-	 * @return the loaded data
+	 * @return mixed the loaded data
+	 * @throws \JsonLdException
 	 */
 	public static function documentLoader($url)
 	{
@@ -34,7 +35,7 @@ class JsonLD
 		}
 
 		if ($recursion > 5) {
-			Logger::log('jsonld bomb detected at: ' . $url);
+			Logger::error('jsonld bomb detected at: ' . $url);
 			exit();
 		}
 
@@ -53,7 +54,8 @@ class JsonLD
 	 *
 	 * @param array $json
 	 *
-	 * @return normalized JSON string
+	 * @return mixed|bool normalized JSON string
+	 * @throws Exception
 	 */
 	public static function normalize($json)
 	{
@@ -66,7 +68,9 @@ class JsonLD
 		}
 		catch (Exception $e) {
 			$normalized = false;
-			Logger::log('normalise error:' . print_r($e, true), Logger::DEBUG);
+			Logger::error('normalise error');
+			// Sooner or later we should log some details as well - but currently this leads to memory issues
+			// Logger::log('normalise error:' . substr(print_r($e, true), 0, 10000), Logger::DEBUG);
 		}
 
 		return $normalized;
@@ -77,7 +81,8 @@ class JsonLD
 	 *
 	 * @param array $json
 	 *
-	 * @return comacted JSON array
+	 * @return array Compacted JSON array
+	 * @throws Exception
 	 */
 	public static function compact($json)
 	{
@@ -91,7 +96,19 @@ class JsonLD
 			'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'],
-			'toot' => (object)['@id' => 'http://joinmastodon.org/ns#', '@type' => '@id']];
+			'toot' => (object)['@id' => 'http://joinmastodon.org/ns#', '@type' => '@id'],
+			'litepub' => (object)['@id' => 'http://litepub.social/ns#', '@type' => '@id']];
+
+		// 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';
+		}
 
 		// Trying to avoid memory problems with large content fields
 		if (!empty($json['object']['source']['content'])) {
@@ -106,7 +123,9 @@ class JsonLD
 		}
 		catch (Exception $e) {
 			$compacted = false;
-			Logger::log('compacting error:' . print_r($e, true), Logger::DEBUG);
+			Logger::error('compacting error');
+			// Sooner or later we should log some details as well - but currently this leads to memory issues
+			// Logger::log('compacting error:' . substr(print_r($e, true), 0, 10000), Logger::DEBUG);
 		}
 
 		$json = json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
@@ -125,7 +144,7 @@ class JsonLD
 	 * @param $element
 	 * @param $key
 	 *
-	 * @return fetched element array
+	 * @return array fetched element
 	 */
 	public static function fetchElementArray($array, $element, $key = '@id')
 	{
@@ -147,7 +166,7 @@ class JsonLD
 		foreach ($array[$element] as $entry) {
 			if (!is_array($entry)) {
 				$elements[] = $entry;
-			} elseif (!empty($entry[$key])) {
+			} elseif (isset($entry[$key])) {
 				$elements[] = $entry[$key];
 			} elseif (!empty($entry) || !is_array($entry)) {
 				$elements[] = $entry;
@@ -166,7 +185,7 @@ class JsonLD
 	 * @param $type
 	 * @param $type_value
 	 *
-	 * @return fetched element
+	 * @return string fetched element
 	 */
 	public static function fetchElement($array, $element, $key = '@id', $type = null, $type_value = null)
 	{