X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FJsonLD.php;h=866fc2cdf54d532142039db2214ba55b3d8187f0;hb=720a43461d67ab229de0aecfc5008f22cc4c1c54;hp=9566c424adf77937cd9658bd5407c5b9e7068eba;hpb=eef85584c20121ed01b64401ac51ed279d19db8b;p=friendica.git diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php index 9566c424ad..866fc2cdf5 100644 --- a/src/Util/JsonLD.php +++ b/src/Util/JsonLD.php @@ -1,20 +1,38 @@ . + * */ + namespace Friendica\Util; -use Friendica\Core\Cache; +use Friendica\Core\Cache\Enum\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 * @@ -23,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(); @@ -39,18 +72,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 +101,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 * @@ -96,7 +136,10 @@ 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'], + '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'])) { @@ -122,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); @@ -137,7 +178,7 @@ class JsonLD } /** - * @brief Fetches an element array from a JSON array + * Fetches an element array from a JSON array * * @param $array * @param $element @@ -145,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; } } @@ -176,7 +215,7 @@ class JsonLD } /** - * @brief Fetches an element from a JSON array + * Fetches an element from a JSON array * * @param $array * @param $element