From 897929ad40ef168de9a522825aa6891213b8f701 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 26 Sep 2018 22:45:13 +0000
Subject: [PATCH] Avoid warnings, added documentation

---
 src/Protocol/ActivityPub.php | 11 +++++------
 src/Util/JsonLD.php          | 10 +++++++++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index 3bf304adc..78e7b9bf2 100644
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -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);
diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index 4917c3c01..4100b258b 100644
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -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;
 	}
 
 	/**