X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FJsonLD.php;h=866fc2cdf54d532142039db2214ba55b3d8187f0;hb=720a43461d67ab229de0aecfc5008f22cc4c1c54;hp=b4ff53fdb019c18ccf4163d8370e262460f21b25;hpb=6f0d40c6c0957751d5f0de844c81a7a140eb7ec7;p=friendica.git

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index b4ff53fdb0..866fc2cdf5 100644
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,7 +21,7 @@
 
 namespace Friendica\Util;
 
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Exception;
 use Friendica\DI;
@@ -41,6 +41,21 @@ class JsonLD
 	 */
 	public static function documentLoader($url)
 	{
+		switch ($url) {
+			case 'https://w3id.org/security/v1':
+				$url = DI::baseUrl() . '/static/security-v1.jsonld';
+				break;
+			case 'https://w3id.org/identity/v1':
+				$url = DI::baseUrl() . '/static/identity-v1.jsonld';
+				break;
+			case 'https://www.w3.org/ns/activitystreams':
+				$url = DI::baseUrl() . '/static/activitystreams.jsonld';
+				break;
+			default:
+				Logger::info('Got url', ['url' =>$url]);
+				break;
+		}
+
 		$recursion = 0;
 
 		$x = debug_backtrace();
@@ -150,9 +165,7 @@ class JsonLD
 		}
 		catch (Exception $e) {
 			$compacted = false;
-			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);
+			Logger::notice('compacting error', ['line' => $e->getLine(), 'exception' => $e]);
 		}
 
 		$json = json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
@@ -173,30 +186,28 @@ class JsonLD
 	 *
 	 * @return array fetched element
 	 */
-	public static function fetchElementArray($array, $element, $key = '@id')
+	public static function fetchElementArray($array, $element, $key = null, $type = null, $type_value = null)
 	{
-		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]))) {
+		if (!is_array($array[$element]) || !is_int(key($array[$element]))) {
 			$array[$element] = [$array[$element]];
 		}
 
 		$elements = [];
 
 		foreach ($array[$element] as $entry) {
-			if (!is_array($entry)) {
-				$elements[] = $entry;
+			if (!is_array($entry) || is_null($key)) {
+				$item = $entry;
 			} elseif (isset($entry[$key])) {
-				$elements[] = $entry[$key];
-			} elseif (!empty($entry) || !is_array($entry)) {
-				$elements[] = $entry;
+				$item = $entry[$key];
+			}
+
+			if (isset($item) && (is_null($type) || is_null($type_value) || isset($item[$type]) && $item[$type] == $type_value)) {
+				$elements[] = $item;
 			}
 		}