X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FJsonLD.php;h=2649e9073788147ef6e7117d1982892b501fbf53;hb=11de5be0ae6d28880b12cc4b1fd65c56924b4aad;hp=69973f4febf7d95757189a7e36b8a3ffa4c04b10;hpb=87b98b82495e254e7d1ecf84354648d95b8c9b11;p=friendica.git

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index 69973f4feb..2649e90737 100644
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -1,20 +1,38 @@
 <?php
 /**
- * @file src/Util/JsonLD.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Util;
 
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Duration;
 use Friendica\Core\Logger;
 use Exception;
+use Friendica\DI;
 
 /**
- * @brief This class contain methods to work with JsonLD data
+ * This class contain methods to work with JsonLD data
  */
 class JsonLD
 {
 	/**
-	 * @brief Loader for LD-JSON validation
+	 * Loader for LD-JSON validation
 	 *
 	 * @param $url
 	 *
@@ -39,18 +57,18 @@ class JsonLD
 			exit();
 		}
 
-		$result = Cache::get('documentLoader:' . $url);
+		$result = DI::cache()->get('documentLoader:' . $url);
 		if (!is_null($result)) {
 			return $result;
 		}
 
 		$data = jsonld_default_document_loader($url);
-		Cache::set('documentLoader:' . $url, $data, Cache::DAY);
+		DI::cache()->set('documentLoader:' . $url, $data, Duration::DAY);
 		return $data;
 	}
 
 	/**
-	 * @brief Normalises a given JSON array
+	 * Normalises a given JSON array
 	 *
 	 * @param array $json
 	 *
@@ -68,16 +86,23 @@ class JsonLD
 		}
 		catch (Exception $e) {
 			$normalized = false;
-			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);
+			$messages = [];
+			$currentException = $e;
+			do {
+				$messages[] = $currentException->getMessage();
+			} while($currentException = $currentException->getPrevious());
+
+			Logger::warning('JsonLD normalize error');
+			Logger::notice('JsonLD normalize error', ['messages' => $messages]);
+			Logger::info('JsonLD normalize error', ['trace' => $e->getTraceAsString()]);
+			Logger::debug('JsonLD normalize error', ['jsonobj' => $jsonobj]);
 		}
 
 		return $normalized;
 	}
 
 	/**
-	 * @brief Compacts a given JSON array
+	 * Compacts a given JSON array
 	 *
 	 * @param array $json
 	 *
@@ -97,7 +122,9 @@ class JsonLD
 			'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'],
-			'litepub' => (object)['@id' => 'http://litepub.social/ns#', '@type' => '@id']];
+			'litepub' => (object)['@id' => 'http://litepub.social/ns#', '@type' => '@id'],
+			'sc' => (object)['@id' => 'http://schema.org#', '@type' => '@id'],
+			'pt' => (object)['@id' => 'https://joinpeertube.org/ns#', '@type' => '@id']];
 
 		// Preparation for adding possibly missing content to the context
 		if (!empty($json['@context']) && is_string($json['@context'])) {
@@ -138,7 +165,7 @@ class JsonLD
 	}
 
 	/**
-	 * @brief Fetches an element array from a JSON array
+	 * Fetches an element array from a JSON array
 	 *
 	 * @param $array
 	 * @param $element
@@ -146,12 +173,8 @@ class JsonLD
 	 *
 	 * @return array fetched element
 	 */
-	public static function fetchElementArray($array, $element, $key = '@id')
+	public static function fetchElementArray($array, $element, $key = null)
 	{
-		if (empty($array)) {
-			return null;
-		}
-
 		if (!isset($array[$element])) {
 			return null;
 		}
@@ -164,12 +187,10 @@ class JsonLD
 		$elements = [];
 
 		foreach ($array[$element] as $entry) {
-			if (!is_array($entry)) {
+			if (!is_array($entry) || (is_null($key) && is_array($entry))) {
 				$elements[] = $entry;
-			} elseif (isset($entry[$key])) {
+			} elseif (!is_null($key) && isset($entry[$key])) {
 				$elements[] = $entry[$key];
-			} elseif (!empty($entry) || !is_array($entry)) {
-				$elements[] = $entry;
 			}
 		}
 
@@ -177,7 +198,7 @@ class JsonLD
 	}
 
 	/**
-	 * @brief Fetches an element from a JSON array
+	 * Fetches an element from a JSON array
 	 *
 	 * @param $array
 	 * @param $element