friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Avoid warnings, added documentation

This commit is contained in:
Michael 2018-09-26 22:45:13 +00:00
parent 9c62727e1d
commit 897929ad40
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Protocol/ActivityPub.php
View File

@ -77,8 +77,7 @@ class ActivityPub
{
const PUBLIC = 'https://www.w3.org/ns/activitystreams#Public';
const CONTEXT = ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
['ostatus' => 'http://ostatus.org#', 'uuid' => 'http://schema.org/identifier',
'vcard' => 'http://www.w3.org/2006/vcard/ns#',
['vcard' => 'http://www.w3.org/2006/vcard/ns#',
'diaspora' => 'https://diasporafoundation.org#',
'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag']];
@ -346,11 +345,11 @@ class ActivityPub
}
/**
* @brief
* @brief Creates an array of permissions from an item thread
*
* @param array $item
*
* @return
* @return permission array
*/
public static function createPermissionBlockForItem($item)
{
@ -445,7 +444,7 @@ class ActivityPub
* @param array $item
* @param $uid
*
* @return
* @return array with inboxes
*/
public static function fetchTargetInboxes($item, $uid)
{
@ -1393,7 +1392,7 @@ class ActivityPub
$actor = defaults($object, 'actor', null);
}
$object_data['uuid'] = defaults($object, 'uuid', null);
$object_data['diaspora:guid'] = defaults($object, 'diaspora:guid', null);
$object_data['owner'] = $object_data['author'] = $actor;
$object_data['context'] = defaults($object, 'context', null);
$object_data['conversation'] = defaults($object, 'conversation', null);

10
src/Util/JsonLD.php
View File

@ -6,6 +6,7 @@ namespace Friendica\Util;
use Friendica\Core\Cache;
use digitalbazaar\jsonld as DBJsonLD;
use Exception;
/**
* @brief This class contain methods to work with JsonLD data
@ -60,7 +61,14 @@ class JsonLD
$jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
return jsonld_normalize($jsonobj, array('algorithm' => 'URDNA2015', 'format' => 'application/nquads'));
try {
$normalized = jsonld_normalize($jsonobj, array('algorithm' => 'URDNA2015', 'format' => 'application/nquads'));
}
catch (Exception $e) {
logger('normalise error:' . print_r($e, true), LOGGER_DEBUG);
}
return $normalized;
}
/**