]> 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 0229aaac321ed638ced87c7f46ce5a045760535d..ef4a48479ea2a4c677704763af81d10272e443a8 100644 (file)
@@ -44,27 +44,24 @@ use Friendica\Core\Config;
  * To-do:
  *
  * Receiver:
- * - Update Note
- * - Delete Note
- * - Delete Person
+ * - Update (Image, Video, Article, Note)
+ * - Event
  * - Undo Announce
- * - Reject Follow
- * - Undo Accept
- * - Undo Follow
+ *
+ * Check what this is meant to do:
  * - Add
- * - Create Image
- * - Create Video
- * - Event
- * - Remove
  * - Block
  * - Flag
+ * - Remove
+ * - Undo Block
+ * - Undo Accept (Problem: This could invert a contact accept or an event accept)
  *
  * Transmitter:
+ * - Event
+ *
+ * Complicated:
  * - Announce
  * - Undo Announce
- * - Update Person
- * - Reject Follow
- * - Event
  *
  * General:
  * - Attachments
@@ -75,19 +72,34 @@ use Friendica\Core\Config;
  */
 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',
-               ['ostatus' => 'http://ostatus.org#', 'uuid' => 'http://schema.org/identifier',
-               'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag',
-               'atomUri' => 'ostatus:atomUri', 'conversation' => 'ostatus:conversation',
-               'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri']];
-
+               ['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');
        }
 
+       /**
+        * @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)
        {
                $condition = ['rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::NATIVE_SUPPORT, 'uid' => $owner['uid'],
@@ -100,7 +112,7 @@ class ActivityPub
                $data['totalItems'] = $count;
 
                // When we hide our friends we will only show the pure number but don't allow more.
-               $profile = Profile::getProfileForUser($owner['uid']);
+               $profile = Profile::getByUID($owner['uid']);
                if (!empty($profile['hide-friends'])) {
                        return $data;
                }
@@ -127,6 +139,14 @@ class ActivityPub
                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'],
@@ -139,7 +159,7 @@ class ActivityPub
                $data['totalItems'] = $count;
 
                // When we hide our friends we will only show the pure number but don't allow more.
-               $profile = Profile::getProfileForUser($owner['uid']);
+               $profile = Profile::getByUID($owner['uid']);
                if (!empty($profile['hide-friends'])) {
                        return $data;
                }
@@ -166,6 +186,14 @@ class ActivityPub
                return $data;
        }
 
+       /**
+        * @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);
@@ -210,11 +238,10 @@ class ActivityPub
         * 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', 'page-flags'];
@@ -235,13 +262,10 @@ class ActivityPub
                        return [];
                }
 
-               $data = ['@context' => ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
-                       ['vcard' => 'http://www.w3.org/2006/vcard/ns#', 'uuid' => 'http://schema.org/identifier',
-                       'sensitive' => 'as:sensitive', 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers']]];
-
+               $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'];
@@ -264,6 +288,13 @@ class ActivityPub
                return $data;
        }
 
+       /**
+        * @brief Returns an array with permissions of a given item array
+        *
+        * @param array $item
+        *
+        * @return array with permissions
+        */
        private static function fetchPermissionBlockFromConversation($item)
        {
                if (empty($item['thr-parent'])) {
@@ -279,9 +310,9 @@ class ActivityPub
                $activity = json_decode($conversation['source'], true);
 
                $actor = JsonLD::fetchElement($activity, 'actor', 'id');
-               $profile = APContact::getProfileByURL($actor);
+               $profile = APContact::getByURL($actor);
 
-               $item_profile = APContact::getProfileByURL($item['author-link']);
+               $item_profile = APContact::getByURL($item['author-link']);
                $exclude[] = $item['author-link'];
 
                if ($item['gravity'] == GRAVITY_PARENT) {
@@ -290,8 +321,7 @@ class ActivityPub
 
                $permissions['to'][] = $actor;
 
-               $elements = ['to', 'cc', 'bto', 'bcc'];
-               foreach ($elements as $element) {
+               foreach (['to', 'cc', 'bto', 'bcc'] as $element) {
                        if (empty($activity[$element])) {
                                continue;
                        }
@@ -311,29 +341,33 @@ class ActivityPub
                return $permissions;
        }
 
+       /**
+        * @brief Creates an array of permissions from an item thread
+        *
+        * @param array $item
+        *
+        * @return permission array
+        */
        public static function createPermissionBlockForItem($item)
        {
                $data = ['to' => [], 'cc' => []];
 
                $data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
 
-               $actor_profile = APContact::getProfileByURL($item['author-link']);
+               $actor_profile = APContact::getByURL($item['author-link']);
 
-               $terms = Term::tagArrayFromItemId($item['id']);
+               $terms = Term::tagArrayFromItemId($item['id'], TERM_MENTION);
 
                $contacts[$item['author-link']] = $item['author-link'];
 
                if (!$item['private']) {
-                       $data['to'][] = self::PUBLIC;
+                       $data['to'][] = self::PUBLIC_COLLECTION;
                        if (!empty($actor_profile['followers'])) {
                                $data['cc'][] = $actor_profile['followers'];
                        }
 
                        foreach ($terms as $term) {
-                               if ($term['type'] != TERM_MENTION) {
-                                       continue;
-                               }
-                               $profile = APContact::getProfileByURL($term['url'], false);
+                               $profile = APContact::getByURL($term['url'], false);
                                if (!empty($profile) && empty($contacts[$profile['url']])) {
                                        $data['cc'][] = $profile['url'];
                                        $contacts[$profile['url']] = $profile['url'];
@@ -345,9 +379,6 @@ class ActivityPub
                        $mentioned = [];
 
                        foreach ($terms as $term) {
-                               if ($term['type'] != TERM_MENTION) {
-                                       continue;
-                               }
                                $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]);
@@ -372,7 +403,7 @@ class ActivityPub
                                continue;
                        }
 
-                       $profile = APContact::getProfileByURL($parent['author-link'], false);
+                       $profile = APContact::getByURL($parent['author-link'], false);
                        if (!empty($profile) && empty($contacts[$profile['url']])) {
                                $data['cc'][] = $profile['url'];
                                $contacts[$profile['url']] = $profile['url'];
@@ -382,7 +413,7 @@ class ActivityPub
                                continue;
                        }
 
-                       $profile = APContact::getProfileByURL($parent['owner-link'], false);
+                       $profile = APContact::getByURL($parent['owner-link'], false);
                        if (!empty($profile) && empty($contacts[$profile['url']])) {
                                $data['cc'][] = $profile['url'];
                                $contacts[$profile['url']] = $profile['url'];
@@ -398,6 +429,41 @@ class ActivityPub
                return $data;
        }
 
+       /**
+        * @brief Fetches a list of inboxes of followers of a given user
+        *
+        * @param integer $uid User ID
+        *
+        * @return array of follower inboxes
+        */
+       public static function fetchTargetInboxesforUser($uid)
+       {
+               $inboxes = [];
+
+               $condition = ['uid' => $uid, 'network' => Protocol::ACTIVITYPUB, 'archive' => false, 'pending' => false];
+
+               if (!empty($uid)) {
+                       $condition['rel'] = [Contact::FOLLOWER, Contact::FRIEND];
+               }
+
+               $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;
+       }
+
+       /**
+        * @brief Fetches an array of inboxes for the given item and user
+        *
+        * @param array $item
+        * @param integer $uid User ID
+        *
+        * @return array with inboxes
+        */
        public static function fetchTargetInboxes($item, $uid)
        {
                $permissions = self::createPermissionBlockForItem($item);
@@ -408,28 +474,21 @@ class ActivityPub
                $inboxes = [];
 
                if ($item['gravity'] == GRAVITY_ACTIVITY) {
-                       $item_profile = APContact::getProfileByURL($item['author-link']);
+                       $item_profile = APContact::getByURL($item['author-link']);
                } else {
-                       $item_profile = APContact::getProfileByURL($item['owner-link']);
+                       $item_profile = APContact::getByURL($item['owner-link']);
                }
 
-               $elements = ['to', 'cc', 'bto', 'bcc'];
-               foreach ($elements as $element) {
+               foreach (['to', 'cc', 'bto', 'bcc'] as $element) {
                        if (empty($permissions[$element])) {
                                continue;
                        }
 
                        foreach ($permissions[$element] as $receiver) {
                                if ($receiver == $item_profile['followers']) {
-                                       $contacts = DBA::select('contact', ['notify', 'batch'], ['uid' => $uid,
-                                               'rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::ACTIVITYPUB]);
-                                       while ($contact = DBA::fetch($contacts)) {
-                                               $contact = defaults($contact, 'batch', $contact['notify']);
-                                               $inboxes[$contact] = $contact;
-                                       }
-                                       DBA::close($contacts);
+                                       $inboxes = self::fetchTargetInboxesforUser($uid);
                                } else {
-                                       $profile = APContact::getProfileByURL($receiver);
+                                       $profile = APContact::getByURL($receiver);
                                        if (!empty($profile)) {
                                                $target = defaults($profile, 'sharedinbox', $profile['inbox']);
                                                $inboxes[$target] = $target;
@@ -441,6 +500,13 @@ class ActivityPub
                return $inboxes;
        }
 
+       /**
+        * @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) {
@@ -466,6 +532,14 @@ class ActivityPub
                return $type;
        }
 
+       /**
+        * @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)
        {
                $item = Item::selectFirst([], ['id' => $item_id, 'parent-network' => Protocol::NATIVE_SUPPORT]);
@@ -512,7 +586,7 @@ class ActivityPub
                $data = array_merge($data, ActivityPub::createPermissionBlockForItem($item));
 
                if (in_array($data['type'], ['Create', 'Update', 'Announce', 'Delete'])) {
-                       $data['object'] = self::CreateNote($item);
+                       $data['object'] = self::createNote($item);
                } elseif ($data['type'] == 'Undo') {
                        $data['object'] = self::createActivityFromItem($item_id, true);
                } else {
@@ -528,6 +602,13 @@ class ActivityPub
                }
        }
 
+       /**
+        * @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]);
@@ -537,44 +618,43 @@ class ActivityPub
                }
 
                $data = ['@context' => self::CONTEXT];
-               $data = array_merge($data, self::CreateNote($item));
+               $data = array_merge($data, self::createNote($item));
 
                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']);
+               $terms = Term::tagArrayFromItemId($item['id'], TERM_MENTION);
                foreach ($terms as $term) {
-                       if ($term['type'] == TERM_MENTION) {
-                               $contact = Contact::getDetailsByURL($term['url']);
-                               if (!empty($contact['addr'])) {
-                                       $mention = '@' . $contact['addr'];
-                               } else {
-                                       $mention = '@' . $term['url'];
-                               }
-
-                               $tags[] = ['type' => 'Mention', 'href' => $term['url'], 'name' => $mention];
+                       $contact = Contact::getDetailsByURL($term['url']);
+                       if (!empty($contact['addr'])) {
+                               $mention = '@' . $contact['addr'];
+                       } else {
+                               $mention = '@' . $term['url'];
                        }
-               }
-               return $tags;
-       }
 
-       private static function fetchConversationURLForItem($item)
-       {
-               $conversation = DBA::selectFirst('conversation', ['conversation-href', 'conversation-uri'], ['item-uri' => $item['parent-uri']]);
-               if (DBA::isResult($conversation) && !empty($conversation['conversation-uri'])) {
-                       $conversation_uri = $conversation['conversation-uri'];
-               } elseif (DBA::isResult($conversation) && !empty($conversation['conversation-href'])) {
-                       $conversation_uri = $conversation['conversation-href'];
-               } else {
-                       $conversation_uri = str_replace('/object/', '/context/', $item['parent-uri']);
+                       $tags[] = ['type' => 'Mention', 'href' => $term['url'], 'name' => $mention];
                }
-               return $conversation_uri;
+               return $tags;
        }
 
+       /**
+        * @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']]);
@@ -583,12 +663,19 @@ class ActivityPub
                } elseif (DBA::isResult($conversation) && !empty($conversation['conversation-uri'])) {
                        $context_uri = $conversation['conversation-uri'];
                } else {
-                       $context_uri = str_replace('/object/', '/context/', $item['parent-uri']);
+                       $context_uri = str_replace('/objects/', '/context/', $item['parent-uri']);
                }
                return $context_uri;
        }
 
-       private static function CreateNote($item)
+       /**
+        * @brief Creates a note/article object array
+        *
+        * @param array $item
+        *
+        * @return object array
+        */
+       private static function createNote($item)
        {
                if (!empty($item['title'])) {
                        $type = 'Article';
@@ -616,7 +703,7 @@ class ActivityPub
                        $data['inReplyTo'] = null;
                }
 
-               $data['uuid'] = $item['guid'];
+               $data['diaspora:guid'] = $item['guid'];
                $data['published'] = DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM);
 
                if ($item["created"] != $item["edited"]) {
@@ -627,7 +714,6 @@ class ActivityPub
                $data['attributedTo'] = $item['author-link'];
                $data['actor'] = $item['author-link'];
                $data['sensitive'] = false; // - Query NSFW
-               $data['conversation'] = self::fetchConversationURLForItem($item);
                $data['context'] = self::fetchContextURLForItem($item);
 
                if (!empty($item['title'])) {
@@ -636,6 +722,11 @@ class ActivityPub
 
                $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'];
+               }
+
                $data['attachment'] = []; // @ToDo
                $data['tag'] = self::createTagList($item);
                $data = array_merge($data, ActivityPub::createPermissionBlockForItem($item));
@@ -643,9 +734,68 @@ class ActivityPub
                return $data;
        }
 
+       /**
+        * @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)
+       {
+               $owner = User::getOwnerDataById($uid);
+               $profile = APContact::getByURL($owner['url']);
+
+               $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 Transmits a profile change to a given inbox
+        *
+        * @param integer $uid User ID
+        * @param string $inbox Target inbox
+        */
+       public static function transmitProfileUpdate($uid, $inbox)
+       {
+               $owner = User::getOwnerDataById($uid);
+               $profile = APContact::getByURL($owner['url']);
+
+               $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' => []];
+
+               $signed = LDSignature::sign($data, $owner);
+
+               logger('Deliver profile update for user ' . $uid . ' to ' . $inbox .' via ActivityPub', LOGGER_DEBUG);
+               HTTPSignature::transmit($signed, $inbox, $uid);
+       }
+
+       /**
+        * @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::getProfileByURL($target);
+               $profile = APContact::getByURL($target);
 
                $owner = User::getOwnerDataById($uid);
 
@@ -659,12 +809,19 @@ class ActivityPub
                logger('Sending activity ' . $activity . ' to ' . $target . ' for user ' . $uid, LOGGER_DEBUG);
 
                $signed = LDSignature::sign($data, $owner);
-               return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+               HTTPSignature::transmit($signed, $profile['inbox'], $uid);
        }
 
+       /**
+        * @brief Transmit a message that the contact request had been accepted
+        *
+        * @param string $target Target profile
+        * @param $id
+        * @param integer $uid User ID
+        */
        public static function transmitContactAccept($target, $id, $uid)
        {
-               $profile = APContact::getProfileByURL($target);
+               $profile = APContact::getByURL($target);
 
                $owner = User::getOwnerDataById($uid);
                $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
@@ -679,12 +836,19 @@ class ActivityPub
                logger('Sending accept to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
 
                $signed = LDSignature::sign($data, $owner);
-               return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+               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::getProfileByURL($target);
+               $profile = APContact::getByURL($target);
 
                $owner = User::getOwnerDataById($uid);
                $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
@@ -699,12 +863,18 @@ class ActivityPub
                logger('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
 
                $signed = LDSignature::sign($data, $owner);
-               return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+               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::getProfileByURL($target);
+               $profile = APContact::getByURL($target);
 
                $id = System::baseUrl() . '/activity/' . System::createGUID();
 
@@ -721,7 +891,7 @@ class ActivityPub
                logger('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
 
                $signed = LDSignature::sign($data, $owner);
-               return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+               HTTPSignature::transmit($signed, $profile['inbox'], $uid);
        }
 
        /**
@@ -734,8 +904,9 @@ class ActivityPub
        {
                $ret = Network::curl($url, false, $redirects, ['accept_content' => 'application/activity+json, application/ld+json']);
                if (!$ret['success'] || empty($ret['body'])) {
-                       return;
+                       return false;
                }
+
                return json_decode($ret['body'], true);
        }
 
@@ -747,7 +918,7 @@ class ActivityPub
         */
        public static function probeProfile($url)
        {
-               $apcontact = APContact::getProfileByURL($url, true);
+               $apcontact = APContact::getByURL($url, true);
                if (empty($apcontact)) {
                        return false;
                }
@@ -780,6 +951,13 @@ class ActivityPub
                return $profile;
        }
 
+       /**
+        * @brief 
+        *
+        * @param $body
+        * @param $header
+        * @param integer $uid User ID
+        */
        public static function processInbox($body, $header, $uid)
        {
                $http_signer = HTTPSignature::getSigner($body, $header);
@@ -829,6 +1007,12 @@ class ActivityPub
                self::processActivity($activity, $body, $uid, $trust_source);
        }
 
+       /**
+        * @brief 
+        *
+        * @param $url
+        * @param integer $uid User ID
+        */
        public static function fetchOutbox($url, $uid)
        {
                $data = self::fetchContent($url);
@@ -852,6 +1036,15 @@ class ActivityPub
                }
        }
 
+       /**
+        * @brief 
+        *
+        * @param array $activity
+        * @param integer $uid User ID
+        * @param $trust_source
+        *
+        * @return 
+        */
        private static function prepareObjectData($activity, $uid, &$trust_source)
        {
                $actor = JsonLD::fetchElement($activity, 'actor', 'id');
@@ -890,7 +1083,7 @@ class ActivityPub
                } 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 = self::processObject($activity);
                        $object_data['name'] = $activity['type'];
                        $object_data['author'] = $activity['actor'];
                        $object_data['object'] = $object_id;
@@ -913,6 +1106,14 @@ class ActivityPub
                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'])) {
@@ -957,12 +1158,19 @@ class ActivityPub
                                break;
 
                        case 'Update':
-                               if (in_array($object_data['object_type'], ['Person', 'Organization', 'Service', 'Group', 'Application'])) {
+                               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':
@@ -975,10 +1183,16 @@ class ActivityPub
                                }
                                break;
 
+                       case 'Reject':
+                               if ($object_data['object_type'] == 'Follow') {
+                                       self::rejectFollowUser($object_data);
+                               }
+                               break;
+
                        case 'Undo':
                                if ($object_data['object_type'] == 'Follow') {
                                        self::undoFollowUser($object_data);
-                               } elseif (in_array($object_data['object_type'], ['Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept'])) {
+                               } elseif (in_array($object_data['object_type'], self::ACTIVITY_TYPES)) {
                                        self::undoActivity($object_data);
                                }
                                break;
@@ -989,6 +1203,14 @@ class ActivityPub
                }
        }
 
+       /**
+        * @brief 
+        *
+        * @param array $activity
+        * @param $actor
+        *
+        * @return 
+        */
        private static function getReceivers($activity, $actor)
        {
                $receivers = [];
@@ -1003,7 +1225,7 @@ class ActivityPub
                }
 
                if (!empty($actor)) {
-                       $profile = APContact::getProfileByURL($actor);
+                       $profile = APContact::getByURL($actor);
                        $followers = defaults($profile, 'followers', '');
 
                        logger('Actor: ' . $actor . ' - Followers: ' . $followers, LOGGER_DEBUG);
@@ -1012,25 +1234,25 @@ class ActivityPub
                        $followers = '';
                }
 
-               $elements = ['to', 'cc', 'bto', 'bcc'];
-               foreach ($elements as $element) {
+               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) {
+                               if ($receiver == self::PUBLIC_COLLECTION) {
                                        $receivers['uid:0'] = 0;
                                }
 
-                               if (($receiver == self::PUBLIC) && !empty($actor)) {
+                               if (($receiver == self::PUBLIC_COLLECTION) && !empty($actor)) {
                                        // This will most likely catch all OStatus connections to Mastodon
-                                       $condition = ['alias' => [$actor, normalise_link($actor)], 'rel' => [Contact::SHARING, Contact::FRIEND]];
+                                       $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) {
@@ -1040,9 +1262,9 @@ class ActivityPub
                                        DBA::close($contacts);
                                }
 
-                               if (in_array($receiver, [$followers, self::PUBLIC]) && !empty($actor)) {
+                               if (in_array($receiver, [$followers, self::PUBLIC_COLLECTION]) && !empty($actor)) {
                                        $condition = ['nurl' => normalise_link($actor), 'rel' => [Contact::SHARING, Contact::FRIEND],
-                                               'network' => Protocol::ACTIVITYPUB];
+                                               'network' => Protocol::ACTIVITYPUB, 'archive' => false, 'pending' => false];
                                        $contacts = DBA::select('contact', ['uid'], $condition);
                                        while ($contact = DBA::fetch($contacts)) {
                                                if ($contact['uid'] != 0) {
@@ -1067,6 +1289,13 @@ class ActivityPub
                return $receivers;
        }
 
+       /**
+        * @brief 
+        *
+        * @param $cid
+        * @param integer $uid User ID
+        * @param $url
+        */
        private static function switchContact($cid, $uid, $url)
        {
                $profile = ActivityPub::probeProfile($url);
@@ -1086,6 +1315,12 @@ class ActivityPub
                Contact::updateAvatar($photo, $uid, $cid);
        }
 
+       /**
+        * @brief 
+        *
+        * @param $receivers
+        * @param $actor
+        */
        private static function switchContacts($receivers, $actor)
        {
                if (empty($actor)) {
@@ -1105,6 +1340,14 @@ class ActivityPub
                }
        }
 
+       /**
+        * @brief 
+        *
+        * @param $object_data
+        * @param array $activity
+        *
+        * @return 
+        */
        private static function addActivityFields($object_data, $activity)
        {
                if (!empty($activity['published']) && empty($object_data['published'])) {
@@ -1125,6 +1368,15 @@ class ActivityPub
                return $object_data;
        }
 
+       /**
+        * @brief 
+        *
+        * @param $object_id
+        * @param $object
+        * @param $trust_source
+        *
+        * @return 
+        */
        private static function fetchObject($object_id, $object = [], $trust_source = false)
        {
                if (!$trust_source || is_string($object)) {
@@ -1147,7 +1399,7 @@ class ActivityPub
                                return false;
                        }
                        logger('Using already stored item for url ' . $object_id, LOGGER_DEBUG);
-                       $data = self::CreateNote($item);
+                       $data = self::createNote($item);
                }
 
                if (empty($data['type'])) {
@@ -1155,29 +1407,28 @@ class ActivityPub
                        return false;
                }
 
-               switch ($data['type']) {
-                       case 'Note':
-                       case 'Article':
-                       case 'Video':
-                               return self::ProcessObject($data);
-
-                       case 'Announce':
-                               if (empty($data['object'])) {
-                                       return false;
-                               }
-                               return self::fetchObject($data['object']);
-
-                       case 'Person':
-                       case 'Tombstone':
-                               break;
+               if (in_array($data['type'], self::CONTENT_TYPES)) {
+                       return self::processObject($data);
+               }
 
-                       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 ProcessObject(&$object)
+       /**
+        * @brief 
+        *
+        * @param $object
+        *
+        * @return 
+        */
+       private static function processObject($object)
        {
                if (empty($object['id'])) {
                        return false;
@@ -1205,7 +1456,7 @@ class ActivityPub
                        $actor = defaults($object, 'actor', null);
                }
 
-               $object_data['uuid'] = defaults($object, 'uuid', null);
+               $object_data['diaspora:guid'] = defaults($object, 'diaspora:guid', null);
                $object_data['owner'] = $object_data['author'] = $actor;
                $object_data['context'] = defaults($object, 'context', null);
                $object_data['conversation'] = defaults($object, 'conversation', null);
@@ -1232,9 +1483,6 @@ class ActivityPub
 
                // Data in Notes:
 
-               // To-Do?
-               // emoji, atomUri, inReplyToAtomUri
-
                // Unhandled
                // contentMap, announcement_count, announcements, context_id, likes, like_count
                // inReplyToStatusId, shares, quoteUrl, statusnetConversationId
@@ -1248,10 +1496,16 @@ class ActivityPub
                // views, waitTranscoding, state, support, subtitleLanguage
                // likes, dislikes, shares, comments
 
-
                return $object_data;
        }
 
+       /**
+        * @brief Converts mentions from Pleroma into the Friendica format
+        *
+        * @param string $body
+        *
+        * @return converted body
+        */
        private static function convertMentions($body)
        {
                $URLSearchString = "^\[\]";
@@ -1260,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)) {
@@ -1282,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)) {
@@ -1308,6 +1578,12 @@ class ActivityPub
                return $item;
        }
 
+       /**
+        * @brief 
+        *
+        * @param array $activity
+        * @param $body
+        */
        private static function createItem($activity, $body)
        {
                $item = [];
@@ -1330,6 +1606,12 @@ class ActivityPub
                self::postItem($activity, $item, $body);
        }
 
+       /**
+        * @brief 
+        *
+        * @param array $activity
+        * @param $body
+        */
        private static function likeItem($activity, $body)
        {
                $item = [];
@@ -1341,6 +1623,26 @@ 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 = [];
@@ -1352,6 +1654,13 @@ class ActivityPub
                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']?
@@ -1368,7 +1677,7 @@ class ActivityPub
                $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']));
@@ -1402,6 +1711,12 @@ class ActivityPub
                }
        }
 
+       /**
+        * @brief 
+        *
+        * @param $url
+        * @param $child
+        */
        private static function fetchMissingActivity($url, $child)
        {
                if (Config::get('system', 'ostatus_full_threads')) {
@@ -1429,20 +1744,15 @@ class ActivityPub
                logger('Activity ' . $url . ' had been fetched and processed.');
        }
 
-       private static function getUserOfObject($object)
-       {
-               $self = DBA::selectFirst('contact', ['uid'], ['nurl' => normalise_link($object), 'self' => true]);
-               if (!DBA::isResult($self)) {
-                       return false;
-               } else {
-                       return $self['uid'];
-               }
-       }
-
+       /**
+        * @brief perform a "follow" request
+        *
+        * @param array $activity
+        */
        private static function followUser($activity)
        {
                $actor = JsonLD::fetchElement($activity, 'object', 'id');
-               $uid = self::getUserOfObject($actor);
+               $uid = User::getIdForURL($actor);
                if (empty($uid)) {
                        return;
                }
@@ -1474,6 +1784,11 @@ 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'])) {
@@ -1481,13 +1796,44 @@ class ActivityPub
                }
 
                logger('Updating profile for ' . $activity['object']['id'], LOGGER_DEBUG);
-               APContact::getProfileByURL($activity['object']['id'], true);
+               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)
        {
                $actor = JsonLD::fetchElement($activity, 'object', 'actor');
-               $uid = self::getUserOfObject($actor);
+               $uid = User::getIdForURL($actor);
                if (empty($uid)) {
                        return;
                }
@@ -1512,6 +1858,40 @@ class ActivityPub
                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');
@@ -1532,10 +1912,15 @@ class ActivityPub
                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)
        {
                $object = JsonLD::fetchElement($activity, 'object', 'object');
-               $uid = self::getUserOfObject($object);
+               $uid = User::getIdForURL($object);
                if (empty($uid)) {
                        return;
                }