*/
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
*
}
if ($recursion > 5) {
- Logger::log('jsonld bomb detected at: ' . $url);
+ Logger::error('jsonld bomb detected at: ' . $url);
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
*
}
catch (Exception $e) {
$normalized = false;
- 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
*
'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 Nextcloud Social
+ // 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';
}
catch (Exception $e) {
$compacted = false;
- Logger::log('compacting error:' . substr(print_r($e, true), 0, 10000), 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);
}
/**
- * @brief Fetches an element array from a JSON array
+ * Fetches an element array from a JSON array
*
* @param $array
* @param $element
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;
}
/**
- * @brief Fetches an element from a JSON array
+ * Fetches an element from a JSON array
*
* @param $array
* @param $element