X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FJsonLD.php;h=78d81816e25b1747c0f749e9488470bdcdfb6727;hb=4894e89f036be1f8a82523ac69d56ae36e7685df;hp=2b6fac4ad483a029ca107b1c3539658dbe55bf06;hpb=30f67d6e140394eecd23d558b41aff3cd82c08d0;p=friendica.git

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index 2b6fac4ad4..78d81816e2 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;
 	}
 
@@ -64,7 +65,8 @@ class JsonLD
 			$normalized = jsonld_normalize($jsonobj, array('algorithm' => 'URDNA2015', 'format' => 'application/nquads'));
 		}
 		catch (Exception $e) {
-			logger('normalise error:' . print_r($e, true), LOGGER_DEBUG);
+			$normalized = false;
+			Logger::log('normalise error:' . print_r($e, true), Logger::DEBUG);
 		}
 
 		return $normalized;
@@ -81,19 +83,69 @@ class JsonLD
 	{
 		jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader');
 
-		$context = (object)['as' => 'https://www.w3.org/ns/activitystreams',
-			'w3sec' => 'https://w3id.org/security',
-			'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
+		$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'],
-			'uuid' => (object)['@id' => 'http://schema.org/identifier', '@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'],
+			'toot' => (object)['@id' => 'http://joinmastodon.org/ns#', '@type' => '@id']];
 
 		$jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
 
-		$compacted = jsonld_compact($jsonobj, $context);
+
+		try {
+			$compacted = jsonld_compact($jsonobj, $context);
+		}
+		catch (Exception $e) {
+			$compacted = false;
+			Logger::log('compacting error:' . print_r($e, true), Logger::DEBUG);
+		}
 
 		return json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
 	}
 
+	/**
+	 * @brief Fetches an element array from a JSON array
+	 *
+	 * @param $array
+	 * @param $element
+	 * @param $key
+	 *
+	 * @return fetched element array
+	 */
+	public static function fetchElementArray($array, $element, $key = '@id')
+	{
+		if (empty($array)) {
+			return null;
+		}
+
+		if (!isset($array[$element])) {
+			return null;
+		}
+
+		// If it isn't an array yet, make it to one
+		if (!is_int(key($array[$element]))) {
+			$array[$element] = [$array[$element]];
+		}
+
+		$elements = [];
+
+		foreach ($array[$element] as $entry) {
+			if (!is_array($entry)) {
+				$elements[] = $entry;
+			} elseif (!empty($entry[$key])) {
+				$elements[] = $entry[$key];
+			} elseif (!empty($entry) || !is_array($entry)) {
+				$elements[] = $entry;
+			}
+		}
+
+		return $elements;
+	}
+
 	/**
 	 * @brief Fetches an element from a JSON array
 	 *
@@ -105,38 +157,40 @@ class JsonLD
 	 *
 	 * @return fetched element
 	 */
-	public static function fetchElement($array, $element, $key, $type = null, $type_value = null)
+	public static function fetchElement($array, $element, $key = '@id', $type = null, $type_value = null)
 	{
 		if (empty($array)) {
-			return false;
+			return null;
 		}
 
-		if (empty($array[$element])) {
-			return false;
+		if (!isset($array[$element])) {
+			return null;
 		}
 
-		if (is_string($array[$element])) {
+		if (!is_array($array[$element])) {
 			return $array[$element];
 		}
 
-		if (is_null($type_value)) {
-			if (!empty($array[$element][$key])) {
-				return $array[$element][$key];
+		if (is_null($type) || is_null($type_value)) {
+			$element_array = self::fetchElementArray($array, $element, $key);
+			if (is_null($element_array)) {
+				return null;
 			}
 
-			if (!empty($array[$element][0][$key])) {
-				return $array[$element][0][$key];
-			}
-
-			return false;
+			return array_shift($element_array);
 		}
 
-		if (!empty($array[$element][$key]) && !empty($array[$element][$type]) && ($array[$element][$type] == $type_value)) {
-			return $array[$element][$key];
+		$element_array = self::fetchElementArray($array, $element);
+		if (is_null($element_array)) {
+			return null;
 		}
 
-		/// @todo Add array search
+		foreach ($element_array as $entry) {
+			if (isset($entry[$key]) && isset($entry[$type]) && ($entry[$type] == $type_value)) {
+				return $entry[$key];
+			}
+		}
 
-		return false;
+		return null;
 	}
 }