]> git.mxchange.org Git - friendica.git/blobdiff - src/Protocol/ActivityPub/Transmitter.php
Merge pull request #6565 from annando/ap-follow-note
[friendica.git] / src / Protocol / ActivityPub / Transmitter.php
index 7295408d83c7242822d3b48590202dd2427fa4eb..fa8bdc0439d997ec5009e95b76fa20f6691c311a 100644 (file)
@@ -6,6 +6,7 @@ namespace Friendica\Protocol\ActivityPub;
 
 use Friendica\BaseObject;
 use Friendica\Database\DBA;
+use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Util\HTTPSignature;
 use Friendica\Core\Protocol;
@@ -20,43 +21,36 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Util\JsonLD;
 use Friendica\Util\LDSignature;
 use Friendica\Model\Profile;
-use Friendica\Core\Config;
 use Friendica\Object\Image;
 use Friendica\Protocol\ActivityPub;
-use Friendica\Protocol\Diaspora;
 use Friendica\Core\Cache;
 use Friendica\Util\Map;
+use Friendica\Util\Network;
 
 require_once 'include/api.php';
+require_once 'mod/share.php';
 
 /**
  * @brief ActivityPub Transmitter Protocol class
  *
  * To-Do:
- *
- * Missing object types:
- * - Event
- *
- * Complicated object types:
  * - Undo Announce
- *
- * General:
- * - Queueing unsucessful deliveries
  */
 class Transmitter
 {
        /**
         * collects the lost of followers of the given owner
         *
-        * @param array $owner Owner array
-        * @param integer $page Page number
+        * @param array   $owner Owner array
+        * @param integer $page  Page number
         *
         * @return array of owners
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function getFollowers($owner, $page = null)
        {
                $condition = ['rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::NATIVE_SUPPORT, 'uid' => $owner['uid'],
-                       'self' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
+                       'self' => false, 'deleted' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
                $count = DBA::count('contact', $condition);
 
                $data = ['@context' => ActivityPub::CONTEXT];
@@ -95,15 +89,16 @@ class Transmitter
        /**
         * Create list of following contacts
         *
-        * @param array $owner Owner array
-        * @param integer $page Page numbe
+        * @param array   $owner Owner array
+        * @param integer $page  Page numbe
         *
         * @return array of following contacts
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        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];
+                       'self' => false, 'deleted' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
                $count = DBA::count('contact', $condition);
 
                $data = ['@context' => ActivityPub::CONTEXT];
@@ -142,10 +137,12 @@ class Transmitter
        /**
         * Public posts for the given owner
         *
-        * @param array $owner Owner array
-        * @param integer $page Page numbe
+        * @param array   $owner Owner array
+        * @param integer $page  Page numbe
         *
         * @return array of posts
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        public static function getOutbox($owner, $page = null)
        {
@@ -192,6 +189,7 @@ class Transmitter
         *
         * @param integer $uid User ID
         * @return array with profile data
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function getProfile($uid)
        {
@@ -234,7 +232,7 @@ class Transmitter
                        'vcard:region' => $profile['region'], 'vcard:locality' => $profile['locality']];
                $data['summary'] = $contact['about'];
                $data['url'] = $contact['url'];
-               $data['manuallyApprovesFollowers'] = in_array($user['page-flags'], [Contact::PAGE_NORMAL, Contact::PAGE_PRVGROUP]);
+               $data['manuallyApprovesFollowers'] = in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP]);
                $data['publicKey'] = ['id' => $contact['url'] . '#main-key',
                        'owner' => $contact['url'],
                        'publicKeyPem' => $user['pubkey']];
@@ -252,6 +250,8 @@ class Transmitter
         * @param array $item
         *
         * @return array with permissions
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        private static function fetchPermissionBlockFromConversation($item)
        {
@@ -289,9 +289,8 @@ class Transmitter
 
                        foreach ($activity[$element] as $receiver) {
                                if ($receiver == $profile['followers'] && !empty($item_profile['followers'])) {
-                                       $receiver = $item_profile['followers'];
-                               }
-                               if (!in_array($receiver, $exclude)) {
+                                       $permissions[$element][] = $item_profile['followers'];
+                               } elseif (!in_array($receiver, $exclude)) {
                                        $permissions[$element][] = $receiver;
                                }
                        }
@@ -302,31 +301,50 @@ class Transmitter
        /**
         * Creates an array of permissions from an item thread
         *
-        * @param array $item
+        * @param array   $item
+        * @param boolean $blindcopy
+        * @param boolean $last_id
         *
         * @return array with permission data
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
-       private static function createPermissionBlockForItem($item)
+       private static function createPermissionBlockForItem($item, $blindcopy, $last_id = 0)
        {
+               if ($last_id == 0) {
+                       $last_id = $item['id'];
+               }
+
+               $always_bcc = false;
+
+               // Check if we should always deliver our stuff via BCC
+               if (!empty($item['uid'])) {
+                       $profile = Profile::getByUID($item['uid']);
+                       if (!empty($profile)) {
+                               $always_bcc = $profile['hide-friends'];
+                       }
+               }
+
                // Will be activated in a later step
                // $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS];
 
                // For now only send to these contacts:
                $networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS];
 
-               $data = ['to' => [], 'cc' => []];
-
-               $data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
+               $data = ['to' => [], 'cc' => [], 'bcc' => []];
 
-               $actor_profile = APContact::getByURL($item['author-link']);
+               if ($item['gravity'] == GRAVITY_PARENT) {
+                       $actor_profile = APContact::getByURL($item['owner-link']);
+               } else {
+                       $actor_profile = APContact::getByURL($item['author-link']);
+               }
 
                $terms = Term::tagArrayFromItemId($item['id'], TERM_MENTION);
 
                if (!$item['private']) {
+                       $data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
+
                        $data['to'][] = ActivityPub::PUBLIC_COLLECTION;
-                       if (!empty($actor_profile['followers'])) {
-                               $data['cc'][] = $actor_profile['followers'];
-                       }
 
                        foreach ($terms as $term) {
                                $profile = APContact::getByURL($term['url'], false);
@@ -337,8 +355,6 @@ class Transmitter
                } else {
                        $receiver_list = Item::enumeratePermissions($item);
 
-                       $mentioned = [];
-
                        foreach ($terms as $term) {
                                $cid = Contact::getIdForURL($term['url'], $item['uid']);
                                if (!empty($cid) && in_array($cid, $receiver_list)) {
@@ -350,42 +366,61 @@ class Transmitter
                        }
 
                        foreach ($receiver_list as $receiver) {
-                               $contact = DBA::selectFirst('contact', ['url'], ['id' => $receiver, 'network' => $networks]);
+                               $contact = DBA::selectFirst('contact', ['url', 'hidden'], ['id' => $receiver, 'network' => $networks]);
                                if (DBA::isResult($contact) && !empty($profile = APContact::getByURL($contact['url'], false))) {
-                                       $data['cc'][] = $profile['url'];
+                                       if ($contact['hidden'] || $always_bcc) {
+                                               $data['bcc'][] = $profile['url'];
+                                       } else {
+                                               $data['cc'][] = $profile['url'];
+                                       }
                                }
                        }
                }
 
                $parents = Item::select(['id', 'author-link', 'owner-link', 'gravity', 'uri'], ['parent' => $item['parent']]);
                while ($parent = Item::fetch($parents)) {
+                       if ($parent['gravity'] == GRAVITY_PARENT) {
+                               $profile = APContact::getByURL($parent['owner-link'], false);
+                               if (!empty($profile)) {
+                                       if ($item['gravity'] != GRAVITY_PARENT) {
+                                               // Comments to forums are directed to the forum
+                                               // But comments to forums aren't directed to the followers collection
+                                               if ($profile['type'] == 'Group') {
+                                                       $data['to'][] = $profile['url'];
+                                               } else {
+                                                       $data['cc'][] = $profile['url'];
+                                                       if (!$item['private']) {
+                                                               $data['cc'][] = $actor_profile['followers'];
+                                                       }
+                                               }
+                                       } else {
+                                               // Public thread parent post always are directed to the followes
+                                               if (!$item['private']) {
+                                                       $data['cc'][] = $actor_profile['followers'];
+                                               }
+                                       }
+                               }
+                       }
+
                        // Don't include data from future posts
-                       if ($parent['id'] >= $item['id']) {
+                       if ($parent['id'] >= $last_id) {
                                continue;
                        }
 
                        $profile = APContact::getByURL($parent['author-link'], false);
                        if (!empty($profile)) {
-                               if ($parent['uri'] == $item['thr-parent']) {
+                               if (($profile['type'] == 'Group') || ($parent['uri'] == $item['thr-parent'])) {
                                        $data['to'][] = $profile['url'];
                                } else {
                                        $data['cc'][] = $profile['url'];
                                }
                        }
-
-                       if ($item['gravity'] != GRAVITY_PARENT) {
-                               continue;
-                       }
-
-                       $profile = APContact::getByURL($parent['owner-link'], false);
-                       if (!empty($profile)) {
-                               $data['cc'][] = $profile['url'];
-                       }
                }
                DBA::close($parents);
 
                $data['to'] = array_unique($data['to']);
                $data['cc'] = array_unique($data['cc']);
+               $data['bcc'] = array_unique($data['bcc']);
 
                if (($key = array_search($item['author-link'], $data['to'])) !== false) {
                        unset($data['to'][$key]);
@@ -395,22 +430,44 @@ class Transmitter
                        unset($data['cc'][$key]);
                }
 
+               if (($key = array_search($item['author-link'], $data['bcc'])) !== false) {
+                       unset($data['bcc'][$key]);
+               }
+
                foreach ($data['to'] as $to) {
                        if (($key = array_search($to, $data['cc'])) !== false) {
                                unset($data['cc'][$key]);
                        }
+
+                       if (($key = array_search($to, $data['bcc'])) !== false) {
+                               unset($data['bcc'][$key]);
+                       }
+               }
+
+               foreach ($data['cc'] as $cc) {
+                       if (($key = array_search($cc, $data['bcc'])) !== false) {
+                               unset($data['bcc'][$key]);
+                       }
                }
 
-               return ['to' => array_values($data['to']), 'cc' => array_values($data['cc'])];
+               $receivers = ['to' => array_values($data['to']), 'cc' => array_values($data['cc']), 'bcc' => array_values($data['bcc'])];
+
+               if (!$blindcopy) {
+                       unset($receivers['bcc']);
+               }
+
+               return $receivers;
        }
 
        /**
         * Fetches a list of inboxes of followers of a given user
         *
-        * @param integer $uid User ID
+        * @param integer $uid      User ID
         * @param boolean $personal fetch personal inboxes
         *
         * @return array of follower inboxes
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        public static function fetchTargetInboxesforUser($uid, $personal = false)
        {
@@ -430,6 +487,10 @@ class Transmitter
 
                $contacts = DBA::select('contact', ['url'], $condition);
                while ($contact = DBA::fetch($contacts)) {
+                       if (Network::isUrlBlocked($contact['url'])) {
+                               continue;
+                       }
+
                        $profile = APContact::getByURL($contact['url'], false);
                        if (!empty($profile)) {
                                if (empty($profile['sharedinbox']) || $personal) {
@@ -448,15 +509,18 @@ class Transmitter
        /**
         * Fetches an array of inboxes for the given item and user
         *
-        * @param array $item
-        * @param integer $uid User ID
+        * @param array   $item
+        * @param integer $uid      User ID
         * @param boolean $personal fetch personal inboxes
+        * @param integer $last_id Last item id for adding receivers
         *
         * @return array with inboxes
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
-       public static function fetchTargetInboxes($item, $uid, $personal = false)
+       public static function fetchTargetInboxes($item, $uid, $personal = false, $last_id = 0)
        {
-               $permissions = self::createPermissionBlockForItem($item);
+               $permissions = self::createPermissionBlockForItem($item, true, $last_id);
                if (empty($permissions)) {
                        return [];
                }
@@ -474,13 +538,19 @@ class Transmitter
                                continue;
                        }
 
+                       $blindcopy = in_array($element, ['bto', 'bcc']);
+
                        foreach ($permissions[$element] as $receiver) {
+                               if (Network::isUrlBlocked($receiver)) {
+                                       continue;
+                               }
+
                                if ($receiver == $item_profile['followers']) {
                                        $inboxes = array_merge($inboxes, self::fetchTargetInboxesforUser($uid, $personal));
                                } else {
                                        $profile = APContact::getByURL($receiver, false);
                                        if (!empty($profile)) {
-                                               if (empty($profile['sharedinbox']) || $personal) {
+                                               if (empty($profile['sharedinbox']) || $personal || $blindcopy) {
                                                        $target = $profile['inbox'];
                                                } else {
                                                        $target = $profile['sharedinbox'];
@@ -500,10 +570,20 @@ class Transmitter
         * @param array $item
         *
         * @return string with activity type
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        private static function getTypeOfItem($item)
        {
-               if (!empty(Diaspora::isReshare($item['body'], false))) {
+               $reshared = false;
+
+               // Only check for a reshare, if it is a real reshare and no quoted reshare
+               if (strpos($item['body'], "[share") === 0) {
+                       $announce = api_share_as_retweet($item);
+                       $reshared = !empty($announce['plink']);
+               }
+
+               if ($reshared) {
                        $type = 'Announce';
                } elseif ($item['verb'] == ACTIVITY_POST) {
                        if ($item['created'] == $item['edited']) {
@@ -521,6 +601,8 @@ class Transmitter
                        $type = 'Reject';
                } elseif ($item['verb'] == ACTIVITY_ATTENDMAYBE) {
                        $type = 'TentativeAccept';
+               } elseif ($item['verb'] == ACTIVITY_FOLLOW) {
+                       $type = 'Follow';
                } else {
                        $type = '';
                }
@@ -532,15 +614,20 @@ class Transmitter
         * Creates the activity or fetches it from the cache
         *
         * @param integer $item_id
+        * @param boolean $force Force new cache entry
         *
         * @return array with the activity
+        * @throws \Exception
         */
-       public static function createCachedActivityFromItem($item_id)
+       public static function createCachedActivityFromItem($item_id, $force = false)
        {
                $cachekey = 'APDelivery:createActivity:' . $item_id;
-               $data = Cache::get($cachekey);
-               if (!is_null($data)) {
-                       return $data;
+
+               if (!$force) {
+                       $data = Cache::get($cachekey);
+                       if (!is_null($data)) {
+                               return $data;
+                       }
                }
 
                $data = ActivityPub\Transmitter::createActivityFromItem($item_id);
@@ -556,6 +643,7 @@ class Transmitter
         * @param boolean $object_mode Is the activity item is used inside another object?
         *
         * @return array of activity
+        * @throws \Exception
         */
        public static function createActivityFromItem($item_id, $object_mode = false)
        {
@@ -565,16 +653,29 @@ class Transmitter
                        return false;
                }
 
-               $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;
+               if ($item['wall']) {
+                       $owner = User::getOwnerDataById($item['uid']);
+                       if (($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) && ($item['author-link'] != $owner['url'])) {
+                               $type = 'Announce';
+
+                               // Disguise forum posts as reshares. Will later be converted to a real announce
+                               $item['body'] = share_header($item['author-name'], $item['author-link'], $item['author-avatar'],
+                                       $item['guid'], $item['created'], $item['plink']) . $item['body'] . '[/share]';
                        }
                }
 
-               $type = self::getTypeOfItem($item);
+               if (empty($type)) {
+                       $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;
+                               }
+                       }
+
+                       $type = self::getTypeOfItem($item);
+               }
 
                if (!$object_mode) {
                        $data = ['@context' => ActivityPub::CONTEXT];
@@ -596,22 +697,33 @@ class Transmitter
 
                $data['instrument'] = ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()];
 
-               $data = array_merge($data, self::createPermissionBlockForItem($item));
+               $data = array_merge($data, self::createPermissionBlockForItem($item, false));
 
                if (in_array($data['type'], ['Create', 'Update', 'Delete'])) {
                        $data['object'] = self::createNote($item);
                } elseif ($data['type'] == 'Announce') {
-                       $data['object'] = self::createAnnounce($item);
+                       $data = self::createAnnounce($item, $data);
+               } elseif ($data['type'] == 'Follow') {
+                       $data['object'] = $item['parent-uri'];
                } elseif ($data['type'] == 'Undo') {
                        $data['object'] = self::createActivityFromItem($item_id, true);
                } else {
                        $data['diaspora:guid'] = $item['guid'];
+                       if (!empty($item['signed_text'])) {
+                               $data['diaspora:like'] = $item['signed_text'];
+                       }
                        $data['object'] = $item['thr-parent'];
                }
 
-               $owner = User::getOwnerDataById($item['uid']);
+               if (!empty($item['contact-uid'])) {
+                       $uid = $item['contact-uid'];
+               } else {
+                       $uid = $item['uid'];
+               }
 
-               if (!$object_mode) {
+               $owner = User::getOwnerDataById($uid);
+
+               if (!$object_mode && !empty($owner)) {
                        return LDSignature::sign($data, $owner);
                } else {
                        return $data;
@@ -626,6 +738,8 @@ class Transmitter
         * @param integer $item_id
         *
         * @return array with the object data
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        public static function createObjectFromItemID($item_id)
        {
@@ -681,6 +795,7 @@ class Transmitter
         * @param array $item
         *
         * @return array of tags
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        private static function createTagList($item)
        {
@@ -689,7 +804,8 @@ class Transmitter
                $terms = Term::tagArrayFromItemId($item['id']);
                foreach ($terms as $term) {
                        if ($term['type'] == TERM_HASHTAG) {
-                               $tags[] = ['type' => 'Hashtag', 'href' => $term['url'], 'name' => '#' . $term['term']];
+                               $url = System::baseUrl() . '/search?tag=' . urlencode($term['term']);
+                               $tags[] = ['type' => 'Hashtag', 'href' => $url, 'name' => '#' . $term['term']];
                        } elseif ($term['type'] == TERM_MENTION) {
                                $contact = Contact::getDetailsByURL($term['url']);
                                if (!empty($contact['addr'])) {
@@ -707,10 +823,11 @@ class Transmitter
        /**
         * Adds attachment data to the JSON document
         *
-        * @param array $item Data of the item that is to be posted
-        * @param text $type Object type
+        * @param array  $item Data of the item that is to be posted
+        * @param string $type Object type
         *
         * @return array with attachment data
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        private static function createAttachmentList($item, $type)
        {
@@ -759,11 +876,12 @@ class Transmitter
                return $attachments;
        }
 
-        /**
+       /**
         * @brief Callback function to replace a Friendica style mention in a mention that is used on AP
         *
         * @param array $match Matching values for the callback
         * @return string Replaced mention
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        private static function mentionCallback($match)
        {
@@ -803,6 +921,7 @@ class Transmitter
         * @param array $item
         *
         * @return string with context url
+        * @throws \Exception
         */
        private static function fetchContextURLForItem($item)
        {
@@ -823,6 +942,7 @@ class Transmitter
         * @param integer $item_id
         *
         * @return boolean
+        * @throws \Exception
         */
        private static function isSensitive($item_id)
        {
@@ -830,16 +950,47 @@ class Transmitter
                return DBA::exists('term', $condition);
        }
 
+       /**
+        * Creates event data
+        *
+        * @param array $item
+        *
+        * @return array with the event data
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
+       public static function createEvent($item)
+       {
+               $event = [];
+               $event['name'] = $item['event-summary'];
+               $event['content'] = BBCode::convert($item['event-desc'], false, 7);
+               $event['startTime'] = DateTimeFormat::utc($item['event-start'] . '+00:00', DateTimeFormat::ATOM);
+
+               if (!$item['event-nofinish']) {
+                       $event['endTime'] = DateTimeFormat::utc($item['event-finish'] . '+00:00', DateTimeFormat::ATOM);
+               }
+
+               if (!empty($item['event-location'])) {
+                       $item['location'] = $item['event-location'];
+                       $event['location'] = self::createLocation($item);
+               }
+
+               return $event;
+       }
+
        /**
         * Creates a note/article object array
         *
         * @param array $item
         *
         * @return array with the object data
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        public static function createNote($item)
        {
-               if (!empty($item['title'])) {
+               if ($item['event-type'] == 'event') {
+                       $type = 'Event';
+               } elseif (!empty($item['title'])) {
                        $type = 'Article';
                } else {
                        $type = 'Note';
@@ -887,10 +1038,15 @@ class Transmitter
                        $body = self::removePictures($body);
                }
 
-               $regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
-               $body = preg_replace_callback($regexp, ['self', 'mentionCallback'], $body);
+               if ($type == 'Event') {
+                       $data = array_merge($data, self::createEvent($item));
+               } else {
+                       $regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
+                       $body = preg_replace_callback($regexp, ['self', 'mentionCallback'], $body);
+
+                       $data['content'] = BBCode::convert($body, false, 7);
+               }
 
-               $data['content'] = BBCode::convert($body, false, 7);
                $data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];
 
                if (!empty($item['signed_text']) && ($item['uri'] != $item['thr-parent'])) {
@@ -900,7 +1056,7 @@ class Transmitter
                $data['attachment'] = self::createAttachmentList($item, $type);
                $data['tag'] = self::createTagList($item);
 
-               if (!empty($item['coord']) || !empty($item['location'])) {
+               if (empty($data['location']) && (!empty($item['coord']) || !empty($item['location']))) {
                        $data['location'] = self::createLocation($item);
                }
 
@@ -908,7 +1064,7 @@ class Transmitter
                        $data['generator'] = ['type' => 'Application', 'name' => $item['app']];
                }
 
-               $data = array_merge($data, self::createPermissionBlockForItem($item));
+               $data = array_merge($data, self::createPermissionBlockForItem($item, false));
 
                return $data;
        }
@@ -917,34 +1073,73 @@ class Transmitter
         * Creates an announce object entry
         *
         * @param array $item
+        * @param array $data activity data
         *
-        * @return string with announced object url
+        * @return array with activity data
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
-       public static function createAnnounce($item)
+       private static function createAnnounce($item, $data)
        {
                $announce = api_share_as_retweet($item);
                if (empty($announce['plink'])) {
-                       return self::createNote($item);
+                       $data['type'] = 'Create';
+                       $data['object'] = self::createNote($item);
+                       return $data;
+               }
+
+               // Fetch the original id of the object
+               $activity = ActivityPub::fetchContent($announce['plink'], $item['uid']);
+               if (!empty($activity)) {
+                       $ldactivity = JsonLD::compact($activity);
+                       $id = JsonLD::fetchElement($ldactivity, '@id');
+                       if (!empty($id)) {
+                               $data['object'] = $id;
+                               return $data;
+                       }
+               }
+
+               $data['type'] = 'Create';
+               $data['object'] = self::createNote($item);
+               return $data;
+       }
+
+       /**
+        * Creates an activity id for a given contact id
+        *
+        * @param integer $cid Contact ID of target
+        *
+        * @return bool|string activity id
+        */
+       public static function activityIDFromContact($cid)
+       {
+               $contact = DBA::selectFirst('contact', ['uid', 'id', 'created'], ['id' => $cid]);
+               if (!DBA::isResult($contact)) {
+                       return false;
                }
 
-               return $announce['plink'];
+               $hash = hash('ripemd128', $contact['uid'].'-'.$contact['id'].'-'.$contact['created']);
+               $uuid = substr($hash, 0, 8). '-' . substr($hash, 8, 4) . '-' . substr($hash, 12, 4) . '-' . substr($hash, 16, 4) . '-' . substr($hash, 20, 12);
+               return System::baseUrl() . '/activity/' . $uuid;
        }
 
        /**
         * Transmits a contact suggestion to a given inbox
         *
-        * @param integer $uid User ID
-        * @param string $inbox Target inbox
+        * @param integer $uid           User ID
+        * @param string  $inbox         Target inbox
         * @param integer $suggestion_id Suggestion ID
+        *
+        * @return boolean was the transmission successful?
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function sendContactSuggestion($uid, $inbox, $suggestion_id)
        {
                $owner = User::getOwnerDataById($uid);
-               $profile = APContact::getByURL($owner['url']);
 
                $suggestion = DBA::selectFirst('fsuggest', ['url', 'note', 'created'], ['id' => $suggestion_id]);
 
-               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+               $data = ['@context' => ActivityPub::CONTEXT,
                        'id' => System::baseUrl() . '/activity/' . System::createGUID(),
                        'type' => 'Announce',
                        'actor' => $owner['url'],
@@ -956,22 +1151,53 @@ class Transmitter
 
                $signed = LDSignature::sign($data, $owner);
 
-               logger('Deliver profile deletion for user ' . $uid . ' to ' . $inbox . ' via ActivityPub', LOGGER_DEBUG);
-               HTTPSignature::transmit($signed, $inbox, $uid);
+               Logger::log('Deliver profile deletion for user ' . $uid . ' to ' . $inbox . ' via ActivityPub', Logger::DEBUG);
+               return HTTPSignature::transmit($signed, $inbox, $uid);
+       }
+
+       /**
+        * Transmits a profile relocation to a given inbox
+        *
+        * @param integer $uid   User ID
+        * @param string  $inbox Target inbox
+        *
+        * @return boolean was the transmission successful?
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
+       public static function sendProfileRelocation($uid, $inbox)
+       {
+               $owner = User::getOwnerDataById($uid);
+
+               $data = ['@context' => ActivityPub::CONTEXT,
+                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+                       'type' => 'dfrn:relocate',
+                       'actor' => $owner['url'],
+                       'object' => $owner['url'],
+                       'published' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
+                       'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
+                       'to' => [ActivityPub::PUBLIC_COLLECTION],
+                       'cc' => []];
+
+               $signed = LDSignature::sign($data, $owner);
+
+               Logger::log('Deliver profile relocation for user ' . $uid . ' to ' . $inbox . ' via ActivityPub', Logger::DEBUG);
+               return HTTPSignature::transmit($signed, $inbox, $uid);
        }
 
        /**
         * Transmits a profile deletion to a given inbox
         *
-        * @param integer $uid User ID
-        * @param string $inbox Target inbox
+        * @param integer $uid   User ID
+        * @param string  $inbox Target inbox
+        *
+        * @return boolean was the transmission successful?
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function sendProfileDeletion($uid, $inbox)
        {
                $owner = User::getOwnerDataById($uid);
-               $profile = APContact::getByURL($owner['url']);
 
-               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+               $data = ['@context' => ActivityPub::CONTEXT,
                        'id' => System::baseUrl() . '/activity/' . System::createGUID(),
                        'type' => 'Delete',
                        'actor' => $owner['url'],
@@ -983,22 +1209,26 @@ class Transmitter
 
                $signed = LDSignature::sign($data, $owner);
 
-               logger('Deliver profile deletion for user ' . $uid . ' to ' . $inbox . ' via ActivityPub', LOGGER_DEBUG);
-               HTTPSignature::transmit($signed, $inbox, $uid);
+               Logger::log('Deliver profile deletion for user ' . $uid . ' to ' . $inbox . ' via ActivityPub', Logger::DEBUG);
+               return HTTPSignature::transmit($signed, $inbox, $uid);
        }
 
        /**
         * Transmits a profile change to a given inbox
         *
-        * @param integer $uid User ID
-        * @param string $inbox Target inbox
+        * @param integer $uid   User ID
+        * @param string  $inbox Target inbox
+        *
+        * @return boolean was the transmission successful?
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        public static function sendProfileUpdate($uid, $inbox)
        {
                $owner = User::getOwnerDataById($uid);
                $profile = APContact::getByURL($owner['url']);
 
-               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+               $data = ['@context' => ActivityPub::CONTEXT,
                        'id' => System::baseUrl() . '/activity/' . System::createGUID(),
                        'type' => 'Update',
                        'actor' => $owner['url'],
@@ -1010,50 +1240,92 @@ class Transmitter
 
                $signed = LDSignature::sign($data, $owner);
 
-               logger('Deliver profile update for user ' . $uid . ' to ' . $inbox . ' via ActivityPub', LOGGER_DEBUG);
-               HTTPSignature::transmit($signed, $inbox, $uid);
+               Logger::log('Deliver profile update for user ' . $uid . ' to ' . $inbox . ' via ActivityPub', Logger::DEBUG);
+               return HTTPSignature::transmit($signed, $inbox, $uid);
        }
 
        /**
         * Transmits a given activity to a target
         *
-        * @param array $activity
-        * @param string $target Target profile
-        * @param integer $uid User ID
+        * @param string  $activity Type name
+        * @param string  $target   Target profile
+        * @param integer $uid      User ID
+        * @return bool
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
+        * @throws \Exception
         */
-       public static function sendActivity($activity, $target, $uid)
+       public static function sendActivity($activity, $target, $uid, $id = '')
        {
                $profile = APContact::getByURL($target);
 
                $owner = User::getOwnerDataById($uid);
 
-               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
-                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+               if (empty($id)) {
+                       $id = System::baseUrl() . '/activity/' . System::createGUID();
+               }
+
+               $data = ['@context' => ActivityPub::CONTEXT,
+                       'id' => $id,
                        'type' => $activity,
                        'actor' => $owner['url'],
                        'object' => $profile['url'],
                        'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
-                       'to' => $profile['url']];
+                       'to' => [$profile['url']]];
 
-               logger('Sending activity ' . $activity . ' to ' . $target . ' for user ' . $uid, LOGGER_DEBUG);
+               Logger::log('Sending activity ' . $activity . ' to ' . $target . ' for user ' . $uid, Logger::DEBUG);
 
                $signed = LDSignature::sign($data, $owner);
-               HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+               return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+       }
+
+       /**
+        * Transmits a "follow object" activity to a target
+        * This is a preparation for sending automated "follow" requests when receiving "Announce" messages
+        *
+        * @param string  $object Object URL
+        * @param string  $target Target profile
+        * @param integer $uid    User ID
+        * @return bool
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
+        * @throws \Exception
+        */
+       public static function sendFollowObject($object, $target, $uid)
+       {
+               $profile = APContact::getByURL($target);
+
+               $owner = User::getOwnerDataById($uid);
+
+               $data = ['@context' => ActivityPub::CONTEXT,
+                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+                       'type' => 'Follow',
+                       'actor' => $owner['url'],
+                       'object' => $object,
+                       'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
+                       'to' => [$profile['url']]];
+
+               Logger::log('Sending follow ' . $object . ' to ' . $target . ' for user ' . $uid, Logger::DEBUG);
+
+               $signed = LDSignature::sign($data, $owner);
+               return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
        }
 
        /**
         * Transmit a message that the contact request had been accepted
         *
-        * @param string $target Target profile
-        * @param $id
-        * @param integer $uid User ID
+        * @param string  $target Target profile
+        * @param         $id
+        * @param integer $uid    User ID
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        public static function sendContactAccept($target, $id, $uid)
        {
                $profile = APContact::getByURL($target);
 
                $owner = User::getOwnerDataById($uid);
-               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+               $data = ['@context' => ActivityPub::CONTEXT,
                        'id' => System::baseUrl() . '/activity/' . System::createGUID(),
                        'type' => 'Accept',
                        'actor' => $owner['url'],
@@ -1061,9 +1333,9 @@ class Transmitter
                                'actor' => $profile['url'],
                                'object' => $owner['url']],
                        'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
-                       'to' => $profile['url']];
+                       'to' => [$profile['url']]];
 
-               logger('Sending accept to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
+               Logger::log('Sending accept to ' . $target . ' for user ' . $uid . ' with id ' . $id, Logger::DEBUG);
 
                $signed = LDSignature::sign($data, $owner);
                HTTPSignature::transmit($signed, $profile['inbox'], $uid);
@@ -1072,16 +1344,18 @@ class Transmitter
        /**
         * Reject a contact request or terminates the contact relation
         *
-        * @param string $target Target profile
-        * @param $id
-        * @param integer $uid User ID
+        * @param string  $target Target profile
+        * @param         $id
+        * @param integer $uid    User ID
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        public static function sendContactReject($target, $id, $uid)
        {
                $profile = APContact::getByURL($target);
 
                $owner = User::getOwnerDataById($uid);
-               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+               $data = ['@context' => ActivityPub::CONTEXT,
                        'id' => System::baseUrl() . '/activity/' . System::createGUID(),
                        'type' => 'Reject',
                        'actor' => $owner['url'],
@@ -1089,9 +1363,9 @@ class Transmitter
                                'actor' => $profile['url'],
                                'object' => $owner['url']],
                        'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
-                       'to' => $profile['url']];
+                       'to' => [$profile['url']]];
 
-               logger('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
+               Logger::log('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $id, Logger::DEBUG);
 
                $signed = LDSignature::sign($data, $owner);
                HTTPSignature::transmit($signed, $profile['inbox'], $uid);
@@ -1100,27 +1374,35 @@ class Transmitter
        /**
         * Transmits a message that we don't want to follow this contact anymore
         *
-        * @param string $target Target profile
-        * @param integer $uid User ID
+        * @param string  $target Target profile
+        * @param integer $uid    User ID
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
+        * @throws \Exception
         */
-       public static function sendContactUndo($target, $uid)
+       public static function sendContactUndo($target, $cid, $uid)
        {
                $profile = APContact::getByURL($target);
 
+               $object_id = self::activityIDFromContact($cid);
+               if (empty($object_id)) {
+                       return;
+               }
+
                $id = System::baseUrl() . '/activity/' . System::createGUID();
 
                $owner = User::getOwnerDataById($uid);
-               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+               $data = ['@context' => ActivityPub::CONTEXT,
                        'id' => $id,
                        'type' => 'Undo',
                        'actor' => $owner['url'],
-                       'object' => ['id' => $id, 'type' => 'Follow',
+                       'object' => ['id' => $object_id, 'type' => 'Follow',
                                'actor' => $owner['url'],
                                'object' => $profile['url']],
                        'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
-                       'to' => $profile['url']];
+                       'to' => [$profile['url']]];
 
-               logger('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
+               Logger::log('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $id, Logger::DEBUG);
 
                $signed = LDSignature::sign($data, $owner);
                HTTPSignature::transmit($signed, $profile['inbox'], $uid);