]> git.mxchange.org Git - friendica.git/blobdiff - src/Protocol/ActivityPub.php
Merge pull request #5812 from annando/develop
[friendica.git] / src / Protocol / ActivityPub.php
index 73d5231d72995f3fe122cd3ea86f01d82481308f..ef4a48479ea2a4c677704763af81d10272e443a8 100644 (file)
@@ -12,13 +12,18 @@ use Friendica\Util\HTTPSignature;
 use Friendica\Core\Protocol;
 use Friendica\Model\Conversation;
 use Friendica\Model\Contact;
+use Friendica\Model\APContact;
 use Friendica\Model\Item;
+use Friendica\Model\Profile;
+use Friendica\Model\Term;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Crypto;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Network\Probe;
+use Friendica\Util\JsonLD;
+use Friendica\Util\LDSignature;
+use Friendica\Core\Config;
 
 /**
  * @brief ActivityPub Protocol class
@@ -33,69 +38,213 @@ use Friendica\Network\Probe;
  * Digest: https://tools.ietf.org/html/rfc5843
  * https://tools.ietf.org/html/draft-cavage-http-signatures-10#ref-15
  *
- * Part of the code for HTTP signing is taken from the Osada project.
- * 
+ * Mastodon implementation of supported activities:
+ * https://github.com/tootsuite/mastodon/blob/master/app/lib/activitypub/activity.rb#L26
  *
  * To-do:
  *
  * Receiver:
- * - Activities: Undo, Update
- * - Object Types: Person, Tombstome
+ * - Update (Image, Video, Article, Note)
+ * - Event
+ * - Undo Announce
+ *
+ * Check what this is meant to do:
+ * - Add
+ * - Block
+ * - Flag
+ * - Remove
+ * - Undo Block
+ * - Undo Accept (Problem: This could invert a contact accept or an event accept)
  *
  * Transmitter:
- * - Activities: Like, Dislike, Update, Undo
- * - Object Tyoes: Article, Announce, Person, Tombstone
+ * - Event
+ *
+ * Complicated:
+ * - Announce
+ * - Undo Announce
  *
  * General:
- * - Message distribution
- * - Endpoints: Outbox, Object, Follower, Following
+ * - Attachments
+ * - nsfw (sensitive)
+ * - Queueing unsucessful deliveries
+ * - Polling the outboxes for missing content?
+ * - Possibly using the LD-JSON parser
  */
 class ActivityPub
 {
-       const PUBLIC = 'https://www.w3.org/ns/activitystreams#Public';
+       const PUBLIC_COLLECTION = 'https://www.w3.org/ns/activitystreams#Public';
+       const CONTEXT = ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
+               ['vcard' => 'http://www.w3.org/2006/vcard/ns#',
+               'diaspora' => 'https://diasporafoundation.org/ns/',
+               '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'];
+       /**
+        * @brief Checks if the web request is done for the AP protocol
+        *
+        * @return is it AP?
+        */
+       public static function isRequest()
+       {
+               return stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/activity+json') ||
+                       stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/ld+json');
+       }
 
-       public static function transmit($data, $target, $uid)
+       /**
+        * @brief collects the lost of followers of the given owner
+        *
+        * @param array $owner Owner array
+        * @param integer $page Page number
+        *
+        * @return array of owners
+        */
+       public static function getFollowers($owner, $page = null)
        {
-               $owner = User::getOwnerDataById($uid);
+               $condition = ['rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::NATIVE_SUPPORT, 'uid' => $owner['uid'],
+                       'self' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
+               $count = DBA::count('contact', $condition);
 
-               if (!$owner) {
-                       return;
+               $data = ['@context' => self::CONTEXT];
+               $data['id'] = System::baseUrl() . '/followers/' . $owner['nickname'];
+               $data['type'] = 'OrderedCollection';
+               $data['totalItems'] = $count;
+
+               // When we hide our friends we will only show the pure number but don't allow more.
+               $profile = Profile::getByUID($owner['uid']);
+               if (!empty($profile['hide-friends'])) {
+                       return $data;
+               }
+
+               if (empty($page)) {
+                       $data['first'] = System::baseUrl() . '/followers/' . $owner['nickname'] . '?page=1';
+               } else {
+                       $list = [];
+
+                       $contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
+                       while ($contact = DBA::fetch($contacts)) {
+                               $list[] = $contact['url'];
+                       }
+
+                       if (!empty($list)) {
+                               $data['next'] = System::baseUrl() . '/followers/' . $owner['nickname'] . '?page=' . ($page + 1);
+                       }
+
+                       $data['partOf'] = System::baseUrl() . '/followers/' . $owner['nickname'];
+
+                       $data['orderedItems'] = $list;
+               }
+
+               return $data;
+       }
+
+       /**
+        * @brief Create list of following contacts
+        *
+        * @param array $owner Owner array
+        * @param integer $page Page numbe
+        *
+        * @return array of following contacts
+        */
+       public static function getFollowing($owner, $page = null)
+       {
+               $condition = ['rel' => [Contact::SHARING, Contact::FRIEND], 'network' => Protocol::NATIVE_SUPPORT, 'uid' => $owner['uid'],
+                       'self' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
+               $count = DBA::count('contact', $condition);
+
+               $data = ['@context' => self::CONTEXT];
+               $data['id'] = System::baseUrl() . '/following/' . $owner['nickname'];
+               $data['type'] = 'OrderedCollection';
+               $data['totalItems'] = $count;
+
+               // When we hide our friends we will only show the pure number but don't allow more.
+               $profile = Profile::getByUID($owner['uid']);
+               if (!empty($profile['hide-friends'])) {
+                       return $data;
                }
 
-               $content = json_encode($data);
+               if (empty($page)) {
+                       $data['first'] = System::baseUrl() . '/following/' . $owner['nickname'] . '?page=1';
+               } else {
+                       $list = [];
 
-               $host = parse_url($target, PHP_URL_HOST);
-               $path = parse_url($target, PHP_URL_PATH);
-               $date = date('r');
+                       $contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
+                       while ($contact = DBA::fetch($contacts)) {
+                               $list[] = $contact['url'];
+                       }
 
-               $headers = ['Host: ' . $host, 'Date: ' . $date];
+                       if (!empty($list)) {
+                               $data['next'] = System::baseUrl() . '/following/' . $owner['nickname'] . '?page=' . ($page + 1);
+                       }
 
-               $signed_data = "(request-target): post " . $path . "\nhost: " . $host . "\ndate: " . $date;
+                       $data['partOf'] = System::baseUrl() . '/following/' . $owner['nickname'];
 
-               $signature = base64_encode(Crypto::rsaSign($signed_data, $owner['uprvkey'], 'sha256'));
+                       $data['orderedItems'] = $list;
+               }
 
-               $headers[] = 'Signature: keyId="' . $owner['url'] . '#main-key' . '",headers="(request-target) host date",signature="' . $signature . '"';
-               $headers[] = 'Content-Type: application/activity+json';
+               return $data;
+       }
 
-               Network::post($target, $content, $headers);
-               $return_code = BaseObject::getApp()->get_curl_code();
+       /**
+        * @brief Public posts for the given owner
+        *
+        * @param array $owner Owner array
+        * @param integer $page Page numbe
+        *
+        * @return array of posts
+        */
+       public static function getOutbox($owner, $page = null)
+       {
+               $public_contact = Contact::getIdForURL($owner['url'], 0, true);
+
+               $condition = ['uid' => $owner['uid'], 'contact-id' => $owner['id'], 'author-id' => $public_contact,
+                       'wall' => true, 'private' => false, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT],
+                       'deleted' => false, 'visible' => true];
+               $count = DBA::count('item', $condition);
+
+               $data = ['@context' => self::CONTEXT];
+               $data['id'] = System::baseUrl() . '/outbox/' . $owner['nickname'];
+               $data['type'] = 'OrderedCollection';
+               $data['totalItems'] = $count;
+
+               if (empty($page)) {
+                       $data['first'] = System::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=1';
+               } else {
+                       $list = [];
+
+                       $condition['parent-network'] = Protocol::NATIVE_SUPPORT;
+
+                       $items = Item::select(['id'], $condition, ['limit' => [($page - 1) * 20, 20], 'order' => ['created' => true]]);
+                       while ($item = Item::fetch($items)) {
+                               $object = self::createObjectFromItemID($item['id']);
+                               unset($object['@context']);
+                               $list[] = $object;
+                       }
+
+                       if (!empty($list)) {
+                               $data['next'] = System::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=' . ($page + 1);
+                       }
+
+                       $data['partOf'] = System::baseUrl() . '/outbox/' . $owner['nickname'];
+
+                       $data['orderedItems'] = $list;
+               }
 
-               logger('Transmit to ' . $target . ' returned ' . $return_code);
+               return $data;
        }
 
        /**
         * Return the ActivityPub profile of the given user
         *
         * @param integer $uid User ID
-        * @return array
+        * @return profile array
         */
        public static function profile($uid)
        {
-               $accounttype = ['Person', 'Organization', 'Service', 'Group', 'Application'];
-
                $condition = ['uid' => $uid, 'blocked' => false, 'account_expired' => false,
                        'account_removed' => false, 'verified' => true];
-               $fields = ['guid', 'nickname', 'pubkey', 'account-type'];
+               $fields = ['guid', 'nickname', 'pubkey', 'account-type', 'page-flags'];
                $user = DBA::selectFirst('user', $fields, $condition);
                if (!DBA::isResult($user)) {
                        return [];
@@ -113,24 +262,21 @@ class ActivityPub
                        return [];
                }
 
-               $data = ['@context' => ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
-                       ['uuid' => 'http://schema.org/identifier', 'sensitive' => 'as:sensitive',
-                       'vcard' => 'http://www.w3.org/2006/vcard/ns#']]];
-
+               $data = ['@context' => self::CONTEXT];
                $data['id'] = $contact['url'];
-               $data['uuid'] = $user['guid'];
-               $data['type'] = $accounttype[$user['account-type']];
+               $data['diaspora:guid'] = $user['guid'];
+               $data['type'] = self::ACCOUNT_TYPES[$user['account-type']];
                $data['following'] = System::baseUrl() . '/following/' . $user['nickname'];
                $data['followers'] = System::baseUrl() . '/followers/' . $user['nickname'];
                $data['inbox'] = System::baseUrl() . '/inbox/' . $user['nickname'];
                $data['outbox'] = System::baseUrl() . '/outbox/' . $user['nickname'];
                $data['preferredUsername'] = $user['nickname'];
                $data['name'] = $contact['name'];
-               $data['vcard:hasAddress'] = ['@type' => 'Home', 'vcard:country-name' => $profile['country-name'],
+               $data['vcard:hasAddress'] = ['@type' => 'vcard:Home', 'vcard:country-name' => $profile['country-name'],
                        'vcard:region' => $profile['region'], 'vcard:locality' => $profile['locality']];
                $data['summary'] = $contact['about'];
                $data['url'] = $contact['url'];
-               $data['manuallyApprovesFollowers'] = false;
+               $data['manuallyApprovesFollowers'] = in_array($user['page-flags'], [Contact::PAGE_NORMAL, Contact::PAGE_PRVGROUP]);
                $data['publicKey'] = ['id' => $contact['url'] . '#main-key',
                        'owner' => $contact['url'],
                        'publicKeyPem' => $user['pubkey']];
@@ -142,373 +288,658 @@ class ActivityPub
                return $data;
        }
 
-       public static function createActivityFromItem($item_id)
+       /**
+        * @brief Returns an array with permissions of a given item array
+        *
+        * @param array $item
+        *
+        * @return array with permissions
+        */
+       private static function fetchPermissionBlockFromConversation($item)
        {
-               $item = Item::selectFirst([], ['id' => $item_id]);
+               if (empty($item['thr-parent'])) {
+                       return [];
+               }
 
-               $data = ['@context' => ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
-                       ['Emoji' => 'toot:Emoji', 'Hashtag' => 'as:Hashtag', 'atomUri' => 'ostatus:atomUri',
-                       'conversation' => 'ostatus:conversation', 'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri',
-                       'ostatus' => 'http://ostatus.org#', 'sensitive' => 'as:sensitive',
-                       'toot' => 'http://joinmastodon.org/ns#']]];
+               $condition = ['item-uri' => $item['thr-parent'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];
+               $conversation = DBA::selectFirst('conversation', ['source'], $condition);
+               if (!DBA::isResult($conversation)) {
+                       return [];
+               }
 
-               $data['type'] = 'Create';
-               $data['id'] = $item['uri'];
-               $data['actor'] = $item['author-link'];
-               $data['to'] = 'https://www.w3.org/ns/activitystreams#Public';
-               $data['object'] = self::createNote($item);
-               return $data;
-       }
+               $activity = json_decode($conversation['source'], true);
 
-       public static function createNote($item)
-       {
-               $data = [];
-               $data['type'] = 'Note';
-               $data['id'] = $item['uri'];
+               $actor = JsonLD::fetchElement($activity, 'actor', 'id');
+               $profile = APContact::getByURL($actor);
 
-               if ($item['uri'] != $item['thr-parent']) {
-                       $data['inReplyTo'] = $item['thr-parent'];
-               }
+               $item_profile = APContact::getByURL($item['author-link']);
+               $exclude[] = $item['author-link'];
 
-               $conversation = DBA::selectFirst('conversation', ['conversation-uri'], ['item-uri' => $item['parent-uri']]);
-               if (DBA::isResult($conversation) && !empty($conversation['conversation-uri'])) {
-                       $conversation_uri = $conversation['conversation-uri'];
-               } else {
-                       $conversation_uri = $item['parent-uri'];
+               if ($item['gravity'] == GRAVITY_PARENT) {
+                       $exclude[] = $item['owner-link'];
                }
 
-               $data['context'] = $data['conversation'] = $conversation_uri;
-               $data['actor'] = $item['author-link'];
-               $data['to'] = [];
-               if (!$item['private']) {
-                       $data['to'][] = 'https://www.w3.org/ns/activitystreams#Public';
+               $permissions['to'][] = $actor;
+
+               foreach (['to', 'cc', 'bto', 'bcc'] as $element) {
+                       if (empty($activity[$element])) {
+                               continue;
+                       }
+                       if (is_string($activity[$element])) {
+                               $activity[$element] = [$activity[$element]];
+                       }
+
+                       foreach ($activity[$element] as $receiver) {
+                               if ($receiver == $profile['followers'] && !empty($item_profile['followers'])) {
+                                       $receiver = $item_profile['followers'];
+                               }
+                               if (!in_array($receiver, $exclude)) {
+                                       $permissions[$element][] = $receiver;
+                               }
+                       }
                }
-               $data['published'] = DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM);
-               $data['updated'] = DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM);
-               $data['attributedTo'] = $item['author-link'];
-               $data['name'] = BBCode::convert($item['title'], false, 7);
-               $data['content'] = BBCode::convert($item['body'], false, 7);
-               $data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];
-               //$data['summary'] = ''; // Ignore by now
-               //$data['sensitive'] = false; // - Query NSFW
-               //$data['emoji'] = []; // Ignore by now
-               //$data['tag'] = []; /// @ToDo
-               //$data['attachment'] = []; // @ToDo
-               return $data;
+               return $permissions;
        }
 
-       public static function transmitActivity($activity, $target, $uid)
+       /**
+        * @brief Creates an array of permissions from an item thread
+        *
+        * @param array $item
+        *
+        * @return permission array
+        */
+       public static function createPermissionBlockForItem($item)
        {
-               $profile = Probe::uri($target, Protocol::ACTIVITYPUB);
+               $data = ['to' => [], 'cc' => []];
 
-               $owner = User::getOwnerDataById($uid);
+               $data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
 
-               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
-                       'id' => 'https://pirati.ca/activity/' . System::createGUID(),
-                       'type' => $activity,
-                       'actor' => $owner['url'],
-                       'object' => $profile['url']];
+               $actor_profile = APContact::getByURL($item['author-link']);
 
-               logger('Sending activity ' . $activity . ' to ' . $target . ' for user ' . $uid, LOGGER_DEBUG);
-               return self::transmit($data,  $profile['notify'], $uid);
-       }
+               $terms = Term::tagArrayFromItemId($item['id'], TERM_MENTION);
 
-       public static function transmitContactAccept($target, $id, $uid)
-       {
-               $profile = Probe::uri($target, Protocol::ACTIVITYPUB);
+               $contacts[$item['author-link']] = $item['author-link'];
 
-               $owner = User::getOwnerDataById($uid);
-               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
-                       'id' => 'https://pirati.ca/activity/' . System::createGUID(),
-                       'type' => 'Accept',
-                       'actor' => $owner['url'],
-                       'object' => ['id' => $id, 'type' => 'Follow',
-                               'actor' => $profile['url'],
-                               'object' => $owner['url']]];
+               if (!$item['private']) {
+                       $data['to'][] = self::PUBLIC_COLLECTION;
+                       if (!empty($actor_profile['followers'])) {
+                               $data['cc'][] = $actor_profile['followers'];
+                       }
 
-               logger('Sending accept to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
-               return self::transmit($data,  $profile['notify'], $uid);
-       }
+                       foreach ($terms as $term) {
+                               $profile = APContact::getByURL($term['url'], false);
+                               if (!empty($profile) && empty($contacts[$profile['url']])) {
+                                       $data['cc'][] = $profile['url'];
+                                       $contacts[$profile['url']] = $profile['url'];
+                               }
+                       }
+               } else {
+                       $receiver_list = Item::enumeratePermissions($item);
 
-       public static function transmitContactUndo($target, $id, $uid)
-       {
-               $profile = Probe::uri($target, Protocol::ACTIVITYPUB);
+                       $mentioned = [];
 
-               if (empty($id)) {
-                       $id = 'https://pirati.ca/activity/' . System::createGUID();
+                       foreach ($terms as $term) {
+                               $cid = Contact::getIdForURL($term['url'], $item['uid']);
+                               if (!empty($cid) && in_array($cid, $receiver_list)) {
+                                       $contact = DBA::selectFirst('contact', ['url'], ['id' => $cid, 'network' => Protocol::ACTIVITYPUB]);
+                                       $data['to'][] = $contact['url'];
+                                       $contacts[$contact['url']] = $contact['url'];
+                               }
+                       }
+
+                       foreach ($receiver_list as $receiver) {
+                               $contact = DBA::selectFirst('contact', ['url'], ['id' => $receiver, 'network' => Protocol::ACTIVITYPUB]);
+                               if (empty($contacts[$contact['url']])) {
+                                       $data['cc'][] = $contact['url'];
+                                       $contacts[$contact['url']] = $contact['url'];
+                               }
+                       }
                }
 
-               $owner = User::getOwnerDataById($uid);
-               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
-                       'id' => 'https://pirati.ca/activity/' . System::createGUID(),
-                       'type' => 'Undo',
-                       'actor' => $owner['url'],
-                       'object' => ['id' => $id, 'type' => 'Follow',
-                               'actor' => $owner['url'],
-                               'object' => $profile['url']]];
+               $parents = Item::select(['id', 'author-link', 'owner-link', 'gravity'], ['parent' => $item['parent']]);
+               while ($parent = Item::fetch($parents)) {
+                       // Don't include data from future posts
+                       if ($parent['id'] >= $item['id']) {
+                               continue;
+                       }
 
-               logger('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
-               return self::transmit($data,  $profile['notify'], $uid);
+                       $profile = APContact::getByURL($parent['author-link'], false);
+                       if (!empty($profile) && empty($contacts[$profile['url']])) {
+                               $data['cc'][] = $profile['url'];
+                               $contacts[$profile['url']] = $profile['url'];
+                       }
+
+                       if ($item['gravity'] != GRAVITY_PARENT) {
+                               continue;
+                       }
+
+                       $profile = APContact::getByURL($parent['owner-link'], false);
+                       if (!empty($profile) && empty($contacts[$profile['url']])) {
+                               $data['cc'][] = $profile['url'];
+                               $contacts[$profile['url']] = $profile['url'];
+                       }
+               }
+               DBA::close($parents);
+
+               if (empty($data['to'])) {
+                       $data['to'] = $data['cc'];
+                       $data['cc'] = [];
+               }
+
+               return $data;
        }
 
        /**
-        * Fetches ActivityPub content from the given url
+        * @brief Fetches a list of inboxes of followers of a given user
         *
-        * @param string $url content url
-        * @return array
+        * @param integer $uid User ID
+        *
+        * @return array of follower inboxes
         */
-       public static function fetchContent($url)
+       public static function fetchTargetInboxesforUser($uid)
        {
-               $ret = Network::curl($url, false, $redirects, ['accept_content' => 'application/activity+json']);
+               $inboxes = [];
 
-               if (!$ret['success'] || empty($ret['body'])) {
-                       return;
+               $condition = ['uid' => $uid, 'network' => Protocol::ACTIVITYPUB, 'archive' => false, 'pending' => false];
+
+               if (!empty($uid)) {
+                       $condition['rel'] = [Contact::FOLLOWER, Contact::FRIEND];
                }
 
-               return json_decode($ret['body'], true);
+               $contacts = DBA::select('contact', ['notify', 'batch'], $condition);
+               while ($contact = DBA::fetch($contacts)) {
+                       $contact = defaults($contact, 'batch', $contact['notify']);
+                       $inboxes[$contact] = $contact;
+               }
+               DBA::close($contacts);
+
+               return $inboxes;
        }
 
        /**
-        * Resolves the profile url from the address by using webfinger
+        * @brief Fetches an array of inboxes for the given item and user
+        *
+        * @param array $item
+        * @param integer $uid User ID
         *
-        * @param string $addr profile address (user@domain.tld)
-        * @return string url
+        * @return array with inboxes
         */
-       private static function addrToUrl($addr)
+       public static function fetchTargetInboxes($item, $uid)
        {
-               $addr_parts = explode('@', $addr);
-               if (count($addr_parts) != 2) {
-                       return false;
+               $permissions = self::createPermissionBlockForItem($item);
+               if (empty($permissions)) {
+                       return [];
                }
 
-               $webfinger = 'https://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr);
+               $inboxes = [];
 
-               $ret = Network::curl($webfinger, false, $redirects, ['accept_content' => 'application/jrd+json,application/json']);
-               if (!$ret['success'] || empty($ret['body'])) {
-                       return false;
+               if ($item['gravity'] == GRAVITY_ACTIVITY) {
+                       $item_profile = APContact::getByURL($item['author-link']);
+               } else {
+                       $item_profile = APContact::getByURL($item['owner-link']);
                }
 
-               $data = json_decode($ret['body'], true);
+               foreach (['to', 'cc', 'bto', 'bcc'] as $element) {
+                       if (empty($permissions[$element])) {
+                               continue;
+                       }
 
-               if (empty($data['links'])) {
-                       return false;
+                       foreach ($permissions[$element] as $receiver) {
+                               if ($receiver == $item_profile['followers']) {
+                                       $inboxes = self::fetchTargetInboxesforUser($uid);
+                               } else {
+                                       $profile = APContact::getByURL($receiver);
+                                       if (!empty($profile)) {
+                                               $target = defaults($profile, 'sharedinbox', $profile['inbox']);
+                                               $inboxes[$target] = $target;
+                                       }
+                               }
+                       }
                }
 
-               foreach ($data['links'] as $link) {
-                       if (empty($link['href']) || empty($link['rel']) || empty($link['type'])) {
-                               continue;
-                       }
+               return $inboxes;
+       }
 
-                       if (($link['rel'] == 'self') && ($link['type'] == 'application/activity+json')) {
-                               return $link['href'];
+       /**
+        * @brief Returns the activity type of a given item
+        *
+        * @param array $item
+        *
+        * @return activity type
+        */
+       public static function getTypeOfItem($item)
+       {
+               if ($item['verb'] == ACTIVITY_POST) {
+                       if ($item['created'] == $item['edited']) {
+                               $type = 'Create';
+                       } else {
+                               $type = 'Update';
                        }
+               } elseif ($item['verb'] == ACTIVITY_LIKE) {
+                       $type = 'Like';
+               } elseif ($item['verb'] == ACTIVITY_DISLIKE) {
+                       $type = 'Dislike';
+               } elseif ($item['verb'] == ACTIVITY_ATTEND) {
+                       $type = 'Accept';
+               } elseif ($item['verb'] == ACTIVITY_ATTENDNO) {
+                       $type = 'Reject';
+               } elseif ($item['verb'] == ACTIVITY_ATTENDMAYBE) {
+                       $type = 'TentativeAccept';
+               } else {
+                       $type = '';
                }
 
-               return false;
+               return $type;
        }
 
-       public static function verifySignature($content, $http_headers)
+       /**
+        * @brief Creates an activity array for a given item id
+        *
+        * @param integer $item_id
+        * @param boolean $object_mode Is the activity item is used inside another object?
+        *
+        * @return array of activity
+        */
+       public static function createActivityFromItem($item_id, $object_mode = false)
        {
-               $object = json_decode($content, true);
+               $item = Item::selectFirst([], ['id' => $item_id, 'parent-network' => Protocol::NATIVE_SUPPORT]);
 
-               if (empty($object)) {
+               if (!DBA::isResult($item)) {
                        return false;
                }
 
-               $actor = self::processElement($object, 'actor', 'id');
+               $condition = ['item-uri' => $item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];
+               $conversation = DBA::selectFirst('conversation', ['source'], $condition);
+               if (DBA::isResult($conversation)) {
+                       $data = json_decode($conversation['source']);
+                       if (!empty($data)) {
+                               return $data;
+                       }
+               }
 
-               $headers = [];
-               $headers['(request-target)'] = strtolower($http_headers['REQUEST_METHOD']) . ' ' . $http_headers['REQUEST_URI'];
+               $type = self::getTypeOfItem($item);
 
-               // First take every header
-               foreach ($http_headers as $k => $v) {
-                       $field = str_replace('_', '-', strtolower($k));
-                       $headers[$field] = $v;
-               }
+               if (!$object_mode) {
+                       $data = ['@context' => self::CONTEXT];
 
-               // Now add every http header
-               foreach ($http_headers as $k => $v) {
-                       if (strpos($k, 'HTTP_') === 0) {
-                               $field = str_replace('_', '-', strtolower(substr($k, 5)));
-                               $headers[$field] = $v;
+                       if ($item['deleted'] && ($item['gravity'] == GRAVITY_ACTIVITY)) {
+                               $type = 'Undo';
+                       } elseif ($item['deleted']) {
+                               $type = 'Delete';
                        }
+               } else {
+                       $data = [];
                }
 
-               $sig_block = ActivityPub::parseSigHeader($http_headers['HTTP_SIGNATURE']);
+               $data['id'] = $item['uri'] . '#' . $type;
+               $data['type'] = $type;
+               $data['actor'] = $item['author-link'];
 
-               if (empty($sig_block) || empty($sig_block['headers']) || empty($sig_block['keyId'])) {
-                       return false;
+               $data['published'] = DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM);
+
+               if ($item["created"] != $item["edited"]) {
+                       $data['updated'] = DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM);
                }
 
-               $signed_data = '';
-               foreach ($sig_block['headers'] as $h) {
-                       if (array_key_exists($h, $headers)) {
-                               $signed_data .= $h . ': ' . $headers[$h] . "\n";
-                       }
+               $data['context'] = self::fetchContextURLForItem($item);
+
+               $data = array_merge($data, ActivityPub::createPermissionBlockForItem($item));
+
+               if (in_array($data['type'], ['Create', 'Update', 'Announce', 'Delete'])) {
+                       $data['object'] = self::createNote($item);
+               } elseif ($data['type'] == 'Undo') {
+                       $data['object'] = self::createActivityFromItem($item_id, true);
+               } else {
+                       $data['object'] = $item['thr-parent'];
+               }
+
+               $owner = User::getOwnerDataById($item['uid']);
+
+               if (!$object_mode) {
+                       return LDSignature::sign($data, $owner);
+               } else {
+                       return $data;
                }
-               $signed_data = rtrim($signed_data, "\n");
+       }
 
-               if (empty($signed_data)) {
+       /**
+        * @brief Creates an object array for a given item id
+        *
+        * @param integer $item_id
+        *
+        * @return object array
+        */
+       public static function createObjectFromItemID($item_id)
+       {
+               $item = Item::selectFirst([], ['id' => $item_id, 'parent-network' => Protocol::NATIVE_SUPPORT]);
+
+               if (!DBA::isResult($item)) {
                        return false;
                }
 
-               $algorithm = null;
+               $data = ['@context' => self::CONTEXT];
+               $data = array_merge($data, self::createNote($item));
 
-               if ($sig_block['algorithm'] === 'rsa-sha256') {
-                       $algorithm = 'sha256';
+               return $data;
+       }
+
+       /**
+        * @brief Returns a tag array for a given item array
+        *
+        * @param array $item
+        *
+        * @return array of tags
+        */
+       private static function createTagList($item)
+       {
+               $tags = [];
+
+               $terms = Term::tagArrayFromItemId($item['id'], TERM_MENTION);
+               foreach ($terms as $term) {
+                       $contact = Contact::getDetailsByURL($term['url']);
+                       if (!empty($contact['addr'])) {
+                               $mention = '@' . $contact['addr'];
+                       } else {
+                               $mention = '@' . $term['url'];
+                       }
+
+                       $tags[] = ['type' => 'Mention', 'href' => $term['url'], 'name' => $mention];
                }
+               return $tags;
+       }
 
-               if ($sig_block['algorithm'] === 'rsa-sha512') {
-                       $algorithm = 'sha512';
+       /**
+        * @brief Fetches the "context" value for a givem item array from the "conversation" table
+        *
+        * @param array $item
+        *
+        * @return string with context url
+        */
+       private static function fetchContextURLForItem($item)
+       {
+               $conversation = DBA::selectFirst('conversation', ['conversation-href', 'conversation-uri'], ['item-uri' => $item['parent-uri']]);
+               if (DBA::isResult($conversation) && !empty($conversation['conversation-href'])) {
+                       $context_uri = $conversation['conversation-href'];
+               } elseif (DBA::isResult($conversation) && !empty($conversation['conversation-uri'])) {
+                       $context_uri = $conversation['conversation-uri'];
+               } else {
+                       $context_uri = str_replace('/objects/', '/context/', $item['parent-uri']);
                }
+               return $context_uri;
+       }
 
-               if (empty($algorithm)) {
-                       return false;
+       /**
+        * @brief Creates a note/article object array
+        *
+        * @param array $item
+        *
+        * @return object array
+        */
+       private static function createNote($item)
+       {
+               if (!empty($item['title'])) {
+                       $type = 'Article';
+               } else {
+                       $type = 'Note';
                }
 
-               $key = self::fetchKey($sig_block['keyId'], $actor);
+               if ($item['deleted']) {
+                       $type = 'Tombstone';
+               }
 
-               if (empty($key)) {
-                       return false;
+               $data = [];
+               $data['id'] = $item['uri'];
+               $data['type'] = $type;
+
+               if ($item['deleted']) {
+                       return $data;
                }
 
-               if (!Crypto::rsaVerify($signed_data, $sig_block['signature'], $key, $algorithm)) {
-                       return false;
+               $data['summary'] = null; // Ignore by now
+
+               if ($item['uri'] != $item['thr-parent']) {
+                       $data['inReplyTo'] = $item['thr-parent'];
+               } else {
+                       $data['inReplyTo'] = null;
                }
 
-               // Check the digest if it was part of the signed data
-               if (in_array('digest', $sig_block['headers'])) {
-                       $digest = explode('=', $headers['digest'], 2);
-                       if ($digest[0] === 'SHA-256') {
-                               $hashalg = 'sha256';
-                       }
-                       if ($digest[0] === 'SHA-512') {
-                               $hashalg = 'sha512';
-                       }
+               $data['diaspora:guid'] = $item['guid'];
+               $data['published'] = DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM);
 
-                       /// @todo add all hashes from the rfc
+               if ($item["created"] != $item["edited"]) {
+                       $data['updated'] = DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM);
+               }
 
-                       if (!empty($hashalg) && base64_encode(hash($hashalg, $content, true)) != $digest[1]) {
-                               return false;
-                       }
+               $data['url'] = $item['plink'];
+               $data['attributedTo'] = $item['author-link'];
+               $data['actor'] = $item['author-link'];
+               $data['sensitive'] = false; // - Query NSFW
+               $data['context'] = self::fetchContextURLForItem($item);
+
+               if (!empty($item['title'])) {
+                       $data['name'] = BBCode::convert($item['title'], false, 7);
                }
 
-               // Check the content-length if it was part of the signed data
-               if (in_array('content-length', $sig_block['headers'])) {
-                       if (strlen($content) != $headers['content-length']) {
-                               return false;
-                       }
+               $data['content'] = BBCode::convert($item['body'], false, 7);
+               $data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];
+
+               if (!empty($item['signed_text']) && ($item['uri'] != $item['thr-parent'])) {
+                       $data['diaspora:comment'] = $item['signed_text'];
                }
 
-               return true;
+               $data['attachment'] = []; // @ToDo
+               $data['tag'] = self::createTagList($item);
+               $data = array_merge($data, ActivityPub::createPermissionBlockForItem($item));
 
+               return $data;
        }
 
-       private static function fetchKey($id, $actor)
+       /**
+        * @brief Transmits a profile deletion to a given inbox
+        *
+        * @param integer $uid User ID
+        * @param string $inbox Target inbox
+        */
+       public static function transmitProfileDeletion($uid, $inbox)
        {
-               $url = (strpos($id, '#') ? substr($id, 0, strpos($id, '#')) : $id);
-
-               $profile = Probe::uri($url, Protocol::ACTIVITYPUB);
-               if (!empty($profile)) {
-                       return $profile['pubkey'];
-               } elseif ($url != $actor) {
-                       $profile = Probe::uri($actor, Protocol::ACTIVITYPUB);
-                       if (!empty($profile)) {
-                               return $profile['pubkey'];
-                       }
-               }
+               $owner = User::getOwnerDataById($uid);
+               $profile = APContact::getByURL($owner['url']);
 
-               return false;
+               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+                       'type' => 'Delete',
+                       'actor' => $owner['url'],
+                       'object' => self::profile($uid),
+                       'published' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
+                       'to' => [self::PUBLIC_COLLECTION],
+                       'cc' => []];
+
+               $signed = LDSignature::sign($data, $owner);
+
+               logger('Deliver profile deletion for user ' . $uid . ' to ' . $inbox .' via ActivityPub', LOGGER_DEBUG);
+               HTTPSignature::transmit($signed, $inbox, $uid);
        }
 
        /**
-        * @brief
-        *
-        * @param string $header
-        * @return array associate array with
-        *   - \e string \b keyID
-        *   - \e string \b algorithm
-        *   - \e array  \b headers
-        *   - \e string \b signature
+        * @brief Transmits a profile change to a given inbox
+        *
+        * @param integer $uid User ID
+        * @param string $inbox Target inbox
         */
-       private static function parseSigHeader($header)
+       public static function transmitProfileUpdate($uid, $inbox)
        {
-               $ret = [];
-               $matches = [];
+               $owner = User::getOwnerDataById($uid);
+               $profile = APContact::getByURL($owner['url']);
 
-               if (preg_match('/keyId="(.*?)"/ism',$header,$matches)) {
-                       $ret['keyId'] = $matches[1];
-               }
+               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+                       'type' => 'Update',
+                       'actor' => $owner['url'],
+                       'object' => self::profile($uid),
+                       'published' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
+                       'to' => [$profile['followers']],
+                       'cc' => []];
 
-               if (preg_match('/algorithm="(.*?)"/ism',$header,$matches)) {
-                       $ret['algorithm'] = $matches[1];
-               }
+               $signed = LDSignature::sign($data, $owner);
 
-               if (preg_match('/headers="(.*?)"/ism',$header,$matches)) {
-                       $ret['headers'] = explode(' ', $matches[1]);
-               }
+               logger('Deliver profile update for user ' . $uid . ' to ' . $inbox .' via ActivityPub', LOGGER_DEBUG);
+               HTTPSignature::transmit($signed, $inbox, $uid);
+       }
 
-               if (preg_match('/signature="(.*?)"/ism',$header,$matches)) {
-                       $ret['signature'] = base64_decode(preg_replace('/\s+/','',$matches[1]));
-               }
+       /**
+        * @brief Transmits a given activity to a target
+        *
+        * @param array $activity
+        * @param string $target Target profile
+        * @param integer $uid User ID
+        */
+       public static function transmitActivity($activity, $target, $uid)
+       {
+               $profile = APContact::getByURL($target);
+
+               $owner = User::getOwnerDataById($uid);
 
-               return $ret;
+               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+                       'type' => $activity,
+                       'actor' => $owner['url'],
+                       'object' => $profile['url'],
+                       'to' => $profile['url']];
+
+               logger('Sending activity ' . $activity . ' to ' . $target . ' for user ' . $uid, LOGGER_DEBUG);
+
+               $signed = LDSignature::sign($data, $owner);
+               HTTPSignature::transmit($signed, $profile['inbox'], $uid);
        }
 
        /**
-        * Fetches a profile from the given url
+        * @brief Transmit a message that the contact request had been accepted
         *
-        * @param string $url profile url
+        * @param string $target Target profile
+        * @param $id
+        * @param integer $uid User ID
+        */
+       public static function transmitContactAccept($target, $id, $uid)
+       {
+               $profile = APContact::getByURL($target);
+
+               $owner = User::getOwnerDataById($uid);
+               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+                       'type' => 'Accept',
+                       'actor' => $owner['url'],
+                       'object' => ['id' => $id, 'type' => 'Follow',
+                               'actor' => $profile['url'],
+                               'object' => $owner['url']],
+                       'to' => $profile['url']];
+
+               logger('Sending accept to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
+
+               $signed = LDSignature::sign($data, $owner);
+               HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+       }
+
+       /**
+        * @brief 
+        *
+        * @param string $target Target profile
+        * @param $id
+        * @param integer $uid User ID
+        */
+       public static function transmitContactReject($target, $id, $uid)
+       {
+               $profile = APContact::getByURL($target);
+
+               $owner = User::getOwnerDataById($uid);
+               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+                       'type' => 'Reject',
+                       'actor' => $owner['url'],
+                       'object' => ['id' => $id, 'type' => 'Follow',
+                               'actor' => $profile['url'],
+                               'object' => $owner['url']],
+                       'to' => $profile['url']];
+
+               logger('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
+
+               $signed = LDSignature::sign($data, $owner);
+               HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+       }
+
+       /**
+        * @brief 
+        *
+        * @param string $target Target profile
+        * @param integer $uid User ID
+        */
+       public static function transmitContactUndo($target, $uid)
+       {
+               $profile = APContact::getByURL($target);
+
+               $id = System::baseUrl() . '/activity/' . System::createGUID();
+
+               $owner = User::getOwnerDataById($uid);
+               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+                       'id' => $id,
+                       'type' => 'Undo',
+                       'actor' => $owner['url'],
+                       'object' => ['id' => $id, 'type' => 'Follow',
+                               'actor' => $owner['url'],
+                               'object' => $profile['url']],
+                       'to' => $profile['url']];
+
+               logger('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
+
+               $signed = LDSignature::sign($data, $owner);
+               HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+       }
+
+       /**
+        * Fetches ActivityPub content from the given url
+        *
+        * @param string $url content url
         * @return array
         */
-       public static function fetchProfile($url)
+       public static function fetchContent($url)
        {
-               if (empty(parse_url($url, PHP_URL_SCHEME))) {
-                       $url = self::addrToUrl($url);
-                       if (empty($url)) {
-                               return false;
-                       }
+               $ret = Network::curl($url, false, $redirects, ['accept_content' => 'application/activity+json, application/ld+json']);
+               if (!$ret['success'] || empty($ret['body'])) {
+                       return false;
                }
 
-               $data = self::fetchContent($url);
+               return json_decode($ret['body'], true);
+       }
 
-               if (empty($data) || empty($data['id']) || empty($data['inbox'])) {
+       /**
+        * Fetches a profile from the given url into an array that is compatible to Probe::uri
+        *
+        * @param string $url profile url
+        * @return array
+        */
+       public static function probeProfile($url)
+       {
+               $apcontact = APContact::getByURL($url, true);
+               if (empty($apcontact)) {
                        return false;
                }
 
                $profile = ['network' => Protocol::ACTIVITYPUB];
-               $profile['nick'] = $data['preferredUsername'];
-               $profile['name'] = defaults($data, 'name', $profile['nick']);
-               $profile['guid'] = defaults($data, 'uuid', null);
-               $profile['url'] = $data['id'];
-
-               $parts = parse_url($profile['url']);
-               unset($parts['scheme']);
-               unset($parts['path']);
-               $profile['addr'] = $profile['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
-               $profile['alias'] = self::processElement($data, 'url', 'href');
-               $profile['photo'] = self::processElement($data, 'icon', 'url');
+               $profile['nick'] = $apcontact['nick'];
+               $profile['name'] = $apcontact['name'];
+               $profile['guid'] = $apcontact['uuid'];
+               $profile['url'] = $apcontact['url'];
+               $profile['addr'] = $apcontact['addr'];
+               $profile['alias'] = $apcontact['alias'];
+               $profile['photo'] = $apcontact['photo'];
                // $profile['community']
                // $profile['keywords']
                // $profile['location']
-               $profile['about'] = defaults($data, 'summary', '');
-               $profile['batch'] = self::processElement($data, 'endpoints', 'sharedInbox');
-               $profile['notify'] = $data['inbox'];
-               $profile['poll'] = $data['outbox'];
-               $profile['pubkey'] = self::processElement($data, 'publicKey', 'publicKeyPem');
-
-               // Check if the address is resolvable
-               if (self::addrToUrl($profile['addr']) == $profile['url']) {
-                       $parts = parse_url($profile['url']);
-                       unset($parts['path']);
-                       $profile['baseurl'] = Network::unparseURL($parts);
-               } else {
-                       unset($profile['addr']);
-               }
-
-               if ($profile['url'] == $profile['alias']) {
-                       unset($profile['alias']);
-               }
+               $profile['about'] = $apcontact['about'];
+               $profile['batch'] = $apcontact['sharedinbox'];
+               $profile['notify'] = $apcontact['inbox'];
+               $profile['poll'] = $apcontact['outbox'];
+               $profile['pubkey'] = $apcontact['pubkey'];
+               $profile['baseurl'] = $apcontact['baseurl'];
 
                // Remove all "null" fields
                foreach ($profile as $field => $content) {
@@ -517,51 +948,72 @@ class ActivityPub
                        }
                }
 
-/*
-               // To-Do
-               unset($data['type']);
-               unset($data['manuallyApprovesFollowers']);
-
-               // Unhandled
-               unset($data['@context']);
-               unset($data['tag']);
-               unset($data['attachment']);
-               unset($data['image']);
-               unset($data['nomadicLocations']);
-               unset($data['signature']);
-               unset($data['following']);
-               unset($data['followers']);
-               unset($data['featured']);
-               unset($data['movedTo']);
-               unset($data['liked']);
-               unset($data['sharedInbox']); // Misskey
-               unset($data['isCat']); // Misskey
-               unset($data['kroeg:blocks']); // Kroeg
-               unset($data['updated']); // Kroeg
-*/
                return $profile;
        }
 
+       /**
+        * @brief 
+        *
+        * @param $body
+        * @param $header
+        * @param integer $uid User ID
+        */
        public static function processInbox($body, $header, $uid)
        {
-               logger('Incoming message for user ' . $uid, LOGGER_DEBUG);
-
-               if (!self::verifySignature($body, $header)) {
-                       logger('Invalid signature, message will be discarded.', LOGGER_DEBUG);
+               $http_signer = HTTPSignature::getSigner($body, $header);
+               if (empty($http_signer)) {
+                       logger('Invalid HTTP signature, message will be discarded.', LOGGER_DEBUG);
                        return;
+               } else {
+                       logger('HTTP signature is signed by ' . $http_signer, LOGGER_DEBUG);
                }
 
                $activity = json_decode($body, true);
 
-               if (!is_array($activity)) {
+               $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;
                }
 
-               self::processActivity($activity, $body, $uid);
+               if (LDSignature::isSigned($activity)) {
+                       $ld_signer = LDSignature::getSigner($activity);
+                       if (empty($ld_signer)) {
+                               logger('Invalid JSON-LD signature from ' . $actor, LOGGER_DEBUG);
+                       }
+                       if (!empty($ld_signer && ($actor == $http_signer))) {
+                               logger('The HTTP and the JSON-LD signature belong to ' . $ld_signer, LOGGER_DEBUG);
+                               $trust_source = true;
+                       } elseif (!empty($ld_signer)) {
+                               logger('JSON-LD signature is signed by ' . $ld_signer, LOGGER_DEBUG);
+                               $trust_source = true;
+                       } elseif ($actor == $http_signer) {
+                               logger('Bad JSON-LD signature, but HTTP signer fits the actor.', LOGGER_DEBUG);
+                               $trust_source = true;
+                       } else {
+                               logger('Invalid JSON-LD signature and the HTTP signer is different.', LOGGER_DEBUG);
+                               $trust_source = false;
+                       }
+               } elseif ($actor == $http_signer) {
+                       logger('Trusting post without JSON-LD signature, The actor fits the HTTP signer.', LOGGER_DEBUG);
+                       $trust_source = true;
+               } else {
+                       logger('No JSON-LD signature, different actor.', LOGGER_DEBUG);
+                       $trust_source = false;
+               }
+
+               self::processActivity($activity, $body, $uid, $trust_source);
        }
 
-       public static function fetchOutbox($url)
+       /**
+        * @brief 
+        *
+        * @param $url
+        * @param integer $uid User ID
+        */
+       public static function fetchOutbox($url, $uid)
        {
                $data = self::fetchContent($url);
                if (empty($data)) {
@@ -573,134 +1025,176 @@ class ActivityPub
                } elseif (!empty($data['first']['orderedItems'])) {
                        $items = $data['first']['orderedItems'];
                } elseif (!empty($data['first'])) {
-                       self::fetchOutbox($data['first']);
+                       self::fetchOutbox($data['first'], $uid);
                        return;
                } else {
                        $items = [];
                }
 
                foreach ($items as $activity) {
-                       self::processActivity($activity);
+                       self::processActivity($activity, '', $uid, true);
                }
        }
 
-       function processActivity($activity, $body = '', $uid = null)
+       /**
+        * @brief 
+        *
+        * @param array $activity
+        * @param integer $uid User ID
+        * @param $trust_source
+        *
+        * @return 
+        */
+       private static function prepareObjectData($activity, $uid, &$trust_source)
        {
-               if (empty($activity['type'])) {
-                       logger('Empty type', LOGGER_DEBUG);
-                       return;
-               }
-
-               if (empty($activity['object'])) {
-                       logger('Empty object', LOGGER_DEBUG);
-                       return;
-               }
-
-               if (empty($activity['actor'])) {
-                       logger('Empty actor', LOGGER_DEBUG);
-                       return;
-
-               }
-
-               $actor = self::processElement($activity, 'actor', 'id');
+               $actor = JsonLD::fetchElement($activity, 'actor', 'id');
                if (empty($actor)) {
-                       logger('Empty actor - 2', LOGGER_DEBUG);
-                       return;
-               }
-
-               if (is_string($activity['object'])) {
-                       $object_url = $activity['object'];
-               } elseif (!empty($activity['object']['id'])) {
-                       $object_url = $activity['object']['id'];
-               } else {
-                       logger('No object found', LOGGER_DEBUG);
-                       return;
+                       logger('Empty actor', LOGGER_DEBUG);
+                       return [];
                }
 
-               // ----------------------------------
-/*
-               // unhandled
-               unset($activity['@context']);
-               unset($activity['id']);
-
-               // Non standard
-               unset($activity['title']);
-               unset($activity['atomUri']);
-               unset($activity['context_id']);
-               unset($activity['statusnetConversationId']);
-
-               // To-Do?
-               unset($activity['context']);
-               unset($activity['location']);
-               unset($activity['signature']);
-*/
                // Fetch all receivers from to, cc, bto and bcc
-               $receivers = self::getReceivers($activity);
+               $receivers = self::getReceivers($activity, $actor);
 
                // When it is a delivery to a personal inbox we add that user to the receivers
                if (!empty($uid)) {
                        $owner = User::getOwnerDataById($uid);
-                       $additional = [$owner['url'] => $uid];
+                       $additional = ['uid:' . $uid => $uid];
                        $receivers = array_merge($receivers, $additional);
                }
 
                logger('Receivers: ' . json_encode($receivers), LOGGER_DEBUG);
 
-               logger('Processing activity: ' . $activity['type'], LOGGER_DEBUG);
+               $object_id = JsonLD::fetchElement($activity, 'object', 'id');
+               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', 'Update', 'Announce'])) {
-                       $item = self::fetchObject($object_url, $activity['object']);
-                       if (empty($item)) {
+               if (in_array($activity['type'], ['Create', 'Announce'])) {
+                       $object_data = self::fetchObject($object_id, $activity['object'], $trust_source);
+                       if (empty($object_data)) {
                                logger("Object data couldn't be processed", LOGGER_DEBUG);
-                               return;
+                               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'])) {
+                       // 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['object'] = $object_id;
+                       $object_data['object_type'] = ''; // Since we don't fetch the object, we don't know the type
                } else {
-                       if (in_array($activity['type'], ['Accept'])) {
-                               $item['object'] = self::processElement($activity, 'object', 'actor', 'type', 'Follow');
-                       } elseif (in_array($activity['type'], ['Undo'])) {
-                               $item['object'] = self::processElement($activity, 'object', 'object', 'type', 'Follow');
-                       } else {
-                               $item['object'] = $object_url;
-                       }
-                       $item['id'] = $activity['id'];
-                       $item['receiver'] = [];
-                       $item['type'] = $activity['type'];
+                       $object_data = [];
+                       $object_data['id'] = $activity['id'];
+                       $object_data['object'] = $activity['object'];
+                       $object_data['object_type'] = JsonLD::fetchElement($activity, 'object', 'type');
                }
 
-               $item = self::addActivityFields($item, $activity);
+               $object_data = self::addActivityFields($object_data, $activity);
 
-               $item['owner'] = $actor;
+               $object_data['type'] = $activity['type'];
+               $object_data['owner'] = $actor;
+               $object_data['receiver'] = array_merge(defaults($object_data, 'receiver', []), $receivers);
 
-               $item['receiver'] = array_merge($item['receiver'], $receivers);
+               logger('Processing ' . $object_data['type'] . ' ' . $object_data['object_type'] . ' ' . $object_data['id'], LOGGER_DEBUG);
+
+               return $object_data;
+       }
+
+       /**
+        * @brief 
+        *
+        * @param array $activity
+        * @param $body
+        * @param integer $uid User ID
+        * @param $trust_source
+        */
+       private static function processActivity($activity, $body = '', $uid = null, $trust_source = false)
+       {
+               if (empty($activity['type'])) {
+                       logger('Empty type', LOGGER_DEBUG);
+                       return;
+               }
+
+               if (empty($activity['object'])) {
+                       logger('Empty object', LOGGER_DEBUG);
+                       return;
+               }
+
+               if (empty($activity['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);
+               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);
+               }
 
                switch ($activity['type']) {
                        case 'Create':
-                       case 'Update':
                        case 'Announce':
-                               self::createItem($item, $body);
+                               self::createItem($object_data, $body);
                                break;
 
                        case 'Like':
-                               self::likeItem($item, $body);
+                               self::likeItem($object_data, $body);
                                break;
 
                        case 'Dislike':
+                               self::dislikeItem($object_data, $body);
+                               break;
+
+                       case 'Update':
+                               if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
+                                       /// @todo
+                               } elseif (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
+                                       self::updatePerson($object_data, $body);
+                               }
                                break;
 
                        case 'Delete':
+                               if ($object_data['object_type'] == 'Tombstone') {
+                                       self::deleteItem($object_data, $body);
+                               } elseif (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
+                                       self::deletePerson($object_data, $body);
+                               }
                                break;
 
                        case 'Follow':
-                               self::followUser($item);
+                               self::followUser($object_data);
                                break;
 
                        case 'Accept':
-                               self::acceptFollowUser($item);
+                               if ($object_data['object_type'] == 'Follow') {
+                                       self::acceptFollowUser($object_data);
+                               }
+                               break;
+
+                       case 'Reject':
+                               if ($object_data['object_type'] == 'Follow') {
+                                       self::rejectFollowUser($object_data);
+                               }
                                break;
 
                        case 'Undo':
-                               self::undoFollowUser($item);
+                               if ($object_data['object_type'] == 'Follow') {
+                                       self::undoFollowUser($object_data);
+                               } elseif (in_array($object_data['object_type'], self::ACTIVITY_TYPES)) {
+                                       self::undoActivity($object_data);
+                               }
                                break;
 
                        default:
@@ -709,24 +1203,76 @@ class ActivityPub
                }
        }
 
-       private static function getReceivers($activity)
+       /**
+        * @brief 
+        *
+        * @param array $activity
+        * @param $actor
+        *
+        * @return 
+        */
+       private static function getReceivers($activity, $actor)
        {
                $receivers = [];
 
-               $elements = ['to', 'cc', 'bto', 'bcc'];
-               foreach ($elements as $element) {
+               // When it is an answer, we inherite the receivers from the parent
+               $replyto = JsonLD::fetchElement($activity, 'inReplyTo', 'id');
+               if (!empty($replyto)) {
+                       $parents = Item::select(['uid'], ['uri' => $replyto]);
+                       while ($parent = Item::fetch($parents)) {
+                               $receivers['uid:' . $parent['uid']] = $parent['uid'];
+                       }
+               }
+
+               if (!empty($actor)) {
+                       $profile = APContact::getByURL($actor);
+                       $followers = defaults($profile, 'followers', '');
+
+                       logger('Actor: ' . $actor . ' - Followers: ' . $followers, LOGGER_DEBUG);
+               } else {
+                       logger('Empty actor', LOGGER_DEBUG);
+                       $followers = '';
+               }
+
+               foreach (['to', 'cc', 'bto', 'bcc'] as $element) {
                        if (empty($activity[$element])) {
                                continue;
                        }
 
-                       // The receiver can be an arror or a string
+                       // 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 == self::PUBLIC) {
-                                       $receivers[$receiver] = 0;
+                               if ($receiver == self::PUBLIC_COLLECTION) {
+                                       $receivers['uid:0'] = 0;
+                               }
+
+                               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];
+                                       $contacts = DBA::select('contact', ['uid'], $condition);
+                                       while ($contact = DBA::fetch($contacts)) {
+                                               if ($contact['uid'] != 0) {
+                                                       $receivers['uid:' . $contact['uid']] = $contact['uid'];
+                                               }
+                                       }
+                                       DBA::close($contacts);
+                               }
+
+                               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);
+                                       while ($contact = DBA::fetch($contacts)) {
+                                               if ($contact['uid'] != 0) {
+                                                       $receivers['uid:' . $contact['uid']] = $contact['uid'];
+                                               }
+                                       }
+                                       DBA::close($contacts);
+                                       continue;
                                }
 
                                $condition = ['self' => true, 'nurl' => normalise_link($receiver)];
@@ -734,241 +1280,232 @@ class ActivityPub
                                if (!DBA::isResult($contact)) {
                                        continue;
                                }
-                               $receivers[$receiver] = $contact['uid'];
+                               $receivers['uid:' . $contact['uid']] = $contact['uid'];
                        }
                }
+
+               self::switchContacts($receivers, $actor);
+
                return $receivers;
        }
 
-       private static function addActivityFields($item, $activity)
+       /**
+        * @brief 
+        *
+        * @param $cid
+        * @param integer $uid User ID
+        * @param $url
+        */
+       private static function switchContact($cid, $uid, $url)
+       {
+               $profile = ActivityPub::probeProfile($url);
+               if (empty($profile)) {
+                       return;
+               }
+
+               logger('Switch contact ' . $cid . ' (' . $profile['url'] . ') for user ' . $uid . ' from OStatus to ActivityPub');
+
+               $photo = $profile['photo'];
+               unset($profile['photo']);
+               unset($profile['baseurl']);
+
+               $profile['nurl'] = normalise_link($profile['url']);
+               DBA::update('contact', $profile, ['id' => $cid]);
+
+               Contact::updateAvatar($photo, $uid, $cid);
+       }
+
+       /**
+        * @brief 
+        *
+        * @param $receivers
+        * @param $actor
+        */
+       private static function switchContacts($receivers, $actor)
+       {
+               if (empty($actor)) {
+                       return;
+               }
+
+               foreach ($receivers as $receiver) {
+                       $contact = DBA::selectFirst('contact', ['id'], ['uid' => $receiver, 'network' => Protocol::OSTATUS, 'nurl' => normalise_link($actor)]);
+                       if (DBA::isResult($contact)) {
+                               self::switchContact($contact['id'], $receiver, $actor);
+                       }
+
+                       $contact = DBA::selectFirst('contact', ['id'], ['uid' => $receiver, 'network' => Protocol::OSTATUS, 'alias' => [normalise_link($actor), $actor]]);
+                       if (DBA::isResult($contact)) {
+                               self::switchContact($contact['id'], $receiver, $actor);
+                       }
+               }
+       }
+
+       /**
+        * @brief 
+        *
+        * @param $object_data
+        * @param array $activity
+        *
+        * @return 
+        */
+       private static function addActivityFields($object_data, $activity)
        {
-               if (!empty($activity['published']) && empty($item['published'])) {
-                       $item['published'] = $activity['published'];
+               if (!empty($activity['published']) && empty($object_data['published'])) {
+                       $object_data['published'] = $activity['published'];
                }
 
-               if (!empty($activity['updated']) && empty($item['updated'])) {
-                       $item['updated'] = $activity['updated'];
+               if (!empty($activity['updated']) && empty($object_data['updated'])) {
+                       $object_data['updated'] = $activity['updated'];
                }
 
-               if (!empty($activity['inReplyTo']) && empty($item['parent-uri'])) {
-                       $item['parent-uri'] = self::processElement($activity, 'inReplyTo', 'id');
+               if (!empty($activity['inReplyTo']) && empty($object_data['parent-uri'])) {
+                       $object_data['parent-uri'] = JsonLD::fetchElement($activity, 'inReplyTo', 'id');
                }
 
                if (!empty($activity['instrument'])) {
-                       $item['service'] = self::processElement($activity, 'instrument', 'name', 'type', 'Service');
+                       $object_data['service'] = JsonLD::fetchElement($activity, 'instrument', 'name', 'type', 'Service');
                }
-               return $item;
+               return $object_data;
        }
 
-       private static function fetchObject($object_url, $object = [])
+       /**
+        * @brief 
+        *
+        * @param $object_id
+        * @param $object
+        * @param $trust_source
+        *
+        * @return 
+        */
+       private static function fetchObject($object_id, $object = [], $trust_source = false)
        {
-               $data = self::fetchContent($object_url);
-               if (empty($data)) {
-                       $data = $object;
+               if (!$trust_source || is_string($object)) {
+                       $data = self::fetchContent($object_id);
                        if (empty($data)) {
-                               logger('Empty content', LOGGER_DEBUG);
-                               return false;
-                       } elseif (is_string($data)) {
-                               logger('No object array provided.', LOGGER_DEBUG);
-                               $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', LOGGER_DEBUG);
-                               $data = self::createNote($item);
+                               logger('Empty content for ' . $object_id . ', check if content is available locally.', LOGGER_DEBUG);
+                               $data = $object_id;
                        } else {
-                               logger('Using provided object', LOGGER_DEBUG);
+                               logger('Fetched content for ' . $object_id, LOGGER_DEBUG);
+                       }
+               } 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 = self::createNote($item);
                }
 
                if (empty($data['type'])) {
                        logger('Empty type', LOGGER_DEBUG);
                        return false;
-               } else {
-                       $type = $data['type'];
-                       logger('Type ' . $type, LOGGER_DEBUG);
                }
 
-               if (in_array($type, ['Note', 'Article', 'Video'])) {
-                       $common = self::processCommonData($data);
+               if (in_array($data['type'], self::CONTENT_TYPES)) {
+                       return self::processObject($data);
                }
 
-               switch ($type) {
-                       case 'Note':
-                               return array_merge($common, self::processNote($data));
-                       case 'Article':
-                               return array_merge($common, self::processArticle($data));
-                       case 'Video':
-                               return array_merge($common, self::processVideo($data));
-
-                       case 'Announce':
-                               if (empty($data['object'])) {
-                                       return false;
-                               }
-                               return self::fetchObject($data['object']);
-
-                       case 'Person':
-                       case 'Tombstone':
-                               break;
-
-                       default:
-                               logger('Unknown object type: ' . $data['type'], LOGGER_DEBUG);
-                               break;
+               if ($data['type'] == 'Announce') {
+                       if (empty($data['object'])) {
+                               return false;
+                       }
+                       return self::fetchObject($data['object']);
                }
+
+               logger('Unhandled object type: ' . $data['type'], LOGGER_DEBUG);
        }
 
-       private static function processCommonData(&$object)
+       /**
+        * @brief 
+        *
+        * @param $object
+        *
+        * @return 
+        */
+       private static function processObject($object)
        {
-               if (empty($object['id']) || empty($object['attributedTo'])) {
+               if (empty($object['id'])) {
                        return false;
                }
 
-               $item = [];
-               $item['type'] = $object['type'];
-               $item['uri'] = $object['id'];
+               $object_data = [];
+               $object_data['object_type'] = $object['type'];
+               $object_data['id'] = $object['id'];
 
                if (!empty($object['inReplyTo'])) {
-                       $item['reply-to-uri'] = self::processElement($object, 'inReplyTo', 'id');
+                       $object_data['reply-to-id'] = JsonLD::fetchElement($object, 'inReplyTo', 'id');
                } else {
-                       $item['reply-to-uri'] = $item['uri'];
+                       $object_data['reply-to-id'] = $object_data['id'];
                }
 
-               $item['published'] = defaults($object, 'published', null);
-               $item['updated'] = defaults($object, 'updated', $item['published']);
+               $object_data['published'] = defaults($object, 'published', null);
+               $object_data['updated'] = defaults($object, 'updated', $object_data['published']);
 
-               if (empty($item['published']) && !empty($item['updated'])) {
-                       $item['published'] = $item['updated'];
+               if (empty($object_data['published']) && !empty($object_data['updated'])) {
+                       $object_data['published'] = $object_data['updated'];
                }
 
-               $item['uuid'] = defaults($object, 'uuid', null);
-               $item['owner'] = $item['author'] = self::processElement($object, 'attributedTo', 'id');
-               $item['context'] = defaults($object, 'context', null);
-               $item['conversation'] = defaults($object, 'conversation', null);
-               $item['sensitive'] = defaults($object, 'sensitive', null);
-               $item['name'] = defaults($object, 'title', null);
-               $item['name'] = defaults($object, 'name', $item['name']);
-               $item['summary'] = defaults($object, 'summary', null);
-               $item['content'] = defaults($object, 'content', null);
-               $item['source'] = defaults($object, 'source', null);
-               $item['location'] = self::processElement($object, 'location', 'name', 'type', 'Place');
-               $item['attachments'] = defaults($object, 'attachment', null);
-               $item['tags'] = defaults($object, 'tag', null);
-               $item['service'] = self::processElement($object, 'instrument', 'name', 'type', 'Service');
-               $item['alternate-url'] = self::processElement($object, 'url', 'href');
-               $item['receiver'] = self::getReceivers($object);
-
-/*
-               // To-Do
-               unset($object['source']);
+               $actor = JsonLD::fetchElement($object, 'attributedTo', 'id');
+               if (empty($actor)) {
+                       $actor = defaults($object, 'actor', 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);
+               $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['receiver'] = self::getReceivers($object, $object_data['owner']);
+
+               // Common object data:
 
                // Unhandled
-               unset($object['@context']);
-               unset($object['type']);
-               unset($object['actor']);
-               unset($object['signature']);
-               unset($object['mediaType']);
-               unset($object['duration']);
-               unset($object['replies']);
-               unset($object['icon']);
-
-               // Also missing:
-               audience, preview, endTime, startTime, generator, image
-*/
-               return $item;
-       }
+               // @context, type, actor, signature, mediaType, duration, replies, icon
 
-       private static function processNote($object)
-       {
-               $item = [];
+               // Also missing: (Defined in the standard, but currently unused)
+               // audience, preview, endTime, startTime, generator, image
 
-/*
-               // To-Do?
-               unset($object['emoji']);
-               unset($object['atomUri']);
-               unset($object['inReplyToAtomUri']);
+               // Data in Notes:
 
                // Unhandled
-               unset($object['contentMap']);
-               unset($object['announcement_count']);
-               unset($object['announcements']);
-               unset($object['context_id']);
-               unset($object['likes']);
-               unset($object['like_count']);
-               unset($object['inReplyToStatusId']);
-               unset($object['shares']);
-               unset($object['quoteUrl']);
-               unset($object['statusnetConversationId']);
-*/
-               return $item;
-       }
-
-       private static function processArticle($object)
-       {
-               $item = [];
+               // contentMap, announcement_count, announcements, context_id, likes, like_count
+               // inReplyToStatusId, shares, quoteUrl, statusnetConversationId
 
-               return $item;
-       }
+               // Data in video:
 
-       private static function processVideo($object)
-       {
-               $item = [];
-/*
                // To-Do?
-               unset($object['category']);
-               unset($object['licence']);
-               unset($object['language']);
-               unset($object['commentsEnabled']);
+               // category, licence, language, commentsEnabled
 
                // Unhandled
-               unset($object['views']);
-               unset($object['waitTranscoding']);
-               unset($object['state']);
-               unset($object['support']);
-               unset($object['subtitleLanguage']);
-               unset($object['likes']);
-               unset($object['dislikes']);
-               unset($object['shares']);
-               unset($object['comments']);
-*/
-               return $item;
-       }
-
-       private static function processElement($array, $element, $key, $type = null, $type_value = null)
-       {
-               if (empty($array)) {
-                       return false;
-               }
+               // views, waitTranscoding, state, support, subtitleLanguage
+               // likes, dislikes, shares, comments
 
-               if (empty($array[$element])) {
-                       return false;
-               }
-
-               if (is_string($array[$element])) {
-                       return $array[$element];
-               }
-
-               if (is_null($type_value)) {
-                       if (!empty($array[$element][$key])) {
-                               return $array[$element][$key];
-                       }
-
-                       if (!empty($array[$element][0][$key])) {
-                               return $array[$element][0][$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 $object_data;
        }
 
+       /**
+        * @brief Converts mentions from Pleroma into the Friendica format
+        *
+        * @param string $body
+        *
+        * @return converted body
+        */
        private static function convertMentions($body)
        {
                $URLSearchString = "^\[\]";
@@ -977,6 +1514,14 @@ class ActivityPub
                return $body;
        }
 
+       /**
+        * @brief Constructs a string with tags for a given tag array
+        *
+        * @param array $tags
+        * @param boolean $sensitive
+        *
+        * @return string with tags
+        */
        private static function constructTagList($tags, $sensitive)
        {
                if (empty($tags)) {
@@ -999,6 +1544,14 @@ class ActivityPub
                return $tag_text;
        }
 
+       /**
+        * @brief 
+        *
+        * @param $attachments
+        * @param array $item
+        *
+        * @return item array
+        */
        private static function constructAttachList($attachments, $item)
        {
                if (empty($attachments)) {
@@ -1025,13 +1578,19 @@ class ActivityPub
                return $item;
        }
 
+       /**
+        * @brief 
+        *
+        * @param array $activity
+        * @param $body
+        */
        private static function createItem($activity, $body)
        {
                $item = [];
                $item['verb'] = ACTIVITY_POST;
-               $item['parent-uri'] = $activity['reply-to-uri'];
+               $item['parent-uri'] = $activity['reply-to-id'];
 
-               if ($activity['reply-to-uri'] == $activity['uri']) {
+               if ($activity['reply-to-id'] == $activity['id']) {
                        $item['gravity'] = GRAVITY_PARENT;
                        $item['object-type'] = ACTIVITY_OBJ_NOTE;
                } else {
@@ -1039,9 +1598,20 @@ class ActivityPub
                        $item['object-type'] = ACTIVITY_OBJ_COMMENT;
                }
 
+               if (($activity['id'] != $activity['reply-to-id']) && !Item::exists(['uri' => $activity['reply-to-id']])) {
+                       logger('Parent ' . $activity['reply-to-id'] . ' not found. Try to refetch it.');
+                       self::fetchMissingActivity($activity['reply-to-id'], $activity);
+               }
+
                self::postItem($activity, $item, $body);
        }
 
+       /**
+        * @brief 
+        *
+        * @param array $activity
+        * @param $body
+        */
        private static function likeItem($activity, $body)
        {
                $item = [];
@@ -1053,18 +1623,61 @@ class ActivityPub
                self::postItem($activity, $item, $body);
        }
 
+       /**
+        * @brief Delete items
+        *
+        * @param array $activity
+        * @param $body
+        */
+       private static function deleteItem($activity)
+       {
+               $owner = Contact::getIdForURL($activity['owner']);
+               $object = JsonLD::fetchElement($activity, 'object', 'id');
+               logger('Deleting item ' . $object . ' from ' . $owner, LOGGER_DEBUG);
+               Item::delete(['uri' => $object, 'owner-id' => $owner]);
+       }
+
+       /**
+        * @brief 
+        *
+        * @param array $activity
+        * @param $body
+        */
+       private static function dislikeItem($activity, $body)
+       {
+               $item = [];
+               $item['verb'] = ACTIVITY_DISLIKE;
+               $item['parent-uri'] = $activity['object'];
+               $item['gravity'] = GRAVITY_ACTIVITY;
+               $item['object-type'] = ACTIVITY_OBJ_NOTE;
+
+               self::postItem($activity, $item, $body);
+       }
+
+       /**
+        * @brief 
+        *
+        * @param array $activity
+        * @param array $item
+        * @param $body
+        */
        private static function postItem($activity, $item, $body)
        {
                /// @todo What to do with $activity['context']?
 
+               if (($item['gravity'] != GRAVITY_PARENT) && !Item::exists(['uri' => $item['parent-uri']])) {
+                       logger('Parent ' . $item['parent-uri'] . ' not found, message will be discarded.', LOGGER_DEBUG);
+                       return;
+               }
+
                $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['uri'] = $activity['uri'];
+               $item['uri'] = $activity['id'];
                $item['created'] = $activity['published'];
                $item['edited'] = $activity['updated'];
-               $item['guid'] = $activity['uuid'];
+               $item['guid'] = $activity['diaspora:guid'];
                $item['title'] = HTML::toBBCode($activity['name']);
                $item['content-warning'] = HTML::toBBCode($activity['summary']);
                $item['body'] = self::convertMentions(HTML::toBBCode($activity['content']));
@@ -1075,13 +1688,14 @@ class ActivityPub
 
                $item = self::constructAttachList($activity['attachments'], $item);
 
-               $source = self::processElement($activity, 'source', 'content', 'mediaType', 'text/bbcode');
+               $source = JsonLD::fetchElement($activity, 'source', 'content', 'mediaType', 'text/bbcode');
                if (!empty($source)) {
                        $item['body'] = $source;
                }
 
                $item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
                $item['source'] = $body;
+               $item['conversation-href'] = $activity['context'];
                $item['conversation-uri'] = $activity['conversation'];
 
                foreach ($activity['receiver'] as $receiver) {
@@ -1094,19 +1708,55 @@ class ActivityPub
 
                        $item_id = Item::insert($item);
                        logger('Storing for user ' . $item['uid'] . ': ' . $item_id);
-                       if (!empty($item_id) && ($item['uid'] == 0)) {
-                               Item::distribute($item_id);
-                       }
                }
        }
 
+       /**
+        * @brief 
+        *
+        * @param $url
+        * @param $child
+        */
+       private static function fetchMissingActivity($url, $child)
+       {
+               if (Config::get('system', 'ostatus_full_threads')) {
+                       return;
+               }
+
+               $object = ActivityPub::fetchContent($url);
+               if (empty($object)) {
+                       logger('Activity ' . $url . ' was not fetchable, aborting.');
+                       return;
+               }
+
+               $activity = [];
+               $activity['@context'] = $object['@context'];
+               unset($object['@context']);
+               $activity['id'] = $object['id'];
+               $activity['to'] = defaults($object, 'to', []);
+               $activity['cc'] = defaults($object, 'cc', []);
+               $activity['actor'] = $child['author'];
+               $activity['object'] = $object;
+               $activity['published'] = $object['published'];
+               $activity['type'] = 'Create';
+
+               self::processActivity($activity);
+               logger('Activity ' . $url . ' had been fetched and processed.');
+       }
+
+       /**
+        * @brief perform a "follow" request
+        *
+        * @param array $activity
+        */
        private static function followUser($activity)
        {
-               if (empty($activity['receiver'][$activity['object']])) {
+               $actor = JsonLD::fetchElement($activity, 'object', 'id');
+               $uid = User::getIdForURL($actor);
+               if (empty($uid)) {
                        return;
                }
 
-               $uid = $activity['receiver'][$activity['object']];
                $owner = User::getOwnerDataById($uid);
 
                $cid = Contact::getIdForURL($activity['owner'], $uid);
@@ -1134,13 +1784,60 @@ class ActivityPub
                logger('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']);
        }
 
+       /**
+        * @brief Update the given profile
+        *
+        * @param array $activity
+        */
+       private static function updatePerson($activity)
+       {
+               if (empty($activity['object']['id'])) {
+                       return;
+               }
+
+               logger('Updating profile for ' . $activity['object']['id'], LOGGER_DEBUG);
+               APContact::getByURL($activity['object']['id'], true);
+       }
+
+       /**
+        * @brief Delete the given profile
+        *
+        * @param array $activity
+        */
+       private static function deletePerson($activity)
+       {
+               if (empty($activity['object']['id']) || empty($activity['object']['actor'])) {
+                       logger('Empty object id or actor.', LOGGER_DEBUG);
+                       return;
+               }
+
+               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($activity['object']['id'])]);
+               while ($contact = DBA::fetch($contacts)) {
+                       Contact::remove($contact["id"]);
+               }
+               DBA::close($contacts);
+
+               logger('Deleted contact ' . $activity['object']['id'], LOGGER_DEBUG);
+       }
+
+       /**
+        * @brief Accept a follow request
+        *
+        * @param array $activity
+        */
        private static function acceptFollowUser($activity)
        {
-               if (empty($activity['receiver'][$activity['object']])) {
+               $actor = JsonLD::fetchElement($activity, 'object', 'actor');
+               $uid = User::getIdForURL($actor);
+               if (empty($uid)) {
                        return;
                }
 
-               $uid = $activity['receiver'][$activity['object']];
                $owner = User::getOwnerDataById($uid);
 
                $cid = Contact::getIdForURL($activity['owner'], $uid);
@@ -1150,18 +1847,84 @@ class ActivityPub
                }
 
                $fields = ['pending' => false];
-               $condition = ['id' => $cid, 'pending' => true];
-               DBA::update('comtact', $fields, $condition);
+
+               $contact = DBA::selectFirst('contact', ['rel'], ['id' => $cid]);
+               if ($contact['rel'] == Contact::FOLLOWER) {
+                       $fields['rel'] = Contact::FRIEND;
+               }
+
+               $condition = ['id' => $cid];
+               DBA::update('contact', $fields, $condition);
                logger('Accept contact request from contact ' . $cid . ' for user ' . $uid, LOGGER_DEBUG);
        }
 
+       /**
+        * @brief Reject a follow request
+        *
+        * @param array $activity
+        */
+       private static function rejectFollowUser($activity)
+       {
+               $actor = JsonLD::fetchElement($activity, 'object', 'actor');
+               $uid = User::getIdForURL($actor);
+               if (empty($uid)) {
+                       return;
+               }
+
+               $owner = User::getOwnerDataById($uid);
+
+               $cid = Contact::getIdForURL($activity['owner'], $uid);
+               if (empty($cid)) {
+                       logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG);
+                       return;
+               }
+
+               if (DBA::exists('contact', ['id' => $cid, 'rel' => Contact::SHARING, 'pending' => true])) {
+                       Contact::remove($cid);
+                       logger('Rejected contact request from contact ' . $cid . ' for user ' . $uid . ' - contact had been removed.', LOGGER_DEBUG);
+               } else {
+                       logger('Rejected contact request from contact ' . $cid . ' for user ' . $uid . '.', LOGGER_DEBUG);
+               }
+       }
+
+       /**
+        * @brief Undo activity like "like" or "dislike"
+        *
+        * @param array $activity
+        */
+       private static function undoActivity($activity)
+       {
+               $activity_url = JsonLD::fetchElement($activity, 'object', 'id');
+               if (empty($activity_url)) {
+                       return;
+               }
+
+               $actor = JsonLD::fetchElement($activity, 'object', 'actor');
+               if (empty($actor)) {
+                       return;
+               }
+
+               $author_id = Contact::getIdForURL($actor);
+               if (empty($author_id)) {
+                       return;
+               }
+
+               Item::delete(['uri' => $activity_url, 'author-id' => $author_id, 'gravity' => GRAVITY_ACTIVITY]);
+       }
+
+       /**
+        * @brief Activity to remove a follower
+        *
+        * @param array $activity
+        */
        private static function undoFollowUser($activity)
        {
-               if (empty($activity['receiver'][$activity['object']])) {
+               $object = JsonLD::fetchElement($activity, 'object', 'object');
+               $uid = User::getIdForURL($object);
+               if (empty($uid)) {
                        return;
                }
 
-               $uid = $activity['receiver'][$activity['object']];
                $owner = User::getOwnerDataById($uid);
 
                $cid = Contact::getIdForURL($activity['owner'], $uid);