tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Compact using a predefined context to fix content from Pleroma

Browse source
This commit is contained in:
Michael 2021-05-16 19:31:10 +00:00
parent 6f2fcd2859
commit 4b4218f516
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Util/JsonLD.php
View file

@ -26,6 +26,7 @@ use Friendica\Core\Logger;
use Exception; use Exception;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\DI; use Friendica\DI;
use Friendica\Protocol\ActivityPub;
/** /**
* This class contain methods to work with JsonLD data * This class contain methods to work with JsonLD data
@ -161,6 +162,26 @@ class JsonLD
* @throws Exception * @throws Exception
*/ */
public static function compact($json) public static function compact($json)
{
$context = $json['@context'] ?? [];
$json['@context'] = ActivityPub::CONTEXT;
$compacted = self::internalCompact($json);
if (empty($compacted)) {
Logger::info('Failed to compact with our context');
$json['@context'] = $context;
$compacted = self::internalCompact($json);
if (empty($compacted)) {
Logger::info('Failed to compact with original context');
} else {
Logger::info('Successful compacted with original context');
}
}
return $compacted;
}
private static function internalCompact($json)
{ {
$json = self::fixContext($json); $json = self::fixContext($json);
@ -192,9 +213,7 @@ class JsonLD
} }
catch (Exception $e) { catch (Exception $e) {
$compacted = false; $compacted = false;
Logger::error('compacting error', ['callstack' => System::callstack(20)]); Logger::error('compacting error', ['line' => $e->getLine(), 'message' => $e->getMessage(),'callstack' => System::callstack(20)]);
// 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); $json = json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);