From 3a74f3364d28297ba957544893d9c721d683dba1 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 7 Oct 2018 13:37:05 +0000
Subject: [PATCH 1/8] Switch to parsing compacted JSON data

---
 src/Protocol/ActivityPub/Processor.php   |   7 +-
 src/Protocol/ActivityPub/Receiver.php    | 241 ++++++++++++++---------
 src/Protocol/ActivityPub/Transmitter.php |   4 +
 src/Util/JsonLD.php                      |  88 ++++++---
 4 files changed, 226 insertions(+), 114 deletions(-)

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index f62566168b..f117c8c33e 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -52,7 +52,7 @@ class Processor
 
 		$tag_text = '';
 		foreach ($tags as $tag) {
-			if (in_array($tag['type'], ['Mention', 'Hashtag'])) {
+			if (in_array(defaults($tag, 'type', ''), ['Mention', 'Hashtag'])) {
 				if (!empty($tag_text)) {
 					$tag_text .= ',';
 				}
@@ -210,9 +210,8 @@ class Processor
 
 		$item = self::constructAttachList($activity['attachments'], $item);
 
-		$source = JsonLD::fetchElement($activity, 'source', 'content', 'mediaType', 'text/bbcode');
-		if (!empty($source)) {
-			$item['body'] = $source;
+		if (!empty($activity['source'])) {
+			$item['body'] = $activity['source'];
 		}
 
 		$item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 1c237f79dc..48bfc0c8c8 100644
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -36,6 +36,11 @@ use Friendica\Protocol\ActivityPub;
  */
 class Receiver
 {
+	const PUBLIC_COLLECTION = 'as:Public';
+	const ACCOUNT_TYPES = ['as:Person', 'as:Organization', 'as:Service', 'as:Group', 'as:Application'];
+	const CONTENT_TYPES = ['as:Note', 'as:Article', 'as:Video', 'as:Image'];
+	const ACTIVITY_TYPES = ['as:Like', 'as:Dislike', 'as:Accept', 'as:Reject', 'as:TentativeAccept'];
+
 	/**
 	 * Checks if the web request is done for the AP protocol
 	 *
@@ -48,7 +53,7 @@ class Receiver
 	}
 
 	/**
-	 * 
+	 * Checks incoming message from the inbox
 	 *
 	 * @param $body
 	 * @param $header
@@ -66,14 +71,17 @@ class Receiver
 
 		$activity = json_decode($body, true);
 
-		$actor = JsonLD::fetchElement($activity, 'actor', 'id');
-		logger('Message for user ' . $uid . ' is from actor ' . $actor, LOGGER_DEBUG);
-
 		if (empty($activity)) {
 			logger('Invalid body.', LOGGER_DEBUG);
 			return;
 		}
 
+		$ldactivity = JsonLD::compact($activity);
+
+		$actor = JsonLD::fetchElement($ldactivity, 'as:actor');
+
+		logger('Message for user ' . $uid . ' is from actor ' . $actor, LOGGER_DEBUG);
+
 		if (LDSignature::isSigned($activity)) {
 			$ld_signer = LDSignature::getSigner($activity);
 			if (empty($ld_signer)) {
@@ -100,7 +108,7 @@ class Receiver
 			$trust_source = false;
 		}
 
-		self::processActivity($activity, $body, $uid, $trust_source);
+		self::processActivity($activity, $ldactivity, $body, $uid, $trust_source);
 	}
 
 	/**
@@ -112,16 +120,18 @@ class Receiver
 	 *
 	 * @return 
 	 */
-	private static function prepareObjectData($activity, $uid, &$trust_source)
+	private static function prepareObjectData($activity, $ldactivity, $uid, &$trust_source)
 	{
-		$actor = JsonLD::fetchElement($activity, 'actor', 'id');
+		$actor = JsonLD::fetchElement($ldactivity, 'as:actor');
 		if (empty($actor)) {
 			logger('Empty actor', LOGGER_DEBUG);
 			return [];
 		}
 
+		$type = JsonLD::fetchElement($ldactivity, '@type');
+
 		// Fetch all receivers from to, cc, bto and bcc
-		$receivers = self::getReceivers($activity, $actor);
+		$receivers = self::getReceivers($ldactivity, $actor);
 
 		// When it is a delivery to a personal inbox we add that user to the receivers
 		if (!empty($uid)) {
@@ -132,34 +142,34 @@ class Receiver
 
 		logger('Receivers: ' . json_encode($receivers), LOGGER_DEBUG);
 
-		$object_id = JsonLD::fetchElement($activity, 'object', 'id');
+		$object_id = JsonLD::fetchElement($ldactivity, 'as:object');
 		if (empty($object_id)) {
 			logger('No object found', LOGGER_DEBUG);
 			return [];
 		}
 
 		// Fetch the content only on activities where this matters
-		if (in_array($activity['type'], ['Create', 'Announce'])) {
-			$object_data = self::fetchObject($object_id, $activity['object'], $trust_source);
+		if (in_array($type, ['as:Create', 'as:Announce'])) {
+			$object_data = self::fetchObject($object_id, $activity['object'], $ldactivity['as:object'], $trust_source);
 			if (empty($object_data)) {
 				logger("Object data couldn't be processed", LOGGER_DEBUG);
 				return [];
 			}
 			// We had been able to retrieve the object data - so we can trust the source
 			$trust_source = true;
-		} elseif (in_array($activity['type'], ['Like', 'Dislike'])) {
+		} elseif (in_array($type, ['as:Like', 'as:Dislike'])) {
 			// Create a mostly empty array out of the activity data (instead of the object).
 			// This way we later don't have to check for the existence of ech individual array element.
-			$object_data = self::processObject($activity);
-			$object_data['name'] = $activity['type'];
-			$object_data['author'] = $activity['actor'];
+			$object_data = self::processObject($ldactivity);
+			$object_data['name'] = $type;
+			$object_data['author'] = JsonLD::fetchElement($ldactivity, 'as:actor');
 			$object_data['object'] = $object_id;
 			$object_data['object_type'] = ''; // Since we don't fetch the object, we don't know the type
 		} else {
 			$object_data = [];
-			$object_data['id'] = $activity['id'];
+			$object_data['id'] = JsonLD::fetchElement($ldactivity, '@id');
 			$object_data['object'] = $activity['object'];
-			$object_data['object_type'] = JsonLD::fetchElement($activity, 'object', 'type');
+			$object_data['object_type'] = JsonLD::fetchElement($ldactivity, 'as:object', '@type');
 		}
 
 		$object_data = self::addActivityFields($object_data, $activity);
@@ -181,110 +191,115 @@ class Receiver
 	 * @param integer $uid User ID
 	 * @param $trust_source
 	 */
-	public static function processActivity($activity, $body = '', $uid = null, $trust_source = false)
+	public static function processActivity($activity, $ldactivity = '', $body = '', $uid = null, $trust_source = false)
 	{
-		if (empty($activity['type'])) {
+		if (empty($ldactivity)) {
+			$ldactivity = JsonLD::compact($activity);
+		}
+
+		$type = JsonLD::fetchElement($ldactivity, '@type');
+		if (!$type) {
 			logger('Empty type', LOGGER_DEBUG);
 			return;
 		}
 
-		if (empty($activity['object'])) {
+		if (!JsonLD::fetchElement($ldactivity, 'as:object')) {
 			logger('Empty object', LOGGER_DEBUG);
 			return;
 		}
 
-		if (empty($activity['actor'])) {
+		if (!JsonLD::fetchElement($ldactivity, 'as:actor')) {
 			logger('Empty actor', LOGGER_DEBUG);
 			return;
 
 		}
 
 		// $trust_source is called by reference and is set to true if the content was retrieved successfully
-		$object_data = self::prepareObjectData($activity, $uid, $trust_source);
+		$object_data = self::prepareObjectData($activity, $ldactivity, $uid, $trust_source);
 		if (empty($object_data)) {
 			logger('No object data found', LOGGER_DEBUG);
 			return;
 		}
 
 		if (!$trust_source) {
-			logger('No trust for activity type "' . $activity['type'] . '", so we quit now.', LOGGER_DEBUG);
+			logger('No trust for activity type "' . $type . '", so we quit now.', LOGGER_DEBUG);
 			return;
 		}
 
-		switch ($activity['type']) {
-			case 'Create':
-			case 'Announce':
+		switch ($type) {
+			case 'as:Create':
+			case 'as:Announce':
 				ActivityPub\Processor::createItem($object_data, $body);
 				break;
 
-			case 'Like':
+			case 'as:Like':
 				ActivityPub\Processor::likeItem($object_data, $body);
 				break;
 
-			case 'Dislike':
+			case 'as:Dislike':
 				ActivityPub\Processor::dislikeItem($object_data, $body);
 				break;
 
-			case 'Update':
-				if (in_array($object_data['object_type'], ActivityPub::CONTENT_TYPES)) {
+			case 'as:Update':
+				if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
 					/// @todo
-				} elseif (in_array($object_data['object_type'], ActivityPub::ACCOUNT_TYPES)) {
+				} elseif (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
 					ActivityPub\Processor::updatePerson($object_data, $body);
 				}
 				break;
 
-			case 'Delete':
-				if ($object_data['object_type'] == 'Tombstone') {
+			case 'as:Delete':
+				if ($object_data['object_type'] == 'as:Tombstone') {
 					ActivityPub\Processor::deleteItem($object_data, $body);
-				} elseif (in_array($object_data['object_type'], ActivityPub::ACCOUNT_TYPES)) {
+				} elseif (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
 					ActivityPub\Processor::deletePerson($object_data, $body);
 				}
 				break;
 
-			case 'Follow':
+			case 'as:Follow':
 				ActivityPub\Processor::followUser($object_data);
 				break;
 
-			case 'Accept':
-				if ($object_data['object_type'] == 'Follow') {
+			case 'as:Accept':
+				if ($object_data['object_type'] == 'as:Follow') {
 					ActivityPub\Processor::acceptFollowUser($object_data);
 				}
 				break;
 
-			case 'Reject':
-				if ($object_data['object_type'] == 'Follow') {
+			case 'as:Reject':
+				if ($object_data['object_type'] == 'as:Follow') {
 					ActivityPub\Processor::rejectFollowUser($object_data);
 				}
 				break;
 
-			case 'Undo':
-				if ($object_data['object_type'] == 'Follow') {
+			case 'as:Undo':
+				if ($object_data['object_type'] == 'as:Follow') {
 					ActivityPub\Processor::undoFollowUser($object_data);
-				} elseif (in_array($object_data['object_type'], ActivityPub::ACTIVITY_TYPES)) {
+				} elseif (in_array($object_data['object_type'], self::ACTIVITY_TYPES)) {
 					ActivityPub\Processor::undoActivity($object_data);
 				}
 				break;
 
 			default:
-				logger('Unknown activity: ' . $activity['type'], LOGGER_DEBUG);
+				logger('Unknown activity: ' . $type, LOGGER_DEBUG);
 				break;
 		}
 	}
 
 	/**
-	 * 
+	 * Fetch the receiver list from an activity array
 	 *
 	 * @param array $activity
-	 * @param $actor
+	 * @param string $actor
 	 *
-	 * @return 
+	 * @return array with receivers (user id)
 	 */
 	private static function getReceivers($activity, $actor)
 	{
 		$receivers = [];
 
 		// When it is an answer, we inherite the receivers from the parent
-		$replyto = JsonLD::fetchElement($activity, 'inReplyTo', 'id');
+		$replyto = JsonLD::fetchElement($activity, 'as:inReplyTo');
 		if (!empty($replyto)) {
 			$parents = Item::select(['uid'], ['uri' => $replyto]);
 			while ($parent = Item::fetch($parents)) {
@@ -302,22 +317,18 @@ class Receiver
 			$followers = '';
 		}
 
-		foreach (['to', 'cc', 'bto', 'bcc'] as $element) {
-			if (empty($activity[$element])) {
+		foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc'] as $element) {
+			$receiver_list = JsonLD::fetchElementArray($activity, $element);
+			if (empty($receiver_list)) {
 				continue;
 			}
 
-			// The receiver can be an array or a string
-			if (is_string($activity[$element])) {
-				$activity[$element] = [$activity[$element]];
-			}
-
-			foreach ($activity[$element] as $receiver) {
-				if ($receiver == ActivityPub::PUBLIC_COLLECTION) {
+			foreach ($receiver_list as $receiver) {
+				if ($receiver == self::PUBLIC_COLLECTION) {
 					$receivers['uid:0'] = 0;
 				}
 
-				if (($receiver == ActivityPub::PUBLIC_COLLECTION) && !empty($actor)) {
+				if (($receiver == self::PUBLIC_COLLECTION) && !empty($actor)) {
 					// This will most likely catch all OStatus connections to Mastodon
 					$condition = ['alias' => [$actor, normalise_link($actor)], 'rel' => [Contact::SHARING, Contact::FRIEND]
 						, 'archive' => false, 'pending' => false];
@@ -330,7 +341,7 @@ class Receiver
 					DBA::close($contacts);
 				}
 
-				if (in_array($receiver, [$followers, ActivityPub::PUBLIC_COLLECTION]) && !empty($actor)) {
+				if (in_array($receiver, [$followers, self::PUBLIC_COLLECTION]) && !empty($actor)) {
 					$condition = ['nurl' => normalise_link($actor), 'rel' => [Contact::SHARING, Contact::FRIEND],
 						'network' => Protocol::ACTIVITYPUB, 'archive' => false, 'pending' => false];
 					$contacts = DBA::select('contact', ['uid'], $condition);
@@ -453,9 +464,9 @@ class Receiver
 	 * @param $object
 	 * @param $trust_source
 	 *
-	 * @return 
+	 * @return array with object data
 	 */
-	private static function fetchObject($object_id, $object = [], $trust_source = false)
+	private static function fetchObject($object_id, $object = [], $ldobject = [], $trust_source = false)
 	{
 		if (!$trust_source || is_string($object)) {
 			$data = ActivityPub::fetchContent($object_id);
@@ -463,6 +474,7 @@ class Receiver
 				logger('Empty content for ' . $object_id . ', check if content is available locally.', LOGGER_DEBUG);
 				$data = $object_id;
 			} else {
+				$ldobject = JsonLD::compact($data);
 				logger('Fetched content for ' . $object_id, LOGGER_DEBUG);
 			}
 		} else {
@@ -478,6 +490,7 @@ class Receiver
 			}
 			logger('Using already stored item for url ' . $object_id, LOGGER_DEBUG);
 			$data = ActivityPub\Transmitter::createNote($item);
+			$ldobject = JsonLD::compact($data);
 		}
 
 		if (empty($data['type'])) {
@@ -486,7 +499,7 @@ class Receiver
 		}
 
 		if (in_array($data['type'], ActivityPub::CONTENT_TYPES)) {
-			return self::processObject($data);
+			return self::processObject($ldobject);
 		}
 
 		if ($data['type'] == 'Announce') {
@@ -500,55 +513,107 @@ class Receiver
 	}
 
 	/**
-	 * 
+	 * Convert tags from JSON-LD format into a simplified format
 	 *
-	 * @param $object
+	 * @param array $tags Tags in JSON-LD format
 	 *
-	 * @return 
+	 * @return array with tags in a simplified format
+	 */
+	private static function processTags($tags)
+	{
+		$taglist = [];
+		foreach ($tags as $tag) {
+			$taglist[] = ['type' => str_replace('as:', '', JsonLD::fetchElement($tag, '@type')),
+				'href' => JsonLD::fetchElement($tag, 'as:href'),
+				'name' => JsonLD::fetchElement($tag, 'as:name')];
+		}
+		return $taglist;
+	}
+
+	/**
+	 * Convert attachments from JSON-LD format into a simplified format
+	 *
+	 * @param array $attachments Attachments in JSON-LD format
+	 *
+	 * @return array with attachmants in a simplified format
+	 */
+	private static function processAttachments($attachments)
+	{
+		$attachlist = [];
+		foreach ($attachments as $attachment) {
+			$attachlist[] = ['type' => str_replace('as:', '', JsonLD::fetchElement($attachment, '@type')),
+				'mediaType' => JsonLD::fetchElement($attachment, 'as:mediaType'),
+				'name' => JsonLD::fetchElement($attachment, 'as:name'),
+				'url' => JsonLD::fetchElement($attachment, 'as:url')];
+		}
+		return $attachlist;
+	}
+
+	/**
+	 * Fetches data from the object part of an activity
+	 *
+	 * @param array $object
+	 *
+	 * @return array
 	 */
 	private static function processObject($object)
 	{
-		if (empty($object['id'])) {
+		if (!JsonLD::fetchElement($object, '@id')) {
 			return false;
 		}
 
 		$object_data = [];
-		$object_data['object_type'] = $object['type'];
-		$object_data['id'] = $object['id'];
+		$object_data['object_type'] = JsonLD::fetchElement($object, '@type');
+		$object_data['id'] = JsonLD::fetchElement($object, '@id');
 
-		if (!empty($object['inReplyTo'])) {
-			$object_data['reply-to-id'] = JsonLD::fetchElement($object, 'inReplyTo', 'id');
-		} else {
+		$object_data['reply-to-id'] = JsonLD::fetchElement($object, 'as:inReplyTo');
+
+		if (empty($object_data['reply-to-id'])) {
 			$object_data['reply-to-id'] = $object_data['id'];
 		}
 
-		$object_data['published'] = defaults($object, 'published', null);
-		$object_data['updated'] = defaults($object, 'updated', $object_data['published']);
+		$object_data['published'] = JsonLD::fetchElement($object, 'as:published', '@value');
+		$object_data['updated'] = JsonLD::fetchElement($object, 'as:updated', '@value');
+
+		if (empty($object_data['updated'])) {
+			$object_data['updated'] = $object_data['published'];
+		}
 
 		if (empty($object_data['published']) && !empty($object_data['updated'])) {
 			$object_data['published'] = $object_data['updated'];
 		}
 
-		$actor = JsonLD::fetchElement($object, 'attributedTo', 'id');
+		$actor = JsonLD::fetchElement($object, 'as:attributedTo');
 		if (empty($actor)) {
-			$actor = defaults($object, 'actor', null);
+			$actor = JsonLD::fetchElement($object, 'as:actor');
 		}
 
-		$object_data['diaspora:guid'] = defaults($object, 'diaspora:guid', null);
+		$object_data['diaspora:guid'] = JsonLD::fetchElement($object, 'diaspora:guid');
+		$object_data['diaspora:comment'] = JsonLD::fetchElement($object, 'diaspora:comment');
 		$object_data['owner'] = $object_data['author'] = $actor;
-		$object_data['context'] = defaults($object, 'context', null);
-		$object_data['conversation'] = defaults($object, 'conversation', null);
-		$object_data['sensitive'] = defaults($object, 'sensitive', null);
-		$object_data['name'] = defaults($object, 'title', null);
-		$object_data['name'] = defaults($object, 'name', $object_data['name']);
-		$object_data['summary'] = defaults($object, 'summary', null);
-		$object_data['content'] = defaults($object, 'content', null);
-		$object_data['source'] = defaults($object, 'source', null);
-		$object_data['location'] = JsonLD::fetchElement($object, 'location', 'name', 'type', 'Place');
-		$object_data['attachments'] = defaults($object, 'attachment', null);
-		$object_data['tags'] = defaults($object, 'tag', null);
-		$object_data['service'] = JsonLD::fetchElement($object, 'instrument', 'name', 'type', 'Service');
-		$object_data['alternate-url'] = JsonLD::fetchElement($object, 'url', 'href');
+		$object_data['context'] = JsonLD::fetchElement($object, 'as:context');
+		$object_data['conversation'] = JsonLD::fetchElement($object, 'ostatus:conversation');
+		$object_data['sensitive'] = JsonLD::fetchElement($object, 'as:sensitive');
+		$object_data['name'] = JsonLD::fetchElement($object, 'as:name');
+		$object_data['summary'] = JsonLD::fetchElement($object, 'as:summary');
+		$object_data['content'] = JsonLD::fetchElement($object, 'as:content');
+		$object_data['source'] = JsonLD::fetchElement($object, 'as:source', 'as:content', 'as:mediaType', 'text/bbcode');
+		$object_data['location'] = JsonLD::fetchElement($object, 'as:location', 'as:name', '@type', 'as:Place');
+		$object_data['attachments'] = self::processAttachments(JsonLD::fetchElementArray($object, 'as:attachment'));
+		$object_data['tags'] = self::processTags(JsonLD::fetchElementArray($object, 'as:tag'));
+//		$object_data['service'] = JsonLD::fetchElement($object, 'instrument', 'name', 'type', 'Service'); // todo
+		$object_data['service'] = null;
+		$object_data['alternate-url'] = JsonLD::fetchElement($object, 'as:url');
+
+		// Special treatment for Hubzilla links
+		if (is_array($object_data['alternate-url'])) {
+			if (!empty($object['as:url'])) {
+				$object_data['alternate-url'] = JsonLD::fetchElement($object['as:url'], 'as:href');
+			} else {
+				$object_data['alternate-url'] = null;
+			}
+		}
+
 		$object_data['receiver'] = self::getReceivers($object, $object_data['owner']);
 
 		// Common object data:
diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index cb3e1f30af..26467e68f8 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -29,6 +29,10 @@ use Friendica\Core\Cache;
  *
  * To-Do:
  *
+ * Missing object fields:
+ * - service (App)
+ * - location
+ *
  * Missing object types:
  * - Event
  *
diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index ddf8d93533..b4c362884c 100644
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -82,10 +82,13 @@ class JsonLD
 	{
 		jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader');
 
-		$context = (object)['as' => 'https://www.w3.org/ns/activitystreams',
-			'w3sec' => 'https://w3id.org/security',
-			'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
+		$context = (object)['as' => 'https://www.w3.org/ns/activitystreams#',
+			'w3id' => 'https://w3id.org/security#',
 			'vcard' => (object)['@id' => 'http://www.w3.org/2006/vcard/ns#', '@type' => '@id'],
+			'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
+			'diaspora' => (object)['@id' => 'https://diasporafoundation.org/ns/', '@type' => '@id'],
+			'dc' => (object)['@id' => 'http://purl.org/dc/terms/', '@type' => '@id'],
+			'dc' => (object)['@id' => 'http://purl.org/dc/terms/', '@type' => '@id'],
 			'uuid' => (object)['@id' => 'http://schema.org/identifier', '@type' => '@id']];
 
 		$jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
@@ -95,6 +98,45 @@ class JsonLD
 		return json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
 	}
 
+	/**
+	 * @brief Fetches an element array from a JSON array
+	 *
+	 * @param $array
+	 * @param $element
+	 * @param $key
+	 *
+	 * @return fetched element array
+	 */
+	public static function fetchElementArray($array, $element, $key = '@id')
+	{
+		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]))) {
+			$array[$element] = [$array[$element]];
+		}
+
+		$elements = [];
+
+		foreach ($array[$element] as $entry) {
+			if (!is_array($entry)) {
+				$elements[] = $entry;
+			} elseif (!empty($entry[$key])) {
+				$elements[] = $entry[$key];
+			} else {
+				$elements[] = $entry;
+			}
+		}
+
+		return $elements;
+	}
+
 	/**
 	 * @brief Fetches an element from a JSON array
 	 *
@@ -106,38 +148,40 @@ class JsonLD
 	 *
 	 * @return fetched element
 	 */
-	public static function fetchElement($array, $element, $key, $type = null, $type_value = null)
+	public static function fetchElement($array, $element, $key = '@id', $type = null, $type_value = null)
 	{
 		if (empty($array)) {
-			return false;
+			return null;
 		}
 
-		if (empty($array[$element])) {
-			return false;
+		if (!isset($array[$element])) {
+			return null;
 		}
 
-		if (is_string($array[$element])) {
+		if (!is_array($array[$element])) {
 			return $array[$element];
 		}
 
-		if (is_null($type_value)) {
-			if (!empty($array[$element][$key])) {
-				return $array[$element][$key];
+		if (is_null($type) || is_null($type_value)) {
+			$element_array = self::fetchElementArray($array, $element, $key);
+			if (is_null($element_array)) {
+				return null;
 			}
 
-			if (!empty($array[$element][0][$key])) {
-				return $array[$element][0][$key];
+			return array_shift($element_array);
+		}
+
+		$element_array = self::fetchElementArray($array, $element);
+		if (is_null($element_array)) {
+			return null;
+		}
+
+		foreach ($element_array as $entry) {
+			if (isset($entry[$key]) && isset($entry[$type]) && ($entry[$type] == $type_value)) {
+				return $entry[$key];
 			}
-
-			return false;
 		}
 
-		if (!empty($array[$element][$key]) && !empty($array[$element][$type]) && ($array[$element][$type] == $type_value)) {
-			return $array[$element][$key];
-		}
-
-		/// @todo Add array search
-
-		return false;
+		return null;
 	}
 }

From 36c31e409150998135d8740bbb2d663eb5892cf3 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 7 Oct 2018 15:34:51 +0000
Subject: [PATCH 2/8] Switching to parsing the JSON-LD

---
 src/Protocol/ActivityPub/Processor.php | 41 +++++++++-------
 src/Protocol/ActivityPub/Receiver.php  | 65 +++++++++++++++-----------
 2 files changed, 60 insertions(+), 46 deletions(-)

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index f117c8c33e..819892cb66 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -138,7 +138,7 @@ class Processor
 	{
 		$item = [];
 		$item['verb'] = ACTIVITY_LIKE;
-		$item['parent-uri'] = $activity['object'];
+		$item['parent-uri'] = JsonLD::fetchElement($activity, 'object');
 		$item['gravity'] = GRAVITY_ACTIVITY;
 		$item['object-type'] = ACTIVITY_OBJ_NOTE;
 
@@ -154,7 +154,7 @@ class Processor
 	public static function deleteItem($activity)
 	{
 		$owner = Contact::getIdForURL($activity['owner']);
-		$object = JsonLD::fetchElement($activity, 'object', 'id');
+		$object = JsonLD::fetchElement($activity, 'object');
 		logger('Deleting item ' . $object . ' from ' . $owner, LOGGER_DEBUG);
 		Item::delete(['uri' => $object, 'owner-id' => $owner]);
 	}
@@ -169,7 +169,7 @@ class Processor
 	{
 		$item = [];
 		$item['verb'] = ACTIVITY_DISLIKE;
-		$item['parent-uri'] = $activity['object'];
+		$item['parent-uri'] = JsonLD::fetchElement($activity, 'object');
 		$item['gravity'] = GRAVITY_ACTIVITY;
 		$item['object-type'] = ACTIVITY_OBJ_NOTE;
 
@@ -261,7 +261,8 @@ class Processor
 		$activity['published'] = $object['published'];
 		$activity['type'] = 'Create';
 
-		ActivityPub\Receiver::processActivity($activity);
+		$ldactivity = JsonLD::compact($activity);
+		ActivityPub\Receiver::processActivity($activity, $ldactivity);
 		logger('Activity ' . $url . ' had been fetched and processed.');
 	}
 
@@ -272,7 +273,7 @@ class Processor
 	 */
 	public static function followUser($activity)
 	{
-		$actor = JsonLD::fetchElement($activity, 'object', 'id');
+		$actor = JsonLD::fetchElement($activity, 'object');
 		$uid = User::getIdForURL($actor);
 		if (empty($uid)) {
 			return;
@@ -312,12 +313,13 @@ class Processor
 	 */
 	public static function updatePerson($activity)
 	{
-		if (empty($activity['object']['id'])) {
+		$actor = JsonLD::fetchElement($activity, 'object');
+		if ($actor) {
 			return;
 		}
 
-		logger('Updating profile for ' . $activity['object']['id'], LOGGER_DEBUG);
-		APContact::getByURL($activity['object']['id'], true);
+		logger('Updating profile for ' . $actor, LOGGER_DEBUG);
+		APContact::getByURL($actor, true);
 	}
 
 	/**
@@ -327,23 +329,26 @@ class Processor
 	 */
 	public static function deletePerson($activity)
 	{
-		if (empty($activity['object']['id']) || empty($activity['object']['actor'])) {
+		$id = JsonLD::fetchElement($activity, 'object');
+		$actor = JsonLD::fetchElement($activity, 'object', 'as:actor');
+
+		if (empty($id) || empty($actor)) {
 			logger('Empty object id or actor.', LOGGER_DEBUG);
 			return;
 		}
 
-		if ($activity['object']['id'] != $activity['object']['actor']) {
+		if ($id != $actor) {
 			logger('Object id does not match actor.', LOGGER_DEBUG);
 			return;
 		}
 
-		$contacts = DBA::select('contact', ['id'], ['nurl' => normalise_link($activity['object']['id'])]);
+		$contacts = DBA::select('contact', ['id'], ['nurl' => normalise_link($id)]);
 		while ($contact = DBA::fetch($contacts)) {
-			Contact::remove($contact["id"]);
+			Contact::remove($contact['id']);
 		}
 		DBA::close($contacts);
 
-		logger('Deleted contact ' . $activity['object']['id'], LOGGER_DEBUG);
+		logger('Deleted contact ' . $id, LOGGER_DEBUG);
 	}
 
 	/**
@@ -353,7 +358,7 @@ class Processor
 	 */
 	public static function acceptFollowUser($activity)
 	{
-		$actor = JsonLD::fetchElement($activity, 'object', 'actor');
+		$actor = JsonLD::fetchElement($activity, 'object', 'as:actor');
 		$uid = User::getIdForURL($actor);
 		if (empty($uid)) {
 			return;
@@ -386,7 +391,7 @@ class Processor
 	 */
 	public static function rejectFollowUser($activity)
 	{
-		$actor = JsonLD::fetchElement($activity, 'object', 'actor');
+		$actor = JsonLD::fetchElement($activity, 'object', 'as:actor');
 		$uid = User::getIdForURL($actor);
 		if (empty($uid)) {
 			return;
@@ -415,12 +420,12 @@ class Processor
 	 */
 	public static function undoActivity($activity)
 	{
-		$activity_url = JsonLD::fetchElement($activity, 'object', 'id');
+		$activity_url = JsonLD::fetchElement($activity, 'object');
 		if (empty($activity_url)) {
 			return;
 		}
 
-		$actor = JsonLD::fetchElement($activity, 'object', 'actor');
+		$actor = JsonLD::fetchElement($activity, 'object', 'as:actor');
 		if (empty($actor)) {
 			return;
 		}
@@ -440,7 +445,7 @@ class Processor
 	 */
 	public static function undoFollowUser($activity)
 	{
-		$object = JsonLD::fetchElement($activity, 'object', 'object');
+		$object = JsonLD::fetchElement($activity, 'object', 'as:object');
 		$uid = User::getIdForURL($object);
 		if (empty($uid)) {
 			return;
diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 48bfc0c8c8..1d807365bb 100644
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -150,7 +150,7 @@ class Receiver
 
 		// Fetch the content only on activities where this matters
 		if (in_array($type, ['as:Create', 'as:Announce'])) {
-			$object_data = self::fetchObject($object_id, $activity['object'], $ldactivity['as:object'], $trust_source);
+			$object_data = self::fetchObject($object_id, $ldactivity['as:object'], $trust_source);
 			if (empty($object_data)) {
 				logger("Object data couldn't be processed", LOGGER_DEBUG);
 				return [];
@@ -168,13 +168,13 @@ class Receiver
 		} else {
 			$object_data = [];
 			$object_data['id'] = JsonLD::fetchElement($ldactivity, '@id');
-			$object_data['object'] = $activity['object'];
+			$object_data['object'] = $ldactivity['as:object'];
 			$object_data['object_type'] = JsonLD::fetchElement($ldactivity, 'as:object', '@type');
 		}
 
 		$object_data = self::addActivityFields($object_data, $activity);
 
-		$object_data['type'] = $activity['type'];
+		$object_data['type'] = $type;
 		$object_data['owner'] = $actor;
 		$object_data['receiver'] = array_merge(defaults($object_data, 'receiver', []), $receivers);
 
@@ -466,50 +466,49 @@ class Receiver
 	 *
 	 * @return array with object data
 	 */
-	private static function fetchObject($object_id, $object = [], $ldobject = [], $trust_source = false)
+	private static function fetchObject($object_id, $object = [], $trust_source = false)
 	{
-		if (!$trust_source || is_string($object)) {
+		if (!$trust_source || empty($object)) {
 			$data = ActivityPub::fetchContent($object_id);
-			if (empty($data)) {
-				logger('Empty content for ' . $object_id . ', check if content is available locally.', LOGGER_DEBUG);
-				$data = $object_id;
-			} else {
-				$ldobject = JsonLD::compact($data);
+			if (!empty($data)) {
+				$object = JsonLD::compact($data);
 				logger('Fetched content for ' . $object_id, LOGGER_DEBUG);
+			} else {
+				logger('Empty content for ' . $object_id . ', check if content is available locally.', LOGGER_DEBUG);
+
+				$item = Item::selectFirst([], ['uri' => $object_id]);
+				if (!DBA::isResult($item)) {
+					logger('Object with url ' . $object_id . ' was not found locally.', LOGGER_DEBUG);
+					return false;
+				}
+				logger('Using already stored item for url ' . $object_id, LOGGER_DEBUG);
+				$data = ActivityPub\Transmitter::createNote($item);
+				$object = JsonLD::compact($data);
 			}
 		} else {
 			logger('Using original object for url ' . $object_id, LOGGER_DEBUG);
-			$data = $object;
 		}
 
-		if (is_string($data)) {
-			$item = Item::selectFirst([], ['uri' => $data]);
-			if (!DBA::isResult($item)) {
-				logger('Object with url ' . $data . ' was not found locally.', LOGGER_DEBUG);
-				return false;
-			}
-			logger('Using already stored item for url ' . $object_id, LOGGER_DEBUG);
-			$data = ActivityPub\Transmitter::createNote($item);
-			$ldobject = JsonLD::compact($data);
-		}
+		$type = JsonLD::fetchElement($object, '@type');
 
-		if (empty($data['type'])) {
+		if (empty($type)) {
 			logger('Empty type', LOGGER_DEBUG);
 			return false;
 		}
 
-		if (in_array($data['type'], ActivityPub::CONTENT_TYPES)) {
-			return self::processObject($ldobject);
+		if (in_array($type, self::CONTENT_TYPES)) {
+			return self::processObject($object);
 		}
 
-		if ($data['type'] == 'Announce') {
-			if (empty($data['object'])) {
+		if ($type == 'as:Announce') {
+			$object_id = JsonLD::fetchElement($object, 'object');
+			if (empty($object_id)) {
 				return false;
 			}
-			return self::fetchObject($data['object']);
+			return self::fetchObject($object_id);
 		}
 
-		logger('Unhandled object type: ' . $data['type'], LOGGER_DEBUG);
+		logger('Unhandled object type: ' . $type, LOGGER_DEBUG);
 	}
 
 	/**
@@ -522,7 +521,12 @@ class Receiver
 	private static function processTags($tags)
 	{
 		$taglist = [];
+
 		foreach ($tags as $tag) {
+			if (empty($tag)) {
+				continue;
+			}
+
 			$taglist[] = ['type' => str_replace('as:', '', JsonLD::fetchElement($tag, '@type')),
 				'href' => JsonLD::fetchElement($tag, 'as:href'),
 				'name' => JsonLD::fetchElement($tag, 'as:name')];
@@ -540,7 +544,12 @@ class Receiver
 	private static function processAttachments($attachments)
 	{
 		$attachlist = [];
+
 		foreach ($attachments as $attachment) {
+			if (empty($attachment)) {
+				continue;
+			}
+
 			$attachlist[] = ['type' => str_replace('as:', '', JsonLD::fetchElement($attachment, '@type')),
 				'mediaType' => JsonLD::fetchElement($attachment, 'as:mediaType'),
 				'name' => JsonLD::fetchElement($attachment, 'as:name'),

From 616c4a89bd9fde2be3bf398bcd0cc777f617a5fe Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 7 Oct 2018 17:17:06 +0000
Subject: [PATCH 3/8] The new parsing is now active

---
 src/Module/Inbox.php                   |  4 +-
 src/Protocol/ActivityPub.php           |  3 +-
 src/Protocol/ActivityPub/Processor.php |  2 +-
 src/Protocol/ActivityPub/Receiver.php  | 58 +++++++++++++++-----------
 4 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php
index c190be4d1f..3b845074d2 100644
--- a/src/Module/Inbox.php
+++ b/src/Module/Inbox.php
@@ -26,7 +26,7 @@ class Inbox extends BaseModule
 		}
 
 // Enable for test purposes
-/*
+
 		if (HTTPSignature::getSigner($postdata, $_SERVER)) {
 			$filename = 'signed-activitypub';
 		} else {
@@ -37,7 +37,7 @@ class Inbox extends BaseModule
 		file_put_contents($tempfile, json_encode(['argv' => $a->argv, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
 
 		logger('Incoming message stored under ' . $tempfile);
-*/
+
 		if (!empty($a->argv[1])) {
 			$user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
 			if (!DBA::isResult($user)) {
diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index e7614afa99..b1680178e3 100644
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -134,7 +134,8 @@ class ActivityPub
 		}
 
 		foreach ($items as $activity) {
-			ActivityPub\Receiver::processActivity($activity, '', $uid, true);
+			$ldactivity = JsonLD::compact($activity);
+			ActivityPub\Receiver::processActivity($ldactivity, '', $uid, true);
 		}
 	}
 }
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 819892cb66..b798b1f2b2 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -262,7 +262,7 @@ class Processor
 		$activity['type'] = 'Create';
 
 		$ldactivity = JsonLD::compact($activity);
-		ActivityPub\Receiver::processActivity($activity, $ldactivity);
+		ActivityPub\Receiver::processActivity($ldactivity);
 		logger('Activity ' . $url . ' had been fetched and processed.');
 	}
 
diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 1d807365bb..28f0673fab 100644
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -108,7 +108,7 @@ class Receiver
 			$trust_source = false;
 		}
 
-		self::processActivity($activity, $ldactivity, $body, $uid, $trust_source);
+		self::processActivity($ldactivity, $body, $uid, $trust_source);
 	}
 
 	/**
@@ -120,7 +120,7 @@ class Receiver
 	 *
 	 * @return 
 	 */
-	private static function prepareObjectData($activity, $ldactivity, $uid, &$trust_source)
+	private static function prepareObjectData($ldactivity, $uid, &$trust_source)
 	{
 		$actor = JsonLD::fetchElement($ldactivity, 'as:actor');
 		if (empty($actor)) {
@@ -150,6 +150,9 @@ class Receiver
 
 		// Fetch the content only on activities where this matters
 		if (in_array($type, ['as:Create', 'as:Announce'])) {
+			if ($type == 'as:Announce') {
+				$trust_source = false;
+			}
 			$object_data = self::fetchObject($object_id, $ldactivity['as:object'], $trust_source);
 			if (empty($object_data)) {
 				logger("Object data couldn't be processed", LOGGER_DEBUG);
@@ -172,7 +175,7 @@ class Receiver
 			$object_data['object_type'] = JsonLD::fetchElement($ldactivity, 'as:object', '@type');
 		}
 
-		$object_data = self::addActivityFields($object_data, $activity);
+		$object_data = self::addActivityFields($object_data, $ldactivity);
 
 		$object_data['type'] = $type;
 		$object_data['owner'] = $actor;
@@ -184,19 +187,15 @@ class Receiver
 	}
 
 	/**
-	 * 
+	 * Processes the activity object
 	 *
-	 * @param array $activity
-	 * @param $body
-	 * @param integer $uid User ID
-	 * @param $trust_source
+	 * @param array   $activity     Array with activity data
+	 * @param string  $body
+	 * @param integer $uid          User ID
+	 * @param boolean $trust_source Do we trust the source?
 	 */
-	public static function processActivity($activity, $ldactivity = '', $body = '', $uid = null, $trust_source = false)
+	public static function processActivity($ldactivity, $body = '', $uid = null, $trust_source = false)
 	{
-		if (empty($ldactivity)) {
-			$ldactivity = JsonLD::compact($activity);
-		}
-
 		$type = JsonLD::fetchElement($ldactivity, '@type');
 		if (!$type) {
 			logger('Empty type', LOGGER_DEBUG);
@@ -215,7 +214,7 @@ class Receiver
 		}
 
 		// $trust_source is called by reference and is set to true if the content was retrieved successfully
-		$object_data = self::prepareObjectData($activity, $ldactivity, $uid, $trust_source);
+		$object_data = self::prepareObjectData($ldactivity, $uid, $trust_source);
 		if (empty($object_data)) {
 			logger('No object data found', LOGGER_DEBUG);
 			return;
@@ -436,19 +435,19 @@ class Receiver
 	private static function addActivityFields($object_data, $activity)
 	{
 		if (!empty($activity['published']) && empty($object_data['published'])) {
-			$object_data['published'] = $activity['published'];
+			$object_data['published'] = JsonLD::fetchElement($activity, 'published', '@value');
 		}
 
 		if (!empty($activity['updated']) && empty($object_data['updated'])) {
-			$object_data['updated'] = $activity['updated'];
+			$object_data['updated'] = JsonLD::fetchElement($activity, 'updated', '@value');
 		}
 
 		if (!empty($activity['diaspora:guid']) && empty($object_data['diaspora:guid'])) {
-			$object_data['diaspora:guid'] = $activity['diaspora:guid'];
+			$object_data['diaspora:guid'] = JsonLD::fetchElement($activity, 'diaspora:guid');
 		}
 
 		if (!empty($activity['inReplyTo']) && empty($object_data['parent-uri'])) {
-			$object_data['parent-uri'] = JsonLD::fetchElement($activity, 'inReplyTo', 'id');
+			$object_data['parent-uri'] = JsonLD::fetchElement($activity, 'inReplyTo');
 		}
 
 		if (!empty($activity['instrument'])) {
@@ -458,17 +457,20 @@ class Receiver
 	}
 
 	/**
-	 * 
+	 * Fetches the object data from external ressources if needed
 	 *
-	 * @param $object_id
-	 * @param $object
-	 * @param $trust_source
+	 * @param string  $object_id    Object ID of the the provided object
+	 * @param array   $object       The provided object array
+	 * @param boolean $trust_source Do we trust the provided object?
 	 *
-	 * @return array with object data
+	 * @return array with trusted and valid object data
 	 */
 	private static function fetchObject($object_id, $object = [], $trust_source = false)
 	{
-		if (!$trust_source || empty($object)) {
+		// By fetching the type we check if the object is complete.
+		$type = JsonLD::fetchElement($object, '@type');
+
+		if (!$trust_source || empty($type)) {
 			$data = ActivityPub::fetchContent($object_id);
 			if (!empty($data)) {
 				$object = JsonLD::compact($data);
@@ -522,6 +524,10 @@ class Receiver
 	{
 		$taglist = [];
 
+		if (empty($tags)) {
+			return [];
+		}
+
 		foreach ($tags as $tag) {
 			if (empty($tag)) {
 				continue;
@@ -545,6 +551,10 @@ class Receiver
 	{
 		$attachlist = [];
 
+		if (empty($attachments)) {
+			return [];
+		}
+
 		foreach ($attachments as $attachment) {
 			if (empty($attachment)) {
 				continue;

From 1efca1b75db472b743c15f5a3307895af30fd1e7 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 7 Oct 2018 17:35:43 +0000
Subject: [PATCH 4/8] owner is now actor

---
 src/Protocol/ActivityPub/Processor.php | 24 ++++++++++++------------
 src/Protocol/ActivityPub/Receiver.php  |  6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index b798b1f2b2..74d4416f1e 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -153,7 +153,7 @@ class Processor
 	 */
 	public static function deleteItem($activity)
 	{
-		$owner = Contact::getIdForURL($activity['owner']);
+		$owner = Contact::getIdForURL($activity['actor']);
 		$object = JsonLD::fetchElement($activity, 'object');
 		logger('Deleting item ' . $object . ' from ' . $owner, LOGGER_DEBUG);
 		Item::delete(['uri' => $object, 'owner-id' => $owner]);
@@ -195,7 +195,7 @@ class Processor
 		$item['network'] = Protocol::ACTIVITYPUB;
 		$item['private'] = !in_array(0, $activity['receiver']);
 		$item['author-id'] = Contact::getIdForURL($activity['author'], 0, true);
-		$item['owner-id'] = Contact::getIdForURL($activity['owner'], 0, true);
+		$item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true);
 		$item['uri'] = $activity['id'];
 		$item['created'] = $activity['published'];
 		$item['edited'] = $activity['updated'];
@@ -281,18 +281,18 @@ class Processor
 
 		$owner = User::getOwnerDataById($uid);
 
-		$cid = Contact::getIdForURL($activity['owner'], $uid);
+		$cid = Contact::getIdForURL($activity['actor'], $uid);
 		if (!empty($cid)) {
 			$contact = DBA::selectFirst('contact', [], ['id' => $cid, 'network' => Protocol::NATIVE_SUPPORT]);
 		} else {
 			$contact = false;
 		}
 
-		$item = ['author-id' => Contact::getIdForURL($activity['owner']),
-			'author-link' => $activity['owner']];
+		$item = ['author-id' => Contact::getIdForURL($activity['actor']),
+			'author-link' => $activity['actor']];
 
 		Contact::addRelationship($owner, $contact, $item);
-		$cid = Contact::getIdForURL($activity['owner'], $uid);
+		$cid = Contact::getIdForURL($activity['actor'], $uid);
 		if (empty($cid)) {
 			return;
 		}
@@ -366,9 +366,9 @@ class Processor
 
 		$owner = User::getOwnerDataById($uid);
 
-		$cid = Contact::getIdForURL($activity['owner'], $uid);
+		$cid = Contact::getIdForURL($activity['actor'], $uid);
 		if (empty($cid)) {
-			logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG);
+			logger('No contact found for ' . $activity['actor'], LOGGER_DEBUG);
 			return;
 		}
 
@@ -399,9 +399,9 @@ class Processor
 
 		$owner = User::getOwnerDataById($uid);
 
-		$cid = Contact::getIdForURL($activity['owner'], $uid);
+		$cid = Contact::getIdForURL($activity['actor'], $uid);
 		if (empty($cid)) {
-			logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG);
+			logger('No contact found for ' . $activity['actor'], LOGGER_DEBUG);
 			return;
 		}
 
@@ -453,9 +453,9 @@ class Processor
 
 		$owner = User::getOwnerDataById($uid);
 
-		$cid = Contact::getIdForURL($activity['owner'], $uid);
+		$cid = Contact::getIdForURL($activity['actor'], $uid);
 		if (empty($cid)) {
-			logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG);
+			logger('No contact found for ' . $activity['actor'], LOGGER_DEBUG);
 			return;
 		}
 
diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 28f0673fab..1a261d2bfd 100644
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -178,7 +178,7 @@ class Receiver
 		$object_data = self::addActivityFields($object_data, $ldactivity);
 
 		$object_data['type'] = $type;
-		$object_data['owner'] = $actor;
+		$object_data['actor'] = $actor;
 		$object_data['receiver'] = array_merge(defaults($object_data, 'receiver', []), $receivers);
 
 		logger('Processing ' . $object_data['type'] . ' ' . $object_data['object_type'] . ' ' . $object_data['id'], LOGGER_DEBUG);
@@ -609,7 +609,7 @@ class Receiver
 
 		$object_data['diaspora:guid'] = JsonLD::fetchElement($object, 'diaspora:guid');
 		$object_data['diaspora:comment'] = JsonLD::fetchElement($object, 'diaspora:comment');
-		$object_data['owner'] = $object_data['author'] = $actor;
+		$object_data['actor'] = $object_data['author'] = $actor;
 		$object_data['context'] = JsonLD::fetchElement($object, 'as:context');
 		$object_data['conversation'] = JsonLD::fetchElement($object, 'ostatus:conversation');
 		$object_data['sensitive'] = JsonLD::fetchElement($object, 'as:sensitive');
@@ -633,7 +633,7 @@ class Receiver
 			}
 		}
 
-		$object_data['receiver'] = self::getReceivers($object, $object_data['owner']);
+		$object_data['receiver'] = self::getReceivers($object, $object_data['actor']);
 
 		// Common object data:
 

From bd6ba98e8d8da4fa3b2075734d1db5a65be2c3f5 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 7 Oct 2018 18:41:45 +0000
Subject: [PATCH 5/8] Some more cleanup

---
 src/Protocol/ActivityPub/Processor.php | 83 +++++++++++---------------
 src/Protocol/ActivityPub/Receiver.php  | 40 +++++++------
 2 files changed, 57 insertions(+), 66 deletions(-)

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 74d4416f1e..7d181234fe 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -67,9 +67,9 @@ class Processor
 	}
 
 	/**
-	 * 
+	 * Add attachment data to the item array
 	 *
-	 * @param $attachments
+	 * @param array $attachments
 	 * @param array $item
 	 *
 	 * @return item array
@@ -101,10 +101,10 @@ class Processor
 	}
 
 	/**
-	 * 
+	 * Prepares data for a message
 	 *
-	 * @param array $activity
-	 * @param $body
+	 * @param array  $activity Activity array
+	 * @param string $body     original source
 	 */
 	public static function createItem($activity, $body)
 	{
@@ -129,16 +129,16 @@ class Processor
 	}
 
 	/**
-	 * 
+	 * Prepare the item array for a "like"
 	 *
-	 * @param array $activity
-	 * @param $body
+	 * @param array  $activity Activity array
+	 * @param string $body     original source
 	 */
 	public static function likeItem($activity, $body)
 	{
 		$item = [];
 		$item['verb'] = ACTIVITY_LIKE;
-		$item['parent-uri'] = JsonLD::fetchElement($activity, 'object');
+		$item['parent-uri'] = $activity['object_id'];
 		$item['gravity'] = GRAVITY_ACTIVITY;
 		$item['object-type'] = ACTIVITY_OBJ_NOTE;
 
@@ -149,27 +149,26 @@ class Processor
 	 * Delete items
 	 *
 	 * @param array $activity
-	 * @param $body
 	 */
 	public static function deleteItem($activity)
 	{
 		$owner = Contact::getIdForURL($activity['actor']);
-		$object = JsonLD::fetchElement($activity, 'object');
-		logger('Deleting item ' . $object . ' from ' . $owner, LOGGER_DEBUG);
-		Item::delete(['uri' => $object, 'owner-id' => $owner]);
+
+		logger('Deleting item ' . $activity['object_id'] . ' from ' . $owner, LOGGER_DEBUG);
+		Item::delete(['uri' => $activity['object_id'], 'owner-id' => $owner]);
 	}
 
 	/**
-	 * 
+	 * Prepare the item array for a "dislike"
 	 *
-	 * @param array $activity
-	 * @param $body
+	 * @param array  $activity Activity array
+	 * @param string $body     original source
 	 */
 	public static function dislikeItem($activity, $body)
 	{
 		$item = [];
 		$item['verb'] = ACTIVITY_DISLIKE;
-		$item['parent-uri'] = JsonLD::fetchElement($activity, 'object');
+		$item['parent-uri'] = $activity['object_id'];
 		$item['gravity'] = GRAVITY_ACTIVITY;
 		$item['object-type'] = ACTIVITY_OBJ_NOTE;
 
@@ -177,11 +176,11 @@ class Processor
 	}
 
 	/**
-	 * 
+	 * Creates an item post
 	 *
-	 * @param array $activity
-	 * @param array $item
-	 * @param $body
+	 * @param array  $activity Activity data
+	 * @param array  $item     item array
+	 * @param string $body     original source
 	 */
 	private static function postItem($activity, $item, $body)
 	{
@@ -233,7 +232,7 @@ class Processor
 	}
 
 	/**
-	 * 
+	 * Fetches missing posts
 	 *
 	 * @param $url
 	 * @param $child
@@ -273,8 +272,7 @@ class Processor
 	 */
 	public static function followUser($activity)
 	{
-		$actor = JsonLD::fetchElement($activity, 'object');
-		$uid = User::getIdForURL($actor);
+		$uid = User::getIdForURL($activity['object_actor']);
 		if (empty($uid)) {
 			return;
 		}
@@ -313,13 +311,12 @@ class Processor
 	 */
 	public static function updatePerson($activity)
 	{
-		$actor = JsonLD::fetchElement($activity, 'object');
-		if ($actor) {
+		if (empty($activity['object_id'])) {
 			return;
 		}
 
-		logger('Updating profile for ' . $actor, LOGGER_DEBUG);
-		APContact::getByURL($actor, true);
+		logger('Updating profile for ' . $activity['object_id'], LOGGER_DEBUG);
+		APContact::getByURL($activity['object_id'], true);
 	}
 
 	/**
@@ -329,26 +326,23 @@ class Processor
 	 */
 	public static function deletePerson($activity)
 	{
-		$id = JsonLD::fetchElement($activity, 'object');
-		$actor = JsonLD::fetchElement($activity, 'object', 'as:actor');
-
-		if (empty($id) || empty($actor)) {
+		if (empty($activity['object_id']) || empty($activity['object_actor'])) {
 			logger('Empty object id or actor.', LOGGER_DEBUG);
 			return;
 		}
 
-		if ($id != $actor) {
+		if ($activity['object_id'] != $activity['object_actor']) {
 			logger('Object id does not match actor.', LOGGER_DEBUG);
 			return;
 		}
 
-		$contacts = DBA::select('contact', ['id'], ['nurl' => normalise_link($id)]);
+		$contacts = DBA::select('contact', ['id'], ['nurl' => normalise_link($activity['object_id'])]);
 		while ($contact = DBA::fetch($contacts)) {
 			Contact::remove($contact['id']);
 		}
 		DBA::close($contacts);
 
-		logger('Deleted contact ' . $id, LOGGER_DEBUG);
+		logger('Deleted contact ' . $activity['object_id'], LOGGER_DEBUG);
 	}
 
 	/**
@@ -358,8 +352,7 @@ class Processor
 	 */
 	public static function acceptFollowUser($activity)
 	{
-		$actor = JsonLD::fetchElement($activity, 'object', 'as:actor');
-		$uid = User::getIdForURL($actor);
+		$uid = User::getIdForURL($activity['object_actor']);
 		if (empty($uid)) {
 			return;
 		}
@@ -391,8 +384,7 @@ class Processor
 	 */
 	public static function rejectFollowUser($activity)
 	{
-		$actor = JsonLD::fetchElement($activity, 'object', 'as:actor');
-		$uid = User::getIdForURL($actor);
+		$uid = User::getIdForURL($activity['object_actor']);
 		if (empty($uid)) {
 			return;
 		}
@@ -420,22 +412,20 @@ class Processor
 	 */
 	public static function undoActivity($activity)
 	{
-		$activity_url = JsonLD::fetchElement($activity, 'object');
-		if (empty($activity_url)) {
+		if (empty($activity['object_id'])) {
 			return;
 		}
 
-		$actor = JsonLD::fetchElement($activity, 'object', 'as:actor');
-		if (empty($actor)) {
+		if (empty($activity['object_actor'])) {
 			return;
 		}
 
-		$author_id = Contact::getIdForURL($actor);
+		$author_id = Contact::getIdForURL($activity['object_actor']);
 		if (empty($author_id)) {
 			return;
 		}
 
-		Item::delete(['uri' => $activity_url, 'author-id' => $author_id, 'gravity' => GRAVITY_ACTIVITY]);
+		Item::delete(['uri' => $activity['object_id'], 'author-id' => $author_id, 'gravity' => GRAVITY_ACTIVITY]);
 	}
 
 	/**
@@ -445,8 +435,7 @@ class Processor
 	 */
 	public static function undoFollowUser($activity)
 	{
-		$object = JsonLD::fetchElement($activity, 'object', 'as:object');
-		$uid = User::getIdForURL($object);
+		$uid = User::getIdForURL($activity['object_object']);
 		if (empty($uid)) {
 			return;
 		}
diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 1a261d2bfd..ba6cd52ba3 100644
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -112,26 +112,26 @@ class Receiver
 	}
 
 	/**
-	 * 
+	 * Prepare the object array
 	 *
 	 * @param array $activity
 	 * @param integer $uid User ID
 	 * @param $trust_source
 	 *
-	 * @return 
+	 * @return array with object data
 	 */
-	private static function prepareObjectData($ldactivity, $uid, &$trust_source)
+	private static function prepareObjectData($activity, $uid, &$trust_source)
 	{
-		$actor = JsonLD::fetchElement($ldactivity, 'as:actor');
+		$actor = JsonLD::fetchElement($activity, 'as:actor');
 		if (empty($actor)) {
 			logger('Empty actor', LOGGER_DEBUG);
 			return [];
 		}
 
-		$type = JsonLD::fetchElement($ldactivity, '@type');
+		$type = JsonLD::fetchElement($activity, '@type');
 
 		// Fetch all receivers from to, cc, bto and bcc
-		$receivers = self::getReceivers($ldactivity, $actor);
+		$receivers = self::getReceivers($activity, $actor);
 
 		// When it is a delivery to a personal inbox we add that user to the receivers
 		if (!empty($uid)) {
@@ -142,7 +142,7 @@ class Receiver
 
 		logger('Receivers: ' . json_encode($receivers), LOGGER_DEBUG);
 
-		$object_id = JsonLD::fetchElement($ldactivity, 'as:object');
+		$object_id = JsonLD::fetchElement($activity, 'as:object');
 		if (empty($object_id)) {
 			logger('No object found', LOGGER_DEBUG);
 			return [];
@@ -153,7 +153,7 @@ class Receiver
 			if ($type == 'as:Announce') {
 				$trust_source = false;
 			}
-			$object_data = self::fetchObject($object_id, $ldactivity['as:object'], $trust_source);
+			$object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source);
 			if (empty($object_data)) {
 				logger("Object data couldn't be processed", LOGGER_DEBUG);
 				return [];
@@ -163,19 +163,21 @@ class Receiver
 		} elseif (in_array($type, ['as:Like', 'as:Dislike'])) {
 			// Create a mostly empty array out of the activity data (instead of the object).
 			// This way we later don't have to check for the existence of ech individual array element.
-			$object_data = self::processObject($ldactivity);
+			$object_data = self::processObject($activity);
 			$object_data['name'] = $type;
-			$object_data['author'] = JsonLD::fetchElement($ldactivity, 'as:actor');
+			$object_data['author'] = JsonLD::fetchElement($activity, 'as:actor');
 			$object_data['object'] = $object_id;
 			$object_data['object_type'] = ''; // Since we don't fetch the object, we don't know the type
 		} else {
 			$object_data = [];
-			$object_data['id'] = JsonLD::fetchElement($ldactivity, '@id');
-			$object_data['object'] = $ldactivity['as:object'];
-			$object_data['object_type'] = JsonLD::fetchElement($ldactivity, 'as:object', '@type');
+			$object_data['id'] = JsonLD::fetchElement($activity, '@id');
+			$object_data['object_id'] = JsonLD::fetchElement($activity, 'as:object');
+			$object_data['object_actor'] = JsonLD::fetchElement($activity['as:object'], 'as:actor');
+			$object_data['object_object'] = JsonLD::fetchElement($activity['as:object'], 'as:object');
+			$object_data['object_type'] = JsonLD::fetchElement($activity['as:object'], '@type');
 		}
 
-		$object_data = self::addActivityFields($object_data, $ldactivity);
+		$object_data = self::addActivityFields($object_data, $activity);
 
 		$object_data['type'] = $type;
 		$object_data['actor'] = $actor;
@@ -194,27 +196,27 @@ class Receiver
 	 * @param integer $uid          User ID
 	 * @param boolean $trust_source Do we trust the source?
 	 */
-	public static function processActivity($ldactivity, $body = '', $uid = null, $trust_source = false)
+	public static function processActivity($activity, $body = '', $uid = null, $trust_source = false)
 	{
-		$type = JsonLD::fetchElement($ldactivity, '@type');
+		$type = JsonLD::fetchElement($activity, '@type');
 		if (!$type) {
 			logger('Empty type', LOGGER_DEBUG);
 			return;
 		}
 
-		if (!JsonLD::fetchElement($ldactivity, 'as:object')) {
+		if (!JsonLD::fetchElement($activity, 'as:object')) {
 			logger('Empty object', LOGGER_DEBUG);
 			return;
 		}
 
-		if (!JsonLD::fetchElement($ldactivity, 'as:actor')) {
+		if (!JsonLD::fetchElement($activity, 'as:actor')) {
 			logger('Empty actor', LOGGER_DEBUG);
 			return;
 
 		}
 
 		// $trust_source is called by reference and is set to true if the content was retrieved successfully
-		$object_data = self::prepareObjectData($ldactivity, $uid, $trust_source);
+		$object_data = self::prepareObjectData($activity, $uid, $trust_source);
 		if (empty($object_data)) {
 			logger('No object data found', LOGGER_DEBUG);
 			return;

From 93866b477a2ea43ed12b72cf35bb3241e4c133b3 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 7 Oct 2018 19:42:04 +0000
Subject: [PATCH 6/8] Several fixes

---
 src/Module/Inbox.php                   | 4 ++--
 src/Protocol/ActivityPub.php           | 2 --
 src/Protocol/ActivityPub/Processor.php | 6 +++---
 src/Protocol/ActivityPub/Receiver.php  | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php
index 3b845074d2..c190be4d1f 100644
--- a/src/Module/Inbox.php
+++ b/src/Module/Inbox.php
@@ -26,7 +26,7 @@ class Inbox extends BaseModule
 		}
 
 // Enable for test purposes
-
+/*
 		if (HTTPSignature::getSigner($postdata, $_SERVER)) {
 			$filename = 'signed-activitypub';
 		} else {
@@ -37,7 +37,7 @@ class Inbox extends BaseModule
 		file_put_contents($tempfile, json_encode(['argv' => $a->argv, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
 
 		logger('Incoming message stored under ' . $tempfile);
-
+*/
 		if (!empty($a->argv[1])) {
 			$user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
 			if (!DBA::isResult($user)) {
diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index b1680178e3..b4668e9154 100644
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -39,8 +39,6 @@ class ActivityPub
 		'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
 		'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag']];
 	const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application'];
-	const CONTENT_TYPES = ['Note', 'Article', 'Video', 'Image'];
-	const ACTIVITY_TYPES = ['Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept'];
 	/**
 	 * Checks if the web request is done for the AP protocol
 	 *
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 7d181234fe..32cfcc6cb0 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -272,7 +272,7 @@ class Processor
 	 */
 	public static function followUser($activity)
 	{
-		$uid = User::getIdForURL($activity['object_actor']);
+		$uid = User::getIdForURL($activity['object_id']);
 		if (empty($uid)) {
 			return;
 		}
@@ -326,12 +326,12 @@ class Processor
 	 */
 	public static function deletePerson($activity)
 	{
-		if (empty($activity['object_id']) || empty($activity['object_actor'])) {
+		if (empty($activity['object_id']) || empty($activity['actor'])) {
 			logger('Empty object id or actor.', LOGGER_DEBUG);
 			return;
 		}
 
-		if ($activity['object_id'] != $activity['object_actor']) {
+		if ($activity['object_id'] != $activity['actor']) {
 			logger('Object id does not match actor.', LOGGER_DEBUG);
 			return;
 		}
diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index ba6cd52ba3..ac66aeb6ec 100644
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -166,7 +166,7 @@ class Receiver
 			$object_data = self::processObject($activity);
 			$object_data['name'] = $type;
 			$object_data['author'] = JsonLD::fetchElement($activity, 'as:actor');
-			$object_data['object'] = $object_id;
+			$object_data['object_id'] = $object_id;
 			$object_data['object_type'] = ''; // Since we don't fetch the object, we don't know the type
 		} else {
 			$object_data = [];

From 46f77f348628b5396e286617f22a43e90086a34b Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 7 Oct 2018 20:36:15 +0000
Subject: [PATCH 7/8] Detect the object type

---
 database.sql                          | 30 +++++++++++++++--
 src/Protocol/ActivityPub/Receiver.php | 47 +++++++++++++++++++++++++--
 2 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/database.sql b/database.sql
index 7188558042..a797c8df36 100644
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2018.12-dev (The Tazmans Flax-lily)
--- DB_UPDATE_VERSION 1283
+-- DB_UPDATE_VERSION 1284
 -- ------------------------------------------
 
 
@@ -19,6 +19,32 @@ CREATE TABLE IF NOT EXISTS `addon` (
 	 UNIQUE INDEX `name` (`name`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='registered addons';
 
+--
+-- TABLE apcontact
+--
+CREATE TABLE IF NOT EXISTS `apcontact` (
+	`url` varbinary(255) NOT NULL COMMENT 'URL of the contact',
+	`uuid` varchar(255) COMMENT '',
+	`type` varchar(20) NOT NULL COMMENT '',
+	`following` varchar(255) COMMENT '',
+	`followers` varchar(255) COMMENT '',
+	`inbox` varchar(255) NOT NULL COMMENT '',
+	`outbox` varchar(255) COMMENT '',
+	`sharedinbox` varchar(255) COMMENT '',
+	`nick` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`name` varchar(255) COMMENT '',
+	`about` text COMMENT '',
+	`photo` varchar(255) COMMENT '',
+	`addr` varchar(255) COMMENT '',
+	`alias` varchar(255) COMMENT '',
+	`pubkey` text COMMENT '',
+	`baseurl` varchar(255) COMMENT 'baseurl of the ap contact',
+	`updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	 PRIMARY KEY(`url`),
+	 INDEX `addr` (`addr`(32)),
+	 INDEX `url` (`followers`(190))
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='ActivityPub compatible contacts - used in the ActivityPub implementation';
+
 --
 -- TABLE attach
 --
@@ -212,7 +238,7 @@ CREATE TABLE IF NOT EXISTS `conversation` (
 	`reply-to-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT 'URI to which this item is a reply',
 	`conversation-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT 'GNU Social conversation URI',
 	`conversation-href` varbinary(255) NOT NULL DEFAULT '' COMMENT 'GNU Social conversation link',
-	`protocol` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'The protocol of the item',
+	`protocol` tinyint unsigned NOT NULL DEFAULT 255 COMMENT 'The protocol of the item',
 	`source` mediumtext COMMENT 'Original source',
 	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Receiving date',
 	 PRIMARY KEY(`item-uri`),
diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index ac66aeb6ec..1dac0bb827 100644
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -30,9 +30,6 @@ use Friendica\Protocol\ActivityPub;
  * - Remove
  * - Undo Block
  * - Undo Accept (Problem: This could invert a contact accept or an event accept)
- *
- * General:
- * - Possibly using the LD-JSON parser
  */
 class Receiver
 {
@@ -111,6 +108,44 @@ class Receiver
 		self::processActivity($ldactivity, $body, $uid, $trust_source);
 	}
 
+	/**
+	 * Fetches the object type for a given object id
+	 *
+	 * @param array  $activity
+	 * @param string $object_id Object ID of the the provided object
+	 *
+	 * @return string with object type
+	 */
+	private static function fetchObjectType($activity, $object_id)
+	{
+
+		$object_type = JsonLD::fetchElement($activity['as:object'], '@type');
+		if (!empty($object_type)) {
+			return $object_type;
+		}
+
+		if (Item::exists(['uri' => $object_id, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]])) {
+			// We just assume "note" since it doesn't make a difference for the further processing
+			return 'as:Note';
+		}
+
+		$profile = APContact::getByURL($object_id);
+		if (!empty($profile['type'])) {
+			return 'as:' . $profile['type'];
+		}
+
+		$data = ActivityPub::fetchContent($object_id);
+		if (!empty($data)) {
+			$object = JsonLD::compact($data);
+			$type = JsonLD::fetchElement($object, '@type');
+			if (!empty($type)) {
+				return $type;
+			}
+		}
+
+		return null;
+	}
+
 	/**
 	 * Prepare the object array
 	 *
@@ -148,6 +183,8 @@ class Receiver
 			return [];
 		}
 
+		$object_type = self::fetchObjectType($activity, $object_id);
+
 		// Fetch the content only on activities where this matters
 		if (in_array($type, ['as:Create', 'as:Announce'])) {
 			if ($type == 'as:Announce') {
@@ -179,6 +216,10 @@ class Receiver
 
 		$object_data = self::addActivityFields($object_data, $activity);
 
+		if (empty($object_data['object_type'])) {
+			$object_data['object_type'] = $object_type;
+		}
+
 		$object_data['type'] = $type;
 		$object_data['actor'] = $actor;
 		$object_data['receiver'] = array_merge(defaults($object_data, 'receiver', []), $receivers);

From 30ad6d60fd65ff2520baa7b0e4d18b77cf44096c Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 7 Oct 2018 20:51:39 +0000
Subject: [PATCH 8/8] Duplicated line removed

---
 src/Util/JsonLD.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index b4c362884c..a581892939 100644
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -88,7 +88,6 @@ class JsonLD
 			'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
 			'diaspora' => (object)['@id' => 'https://diasporafoundation.org/ns/', '@type' => '@id'],
 			'dc' => (object)['@id' => 'http://purl.org/dc/terms/', '@type' => '@id'],
-			'dc' => (object)['@id' => 'http://purl.org/dc/terms/', '@type' => '@id'],
 			'uuid' => (object)['@id' => 'http://schema.org/identifier', '@type' => '@id']];
 
 		$jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));