]> git.mxchange.org Git - friendica.git/blobdiff - src/Protocol/ActivityPub/Transmitter.php
Merge pull request #8909 from MrPetovan/task/ex_auth
[friendica.git] / src / Protocol / ActivityPub / Transmitter.php
index a7be1e9c5294b399fdb811d2dcaf526e21162aa8..259c8c225181a5f29cc67ee18f4c09747557bad9 100644 (file)
@@ -1,26 +1,43 @@
 <?php
 /**
- * @file src/Protocol/ActivityPub/Transmitter.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Protocol\ActivityPub;
 
-use Friendica\BaseObject;
 use Friendica\Content\Feature;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Plaintext;
-use Friendica\Core\Cache;
-use Friendica\Core\Config;
+use Friendica\Core\Cache\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\Item;
+use Friendica\Model\ItemURI;
 use Friendica\Model\Profile;
 use Friendica\Model\Photo;
-use Friendica\Model\Term;
+use Friendica\Model\Tag;
 use Friendica\Model\User;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
@@ -37,81 +54,50 @@ require_once 'include/api.php';
 require_once 'mod/share.php';
 
 /**
- * @brief ActivityPub Transmitter Protocol class
+ * ActivityPub Transmitter Protocol class
  *
  * To-Do:
- * - Undo Announce
+ * @todo Undo Announce
  */
 class Transmitter
 {
        /**
-        * collects the lost of followers of the given owner
+        * Collects a list of contacts of the given owner
         *
-        * @param array   $owner Owner array
-        * @param integer $page  Page number
+        * @param array     $owner  Owner array
+        * @param int|array $rel    The relevant value(s) contact.rel should match
+        * @param string    $module The name of the relevant AP endpoint module (followers|following)
+        * @param integer   $page   Page number
         *
         * @return array of owners
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \Exception
         */
-       public static function getFollowers($owner, $page = null)
+       public static function getContacts($owner, $rel, $module, $page = null)
        {
-               $condition = ['rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::NATIVE_SUPPORT, 'uid' => $owner['uid'],
-                       'self' => false, 'deleted' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
-               $count = DBA::count('contact', $condition);
-
-               $data = ['@context' => ActivityPub::CONTEXT];
-               $data['id'] = System::baseUrl() . '/followers/' . $owner['nickname'];
-               $data['type'] = 'OrderedCollection';
-               $data['totalItems'] = $count;
-
-               // When we hide our friends we will only show the pure number but don't allow more.
-               $profile = Profile::getByUID($owner['uid']);
-               if (!empty($profile['hide-friends'])) {
-                       return $data;
-               }
-
-               if (empty($page)) {
-                       $data['first'] = System::baseUrl() . '/followers/' . $owner['nickname'] . '?page=1';
-               } else {
-                       $data['type'] = 'OrderedCollectionPage';
-                       $list = [];
-
-                       $contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
-                       while ($contact = DBA::fetch($contacts)) {
-                               $list[] = $contact['url'];
-                       }
-
-                       if (!empty($list)) {
-                               $data['next'] = System::baseUrl() . '/followers/' . $owner['nickname'] . '?page=' . ($page + 1);
-                       }
+               $parameters = [
+                       'rel' => $rel,
+                       'uid' => $owner['uid'],
+                       'self' => false,
+                       'deleted' => false,
+                       'hidden' => false,
+                       'archive' => false,
+                       'pending' => false
+               ];
+               $condition = DBA::buildCondition($parameters);
 
-                       $data['partOf'] = System::baseUrl() . '/followers/' . $owner['nickname'];
+               $sql = "SELECT COUNT(*) as `count`
+                       FROM `contact`
+                       JOIN `apcontact` ON `apcontact`.`url` = `contact`.`url`
+                       " . $condition;
 
-                       $data['orderedItems'] = $list;
-               }
-
-               return $data;
-       }
+               $contacts = DBA::fetchFirst($sql, ...$parameters);
 
-       /**
-        * Create list of following contacts
-        *
-        * @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, 'deleted' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
-               $count = DBA::count('contact', $condition);
+               $modulePath = '/' . $module . '/';
 
                $data = ['@context' => ActivityPub::CONTEXT];
-               $data['id'] = System::baseUrl() . '/following/' . $owner['nickname'];
+               $data['id'] = DI::baseUrl() . $modulePath . $owner['nickname'];
                $data['type'] = 'OrderedCollection';
-               $data['totalItems'] = $count;
+               $data['totalItems'] = $contacts['count'];
 
                // When we hide our friends we will only show the pure number but don't allow more.
                $profile = Profile::getByUID($owner['uid']);
@@ -120,21 +106,31 @@ class Transmitter
                }
 
                if (empty($page)) {
-                       $data['first'] = System::baseUrl() . '/following/' . $owner['nickname'] . '?page=1';
+                       $data['first'] = DI::baseUrl() . $modulePath . $owner['nickname'] . '?page=1';
                } else {
                        $data['type'] = 'OrderedCollectionPage';
                        $list = [];
 
-                       $contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
+                       $sql = "SELECT `contact`.`url`
+                               FROM `contact`
+                               JOIN `apcontact` ON `apcontact`.`url` = `contact`.`url`
+                               " . $condition . "
+                               LIMIT ?, ?";
+
+                       $parameters[] = ($page - 1) * 100;
+                       $parameters[] = 100;
+
+                       $contacts = DBA::p($sql, ...$parameters);
                        while ($contact = DBA::fetch($contacts)) {
                                $list[] = $contact['url'];
                        }
+                       DBA::close($contacts);
 
                        if (!empty($list)) {
-                               $data['next'] = System::baseUrl() . '/following/' . $owner['nickname'] . '?page=' . ($page + 1);
+                               $data['next'] = DI::baseUrl() . $modulePath . $owner['nickname'] . '?page=' . ($page + 1);
                        }
 
-                       $data['partOf'] = System::baseUrl() . '/following/' . $owner['nickname'];
+                       $data['partOf'] = DI::baseUrl() . $modulePath . $owner['nickname'];
 
                        $data['orderedItems'] = $list;
                }
@@ -154,20 +150,20 @@ class Transmitter
         */
        public static function getOutbox($owner, $page = null)
        {
-               $public_contact = Contact::getIdForURL($owner['url'], 0, true);
+               $public_contact = Contact::getIdForURL($owner['url']);
 
                $condition = ['uid' => 0, 'contact-id' => $public_contact, 'author-id' => $public_contact,
-                       'private' => false, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT],
+                       'private' => [Item::PUBLIC, Item::UNLISTED], 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT],
                        'deleted' => false, 'visible' => true, 'moderated' => false];
                $count = DBA::count('item', $condition);
 
                $data = ['@context' => ActivityPub::CONTEXT];
-               $data['id'] = System::baseUrl() . '/outbox/' . $owner['nickname'];
+               $data['id'] = DI::baseUrl() . '/outbox/' . $owner['nickname'];
                $data['type'] = 'OrderedCollection';
                $data['totalItems'] = $count;
 
                if (empty($page)) {
-                       $data['first'] = System::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=1';
+                       $data['first'] = DI::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=1';
                } else {
                        $data['type'] = 'OrderedCollectionPage';
                        $list = [];
@@ -176,16 +172,20 @@ class Transmitter
 
                        $items = Item::select(['id'], $condition, ['limit' => [($page - 1) * 20, 20], 'order' => ['created' => true]]);
                        while ($item = Item::fetch($items)) {
-                               $object = self::createObjectFromItemID($item['id']);
-                               unset($object['@context']);
-                               $list[] = $object;
+                               $activity = self::createActivityFromItem($item['id'], true);
+                               $activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type'];
+
+                               // Only list "Create" activity objects here, no reshares
+                               if (!empty($activity['object']) && ($activity['type'] == 'Create')) {
+                                       $list[] = $activity['object'];
+                               }
                        }
 
                        if (!empty($list)) {
-                               $data['next'] = System::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=' . ($page + 1);
+                               $data['next'] = DI::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=' . ($page + 1);
                        }
 
-                       $data['partOf'] = System::baseUrl() . '/outbox/' . $owner['nickname'];
+                       $data['partOf'] = DI::baseUrl() . '/outbox/' . $owner['nickname'];
 
                        $data['orderedItems'] = $list;
                }
@@ -202,7 +202,7 @@ class Transmitter
        {
                return ['type' => 'Service',
                        'name' =>  FRIENDICA_PLATFORM . " '" . FRIENDICA_CODENAME . "' " . FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION,
-                       'url' => BaseObject::getApp()->getBaseURL()];
+                       'url' => DI::baseUrl()->get()];
        }
 
        /**
@@ -214,45 +214,69 @@ class Transmitter
         */
        public static function getProfile($uid)
        {
-               $condition = ['uid' => $uid, 'blocked' => false, 'account_expired' => false,
-                       'account_removed' => false, 'verified' => true];
-               $fields = ['guid', 'nickname', 'pubkey', 'account-type', 'page-flags'];
-               $user = DBA::selectFirst('user', $fields, $condition);
-               if (!DBA::isResult($user)) {
-                       return [];
-               }
+               if ($uid != 0) {
+                       $condition = ['uid' => $uid, 'blocked' => false, 'account_expired' => false,
+                               'account_removed' => false, 'verified' => true];
+                       $fields = ['guid', 'nickname', 'pubkey', 'account-type', 'page-flags'];
+                       $user = DBA::selectFirst('user', $fields, $condition);
+                       if (!DBA::isResult($user)) {
+                               return [];
+                       }
 
-               $fields = ['locality', 'region', 'country-name'];
-               $profile = DBA::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]);
-               if (!DBA::isResult($profile)) {
-                       return [];
-               }
+                       $fields = ['locality', 'region', 'country-name'];
+                       $profile = DBA::selectFirst('profile', $fields, ['uid' => $uid]);
+                       if (!DBA::isResult($profile)) {
+                               return [];
+                       }
 
-               $fields = ['name', 'url', 'location', 'about', 'avatar', 'photo'];
-               $contact = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
-               if (!DBA::isResult($contact)) {
-                       return [];
+                       $fields = ['name', 'url', 'location', 'about', 'avatar', 'photo'];
+                       $contact = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
+                       if (!DBA::isResult($contact)) {
+                               return [];
+                       }
+               } else {
+                       $contact = User::getSystemAccount();
+                       $user = ['guid' => '', 'nickname' => $contact['nick'], 'pubkey' => $contact['pubkey'],
+                               'account-type' => $contact['contact-type'], 'page-flags' => User::PAGE_FLAGS_NORMAL];
+                       $profile = ['locality' => '', 'region' => '', 'country-name' => ''];
                }
 
                $data = ['@context' => ActivityPub::CONTEXT];
                $data['id'] = $contact['url'];
-               $data['diaspora:guid'] = $user['guid'];
+
+               if (!empty($user['guid'])) {
+                       $data['diaspora:guid'] = $user['guid'];
+               }
+
                $data['type'] = ActivityPub::ACCOUNT_TYPES[$user['account-type']];
-               $data['following'] = System::baseUrl() . '/following/' . $user['nickname'];
-               $data['followers'] = System::baseUrl() . '/followers/' . $user['nickname'];
-               $data['inbox'] = System::baseUrl() . '/inbox/' . $user['nickname'];
-               $data['outbox'] = System::baseUrl() . '/outbox/' . $user['nickname'];
+               
+               if ($uid != 0) {
+                       $data['following'] = DI::baseUrl() . '/following/' . $user['nickname'];
+                       $data['followers'] = DI::baseUrl() . '/followers/' . $user['nickname'];
+                       $data['inbox'] = DI::baseUrl() . '/inbox/' . $user['nickname'];
+                       $data['outbox'] = DI::baseUrl() . '/outbox/' . $user['nickname'];
+               } else {
+                       $data['inbox'] = DI::baseUrl() . '/friendica/inbox';
+               }
+
                $data['preferredUsername'] = $user['nickname'];
                $data['name'] = $contact['name'];
-               $data['vcard:hasAddress'] = ['@type' => 'vcard:Home', 'vcard:country-name' => $profile['country-name'],
-                       'vcard:region' => $profile['region'], 'vcard:locality' => $profile['locality']];
-               $data['summary'] = $contact['about'];
+
+               if (!empty($profile['country-name'] . $profile['region'] . $profile['locality'])) {
+                       $data['vcard:hasAddress'] = ['@type' => 'vcard:Home', 'vcard:country-name' => $profile['country-name'],
+                               'vcard:region' => $profile['region'], 'vcard:locality' => $profile['locality']];
+               }
+
+               if (!empty($contact['about'])) {
+                       $data['summary'] = BBCode::convert($contact['about'], false);
+               }
+
                $data['url'] = $contact['url'];
                $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']];
-               $data['endpoints'] = ['sharedInbox' => System::baseUrl() . '/inbox'];
+               $data['endpoints'] = ['sharedInbox' => DI::baseUrl() . '/inbox'];
                $data['icon'] = ['type' => 'Image',
                        'url' => $contact['photo']];
 
@@ -271,7 +295,7 @@ class Transmitter
        {
                return [
                        '@context' => ActivityPub::CONTEXT,
-                       'id' => System::baseUrl() . '/profile/' . $username,
+                       'id' => DI::baseUrl() . '/profile/' . $username,
                        'type' => 'Tombstone',
                        'published' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
                        'updated' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
@@ -323,7 +347,11 @@ class Transmitter
                        }
 
                        foreach ($activity[$element] as $receiver) {
-                               if ($receiver == $profile['followers'] && !empty($item_profile['followers'])) {
+                               if (empty($receiver)) {
+                                       continue;
+                               }
+
+                               if (!empty($profile['followers']) && $receiver == $profile['followers'] && !empty($item_profile['followers'])) {
                                        $permissions[$element][] = $item_profile['followers'];
                                } elseif (!in_array($receiver, $exclude)) {
                                        $permissions[$element][] = $receiver;
@@ -352,16 +380,22 @@ class Transmitter
                }
 
                $always_bcc = false;
+               $isforum = false;
 
                // Check if we should always deliver our stuff via BCC
                if (!empty($item['uid'])) {
-                       $profile = Profile::getByUID($item['uid']);
+                       $profile = User::getOwnerDataById($item['uid']);
                        if (!empty($profile)) {
                                $always_bcc = $profile['hide-friends'];
+                               $isforum = $profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY;
                        }
                }
 
-               if (Config::get('debug', 'total_ap_delivery')) {
+               if (DI::config()->get('system', 'ap_always_bcc')) {
+                       $always_bcc = true;
+               }
+
+               if ((self::isAnnounce($item) && !$isforum) || DI::config()->get('debug', 'total_ap_delivery')) {
                        // Will be activated in a later step
                        $networks = Protocol::FEDERATED;
                } else {
@@ -377,12 +411,26 @@ class Transmitter
                        $actor_profile = APContact::getByURL($item['author-link']);
                }
 
-               $terms = Term::tagArrayFromItemId($item['id'], [Term::MENTION, Term::IMPLICIT_MENTION]);
+               $terms = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
+
+               if ($item['private'] != Item::PRIVATE) {
+                       // Directly mention the original author upon a quoted reshare.
+                       // Else just ensure that the original author receives the reshare.
+                       $announce = self::getAnnounceArray($item);
+                       if (!empty($announce['comment'])) {
+                               $data['to'][] = $announce['actor']['url'];
+                       } elseif (!empty($announce)) {
+                               $data['cc'][] = $announce['actor']['url'];
+                       }
 
-               if (!$item['private']) {
                        $data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
 
-                       $data['to'][] = ActivityPub::PUBLIC_COLLECTION;
+                       // Check if the item is completely public or unlisted
+                       if ($item['private'] == Item::PUBLIC) {
+                               $data['to'][] = ActivityPub::PUBLIC_COLLECTION;
+                       } else {
+                               $data['cc'][] = ActivityPub::PUBLIC_COLLECTION;
+                       }
 
                        foreach ($terms as $term) {
                                $profile = APContact::getByURL($term['url'], false);
@@ -401,6 +449,10 @@ class Transmitter
                                                continue;
                                        }
 
+                                       if ($isforum && DBA::isResult($contact) && ($contact['dfrn'] == Protocol::DFRN)) {
+                                               continue;
+                                       }
+
                                        if (!empty($profile = APContact::getByURL($contact['url'], false))) {
                                                $data['to'][] = $profile['url'];
                                        }
@@ -413,6 +465,10 @@ class Transmitter
                                        continue;
                                }
 
+                               if ($isforum && DBA::isResult($contact) && ($contact['dfrn'] == Protocol::DFRN)) {
+                                       continue;
+                               }
+
                                if (!empty($profile = APContact::getByURL($contact['url'], false))) {
                                        if ($contact['hidden'] || $always_bcc) {
                                                $data['bcc'][] = $profile['url'];
@@ -432,17 +488,19 @@ class Transmitter
                                                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') {
+                                                       // This rule is only valid when the actor isn't the forum.
+                                                       // The forum needs to transmit their content to their followers.
+                                                       if (($profile['type'] == 'Group') && ($profile['url'] != $actor_profile['url'])) {
                                                                $data['to'][] = $profile['url'];
                                                        } else {
                                                                $data['cc'][] = $profile['url'];
-                                                               if (!$item['private'] && !empty($actor_profile['followers'])) {
+                                                               if (($item['private'] != Item::PRIVATE) && !empty($actor_profile['followers'])) {
                                                                        $data['cc'][] = $actor_profile['followers'];
                                                                }
                                                        }
                                                } else {
                                                        // Public thread parent post always are directed to the followers
-                                                       if (!$item['private'] && !$forum_mode) {
+                                                       if (($item['private'] != Item::PRIVATE) && !$forum_mode) {
                                                                $data['cc'][] = $actor_profile['followers'];
                                                        }
                                                }
@@ -533,7 +591,16 @@ class Transmitter
        {
                $inboxes = [];
 
-               if (Config::get('debug', 'total_ap_delivery')) {
+               $isforum = false;
+
+               if (!empty($item['uid'])) {
+                       $profile = User::getOwnerDataById($item['uid']);
+                       if (!empty($profile)) {
+                               $isforum = $profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY;
+                       }
+               }
+
+               if (DI::config()->get('debug', 'total_ap_delivery')) {
                        // Will be activated in a later step
                        $networks = Protocol::FEDERATED;
                } else {
@@ -557,6 +624,10 @@ class Transmitter
                                continue;
                        }
 
+                       if ($isforum && ($contact['dfrn'] == Protocol::DFRN)) {
+                               continue;
+                       }
+
                        if (Network::isUrlBlocked($contact['url'])) {
                                continue;
                        }
@@ -605,6 +676,12 @@ class Transmitter
                        $item_profile = APContact::getByURL($item['owner-link'], false);
                }
 
+               if (empty($item_profile)) {
+                       return [];
+               }
+
+               $profile_uid = User::getIdForURL($item_profile['url']);
+
                foreach (['to', 'cc', 'bto', 'bcc'] as $element) {
                        if (empty($permissions[$element])) {
                                continue;
@@ -613,11 +690,11 @@ class Transmitter
                        $blindcopy = in_array($element, ['bto', 'bcc']);
 
                        foreach ($permissions[$element] as $receiver) {
-                               if (Network::isUrlBlocked($receiver)) {
+                               if (empty($receiver) || Network::isUrlBlocked($receiver)) {
                                        continue;
                                }
 
-                               if ($receiver == $item_profile['followers']) {
+                               if ($item_profile && ($receiver == $item_profile['followers']) && ($uid == $profile_uid)) {
                                        $inboxes = array_merge($inboxes, self::fetchTargetInboxesforUser($uid, $personal));
                                } else {
                                        if (Contact::isLocal($receiver)) {
@@ -653,6 +730,11 @@ class Transmitter
        public static function ItemArrayFromMail($mail_id)
        {
                $mail = DBA::selectFirst('mail', [], ['id' => $mail_id]);
+               if (!DBA::isResult($mail)) {
+                       return [];
+               }
+
+               $mail['uri-id'] = ItemURI::insert(['uri' => $mail['uri'], 'guid' => $mail['guid']]);
 
                $reply = DBA::selectFirst('mail', ['uri'], ['parent-uri' => $mail['parent-uri'], 'reply' => false]);
 
@@ -696,18 +778,13 @@ class Transmitter
                $mail = self::ItemArrayFromMail($mail_id);
                $object = self::createNote($mail);
 
-               $object['to'] = $object['cc'];
-               unset($object['cc']);
-
-               $object['tag'] = [['type' => 'Mention', 'href' => $object['to'][0], 'name' => 'test']];
-
                if (!$object_mode) {
                        $data = ['@context' => ActivityPub::CONTEXT];
                } else {
                        $data = [];
                }
 
-               $data['id'] = $mail['uri'] . '#Create';
+               $data['id'] = $mail['uri'] . '/Create';
                $data['type'] = 'Create';
                $data['actor'] = $mail['author-link'];
                $data['published'] = DateTimeFormat::utc($mail['created'] . '+00:00', DateTimeFormat::ATOM);
@@ -726,6 +803,8 @@ class Transmitter
                unset($data['bcc']);
 
                $object['to'] = $data['to'];
+               $object['tag'] = [['type' => 'Mention', 'href' => $object['to'][0], 'name' => '']];
+
                unset($object['cc']);
                unset($object['bcc']);
 
@@ -757,8 +836,8 @@ class Transmitter
 
                // 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']);
+                       $announce = self::getAnnounceArray($item);
+                       $reshared = !empty($announce);
                }
 
                if ($reshared) {
@@ -783,6 +862,8 @@ class Transmitter
                        $type = 'Follow';
                } elseif ($item['verb'] == Activity::TAG) {
                        $type = 'Add';
+               } elseif ($item['verb'] == Activity::ANNOUNCE) {
+                       $type = 'Announce';
                } else {
                        $type = '';
                }
@@ -804,15 +885,15 @@ class Transmitter
                $cachekey = 'APDelivery:createActivity:' . $item_id;
 
                if (!$force) {
-                       $data = Cache::get($cachekey);
+                       $data = DI::cache()->get($cachekey);
                        if (!is_null($data)) {
                                return $data;
                        }
                }
 
-               $data = ActivityPub\Transmitter::createActivityFromItem($item_id);
+               $data = self::createActivityFromItem($item_id);
 
-               Cache::set($cachekey, $data, Cache::QUARTER_HOUR);
+               DI::cache()->set($cachekey, $data, Duration::QUARTER_HOUR);
                return $data;
        }
 
@@ -827,30 +908,60 @@ class Transmitter
         */
        public static function createActivityFromItem($item_id, $object_mode = false)
        {
+               Logger::info('Fetching activity', ['item' => $item_id]);
                $item = Item::selectFirst([], ['id' => $item_id, 'parent-network' => Protocol::NATIVE_SUPPORT]);
-
                if (!DBA::isResult($item)) {
                        return false;
                }
 
+               /// @todo This code should be removed by the end of the year 2020
                if ($item['wall'] && ($item['uri'] == $item['parent-uri'])) {
                        $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]';
+                               $item['body'] = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'],
+                                       $item['plink'], $item['created'], $item['guid']) . $item['body'] . '[/share]';
                        }
                }
 
+               /*
+               /// @todo This code should be activated by the end of the year 2020             
+               // See also "tagDeliver";
+               // In case of a forum post ensure to return the original post if author and forum are on the same machine
+               if (!empty($item['forum_mode'])) {
+                       $author = Contact::getById($item['author-id'], ['nurl']);
+                       if (!empty($author['nurl'])) {
+                               $self = Contact::selectFirst(['uid'], ['nurl' => $author['nurl'], 'self' => true]);
+                               if (!empty($self['uid'])) {
+                                       $item = Item::selectFirst([], ['uri-id' => $item['uri-id'], 'uid' => $self['uid']]);
+                               }
+                       }
+               }
+               */
+
                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'], true);
-                               if (!empty($data)) {
-                                       return $data;
+                               if (!empty($data['type'])) {
+                                       if (in_array($data['type'], ['Create', 'Update'])) {
+                                               if ($object_mode) {
+                                                       unset($data['@context']);
+                                                       unset($data['signature']);
+                                               }
+                                               Logger::info('Return stored conversation', ['item' => $item_id]);
+                                               return $data;
+                                       } elseif (in_array('as:' . $data['type'], Receiver::CONTENT_TYPES)) {
+                                               if (!empty($data['@context'])) {
+                                                       $context = $data['@context'];
+                                                       unset($data['@context']);
+                                               }
+                                               unset($data['actor']);
+                                               $object = $data;
+                                       }
                                }
                        }
 
@@ -858,7 +969,7 @@ class Transmitter
                }
 
                if (!$object_mode) {
-                       $data = ['@context' => ActivityPub::CONTEXT];
+                       $data = ['@context' => $context ?? ActivityPub::CONTEXT];
 
                        if ($item['deleted'] && ($item['gravity'] == GRAVITY_ACTIVITY)) {
                                $type = 'Undo';
@@ -869,10 +980,10 @@ class Transmitter
                        $data = [];
                }
 
-               $data['id'] = $item['uri'] . '#' . $type;
+               $data['id'] = $item['uri'] . '/' . $type;
                $data['type'] = $type;
 
-               if (Item::isForumPost($item) && ($type != 'Announce')) {
+               if (($type != 'Announce') || ($item['gravity'] != GRAVITY_PARENT)) {
                        $data['actor'] = $item['author-link'];
                } else {
                        $data['actor'] = $item['owner-link'];
@@ -885,11 +996,15 @@ class Transmitter
                $data = array_merge($data, self::createPermissionBlockForItem($item, false));
 
                if (in_array($data['type'], ['Create', 'Update', 'Delete'])) {
-                       $data['object'] = self::createNote($item);
+                       $data['object'] = $object ?? self::createNote($item);
                } elseif ($data['type'] == 'Add') {
                        $data = self::createAddTag($item, $data);
                } elseif ($data['type'] == 'Announce') {
-                       $data = self::createAnnounce($item, $data);
+                       if ($item['verb'] == ACTIVITY::ANNOUNCE) {
+                               $data['object'] = $item['thr-parent'];
+                       } else {
+                               $data = self::createAnnounce($item, $data);
+                       }
                } elseif ($data['type'] == 'Follow') {
                        $data['object'] = $item['parent-uri'];
                } elseif ($data['type'] == 'Undo') {
@@ -910,7 +1025,10 @@ class Transmitter
 
                $owner = User::getOwnerDataById($uid);
 
-               if (!$object_mode && !empty($owner)) {
+               Logger::info('Fetched activity', ['item' => $item_id, 'uid' => $uid]);
+
+               // We don't sign if we aren't the actor. This is important for relaying content especially for forums
+               if (!$object_mode && !empty($owner) && ($data['actor'] == $owner['url'])) {
                        return LDSignature::sign($data, $owner);
                } else {
                        return $data;
@@ -919,29 +1037,6 @@ class Transmitter
                /// @todo Create "conversation" entry
        }
 
-       /**
-        * Creates an object array for a given item id
-        *
-        * @param integer $item_id
-        *
-        * @return array with the object data
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-        * @throws \ImagickException
-        */
-       public static function createObjectFromItemID($item_id)
-       {
-               $item = Item::selectFirst([], ['id' => $item_id, 'parent-network' => Protocol::NATIVE_SUPPORT]);
-
-               if (!DBA::isResult($item)) {
-                       return false;
-               }
-
-               $data = ['@context' => ActivityPub::CONTEXT];
-               $data = array_merge($data, self::createNote($item));
-
-               return $data;
-       }
-
        /**
         * Creates a location entry for a given item array
         *
@@ -988,13 +1083,16 @@ class Transmitter
        {
                $tags = [];
 
-               $terms = Term::tagArrayFromItemId($item['id'], [Term::HASHTAG, Term::MENTION, Term::IMPLICIT_MENTION]);
+               $terms = Tag::getByURIId($item['uri-id'], [Tag::HASHTAG, Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
                foreach ($terms as $term) {
-                       if ($term['type'] == Term::HASHTAG) {
-                               $url = System::baseUrl() . '/search?tag=' . urlencode($term['term']);
-                               $tags[] = ['type' => 'Hashtag', 'href' => $url, 'name' => '#' . $term['term']];
-                       } elseif ($term['type'] == Term::MENTION || $term['type'] == Term::IMPLICIT_MENTION) {
-                               $contact = Contact::getDetailsByURL($term['url']);
+                       if ($term['type'] == Tag::HASHTAG) {
+                               $url = DI::baseUrl() . '/search?tag=' . urlencode($term['name']);
+                               $tags[] = ['type' => 'Hashtag', 'href' => $url, 'name' => '#' . $term['name']];
+                       } else {
+                               $contact = Contact::getByURL($term['url'], false, ['addr']);
+                               if (empty($contact)) {
+                                       continue;
+                               }
                                if (!empty($contact['addr'])) {
                                        $mention = '@' . $contact['addr'];
                                } else {
@@ -1004,6 +1102,13 @@ class Transmitter
                                $tags[] = ['type' => 'Mention', 'href' => $term['url'], 'name' => $mention];
                        }
                }
+
+               $announce = self::getAnnounceArray($item);
+               // Mention the original author upon commented reshares
+               if (!empty($announce['comment'])) {
+                       $tags[] = ['type' => 'Mention', 'href' => $announce['actor']['url'], 'name' => '@' . $announce['actor']['addr']];
+               }
+
                return $tags;
        }
 
@@ -1020,6 +1125,37 @@ class Transmitter
        {
                $attachments = [];
 
+               // Currently deactivated, since it creates side effects on Mastodon and Pleroma.
+               // It will be reactivated, once this cleared.
+               /*
+               $attach_data = BBCode::getAttachmentData($item['body']);
+               if (!empty($attach_data['url'])) {
+                       $attachment = ['type' => 'Page',
+                               'mediaType' => 'text/html',
+                               'url' => $attach_data['url']];
+
+                       if (!empty($attach_data['title'])) {
+                               $attachment['name'] = $attach_data['title'];
+                       }
+
+                       if (!empty($attach_data['description'])) {
+                               $attachment['summary'] = $attach_data['description'];
+                       }
+
+                       if (!empty($attach_data['image'])) {
+                               $imgdata = Images::getInfoFromURLCached($attach_data['image']);
+                               if ($imgdata) {
+                                       $attachment['icon'] = ['type' => 'Image',
+                                               'mediaType' => $imgdata['mime'],
+                                               'width' => $imgdata[0],
+                                               'height' => $imgdata[1],
+                                               'url' => $attach_data['image']];
+                               }
+                       }
+
+                       $attachments[] = $attachment;
+               }
+               */
                $arr = explode('[/attach],', $item['attach']);
                if (count($arr)) {
                        foreach ($arr as $r) {
@@ -1077,7 +1213,7 @@ class Transmitter
        }
 
        /**
-        * @brief Callback function to replace a Friendica style mention in a mention that is used on AP
+        * 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
@@ -1089,7 +1225,7 @@ class Transmitter
                        return '';
                }
 
-               $data = Contact::getDetailsByURL($match[1]);
+               $data = Contact::getByURL($match[1], false, ['url', 'nick']);
                if (empty($data['nick'])) {
                        return $match[0];
                }
@@ -1154,15 +1290,14 @@ class Transmitter
        /**
         * Returns if the post contains sensitive content ("nsfw")
         *
-        * @param integer $item_id
+        * @param integer $uri_id
         *
         * @return boolean
         * @throws \Exception
         */
-       private static function isSensitive($item_id)
+       private static function isSensitive($uri_id)
        {
-               $condition = ['otype' => TERM_OBJ_POST, 'oid' => $item_id, 'type' => TERM_HASHTAG, 'term' => 'nsfw'];
-               return DBA::exists('term', $condition);
+               return DBA::exists('tag-view', ['uri-id' => $uri_id, 'name' => 'nsfw']);
        }
 
        /**
@@ -1177,7 +1312,7 @@ class Transmitter
        {
                $event = [];
                $event['name'] = $item['event-summary'];
-               $event['content'] = BBCode::convert($item['event-desc'], false, 9);
+               $event['content'] = BBCode::convert($item['event-desc'], false, BBCode::ACTIVITYPUB);
                $event['startTime'] = DateTimeFormat::utc($item['event-start'] . '+00:00', DateTimeFormat::ATOM);
 
                if (!$item['event-nofinish']) {
@@ -1203,6 +1338,10 @@ class Transmitter
         */
        public static function createNote($item)
        {
+               if (empty($item)) {
+                       return [];
+               }
+
                if ($item['event-type'] == 'event') {
                        $type = 'Event';
                } elseif (!empty($item['title'])) {
@@ -1240,7 +1379,7 @@ class Transmitter
 
                $data['url'] = $item['plink'];
                $data['attributedTo'] = $item['author-link'];
-               $data['sensitive'] = self::isSensitive($item['id']);
+               $data['sensitive'] = self::isSensitive($item['uri-id']);
                $data['context'] = self::fetchContextURLForItem($item);
 
                if (!empty($item['title'])) {
@@ -1252,7 +1391,7 @@ class Transmitter
                $body = $item['body'];
 
                if (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions')) {
-                       $body = self::prependMentions($body, $permission_block);
+                       $body = self::prependMentions($body, $item['uri-id']);
                }
 
                if ($type == 'Note') {
@@ -1267,7 +1406,19 @@ class Transmitter
                        $regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
                        $body = preg_replace_callback($regexp, ['self', 'mentionCallback'], $body);
 
-                       $data['content'] = BBCode::convert($body, false, 9);
+                       $data['content'] = BBCode::convert($body, false, BBCode::ACTIVITYPUB);
+               }
+
+               // The regular "content" field does contain a minimized HTML. This is done since systems like
+               // Mastodon has got problems with - for example - embedded pictures.
+               // The contentMap does contain the unmodified HTML.
+               $language = self::getLanguage($item);
+               if (!empty($language)) {
+                       $regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
+                       $richbody = preg_replace_callback($regexp, ['self', 'mentionCallback'], $item['body']);
+                       $richbody = BBCode::removeAttachment($richbody);
+
+                       $data['contentMap'][$language] = BBCode::convert($richbody, false);
                }
 
                $data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];
@@ -1292,6 +1443,35 @@ class Transmitter
                return $data;
        }
 
+       /**
+        * Fetches the language from the post, the user or the system.
+        *
+        * @param array $item
+        *
+        * @return string language string
+        */
+       private static function getLanguage(array $item)
+       {
+               // Try to fetch the language from the post itself
+               if (!empty($item['language'])) {
+                       $languages = array_keys(json_decode($item['language'], true));
+                       if (!empty($languages[0])) {
+                               return $languages[0];
+                       }
+               }
+
+               // Otherwise use the user's language
+               if (!empty($item['uid'])) {
+                       $user = DBA::selectFirst('user', ['language'], ['uid' => $item['uid']]);
+                       if (!empty($user['language'])) {
+                               return $user['language'];
+                       }
+               }
+
+               // And finally just use the system language
+               return DI::config()->get('system', 'language');
+       }
+
        /**
         * Creates an an "add tag" entry
         *
@@ -1304,8 +1484,8 @@ class Transmitter
         */
        private static function createAddTag($item, $data)
        {
-               $object = XML::parseString($item['object'], false);
-               $target = XML::parseString($item["target"], false);
+               $object = XML::parseString($item['object']);
+               $target = XML::parseString($item["target"]);
 
                $data['diaspora:guid'] = $item['guid'];
                $data['actor'] = $item['author-link'];
@@ -1329,46 +1509,84 @@ class Transmitter
        private static function createAnnounce($item, $data)
        {
                $orig_body = $item['body'];
-               $announce = api_share_as_retweet($item);
-               if (empty($announce['plink'])) {
+               $announce = self::getAnnounceArray($item);
+               if (empty($announce)) {
                        $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');
-                       $type = str_replace('as:', '', JsonLD::fetchElement($ldactivity, '@type'));
-                       if (!empty($id)) {
-                               if (empty($announce['share-pre-body'])) {
-                                       // Pure announce, without a quote
-                                       $data['type'] = 'Announce';
-                                       $data['object'] = $id;
-                                       return $data;
-                               }
-
-                               // Quote
-                               $data['type'] = 'Create';
-                               $item['body'] = trim($announce['share-pre-body']) . "\n" . $id;
-                               $data['object'] = self::createNote($item);
-
-                               /// @todo Finally descide how to implement this in AP. This is a possible way:
-                               $data['object']['attachment'][] = ['type' => $type, 'id' => $id];
-
-                               $data['object']['source']['content'] = $orig_body;
-                               return $data;
-                       }
+               if (empty($announce['comment'])) {
+                       // Pure announce, without a quote
+                       $data['type'] = 'Announce';
+                       $data['object'] = $announce['object']['uri'];
+                       return $data;
                }
 
-               $item['body'] = $orig_body;
+               // Quote
                $data['type'] = 'Create';
+               $item['body'] = $announce['comment'] . "\n" . $announce['object']['plink'];
                $data['object'] = self::createNote($item);
+
+               /// @todo Finally descide how to implement this in AP. This is a possible way:
+               $data['object']['attachment'][] = self::createNote($announce['object']);
+
+               $data['object']['source']['content'] = $orig_body;
                return $data;
        }
 
+       /**
+        * Return announce related data if the item is an annunce
+        *
+        * @param array $item
+        *
+        * @return array
+        */
+       public static function getAnnounceArray($item)
+       {
+               $reshared = Item::getShareArray($item);
+               if (empty($reshared['guid'])) {
+                       return [];
+               }
+
+               $reshared_item = Item::selectFirst([], ['guid' => $reshared['guid']]);
+               if (!DBA::isResult($reshared_item)) {
+                       return [];
+               }
+
+               if (!in_array($reshared_item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN])) {
+                       return [];
+               }
+
+               $profile = APContact::getByURL($reshared_item['author-link'], false);
+               if (empty($profile)) {
+                       return [];
+               }
+
+               return ['object' => $reshared_item, 'actor' => $profile, 'comment' => $reshared['comment']];
+       }
+
+       /**
+        * Checks if the provided item array is an announce
+        *
+        * @param array $item
+        *
+        * @return boolean
+        */
+       public static function isAnnounce($item)
+       {
+               if (!empty($item['verb']) && ($item['verb'] == Activity::ANNOUNCE)) {
+                       return true;
+               }
+
+               $announce = self::getAnnounceArray($item);
+               if (empty($announce)) {
+                       return false;
+               }
+
+               return empty($announce['comment']);
+       }
+
        /**
         * Creates an activity id for a given contact id
         *
@@ -1385,7 +1603,7 @@ class Transmitter
 
                $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;
+               return DI::baseUrl() . '/activity/' . $uuid;
        }
 
        /**
@@ -1402,14 +1620,14 @@ class Transmitter
        {
                $owner = User::getOwnerDataById($uid);
 
-               $suggestion = DBA::selectFirst('fsuggest', ['url', 'note', 'created'], ['id' => $suggestion_id]);
+               $suggestion = DI::fsuggest()->getById($suggestion_id);
 
                $data = ['@context' => ActivityPub::CONTEXT,
-                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+                       'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
                        'type' => 'Announce',
                        'actor' => $owner['url'],
-                       'object' => $suggestion['url'],
-                       'content' => $suggestion['note'],
+                       'object' => $suggestion->url,
+                       'content' => $suggestion->note,
                        'instrument' => self::getService(),
                        'to' => [ActivityPub::PUBLIC_COLLECTION],
                        'cc' => []];
@@ -1434,7 +1652,7 @@ class Transmitter
                $owner = User::getOwnerDataById($uid);
 
                $data = ['@context' => ActivityPub::CONTEXT,
-                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+                       'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
                        'type' => 'dfrn:relocate',
                        'actor' => $owner['url'],
                        'object' => $owner['url'],
@@ -1473,7 +1691,7 @@ class Transmitter
                }
 
                $data = ['@context' => ActivityPub::CONTEXT,
-                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+                       'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
                        'type' => 'Delete',
                        'actor' => $owner['url'],
                        'object' => $owner['url'],
@@ -1504,7 +1722,7 @@ class Transmitter
                $profile = APContact::getByURL($owner['url']);
 
                $data = ['@context' => ActivityPub::CONTEXT,
-                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+                       'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
                        'type' => 'Update',
                        'actor' => $owner['url'],
                        'object' => self::getProfile($uid),
@@ -1541,7 +1759,7 @@ class Transmitter
                $owner = User::getOwnerDataById($uid);
 
                if (empty($id)) {
-                       $id = System::baseUrl() . '/activity/' . System::createGUID();
+                       $id = DI::baseUrl() . '/activity/' . System::createGUID();
                }
 
                $data = ['@context' => ActivityPub::CONTEXT,
@@ -1580,7 +1798,7 @@ class Transmitter
 
                if (empty($uid)) {
                        // Fetch the list of administrators
-                       $admin_mail = explode(',', str_replace(' ', '', Config::get('config', 'admin_email')));
+                       $admin_mail = explode(',', str_replace(' ', '', DI::config()->get('config', 'admin_email')));
 
                        // We need to use some user as a sender. It doesn't care who it will send. We will use an administrator account.
                        $condition = ['verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false, 'email' => $admin_mail];
@@ -1598,7 +1816,7 @@ class Transmitter
                $owner = User::getOwnerDataById($uid);
 
                $data = ['@context' => ActivityPub::CONTEXT,
-                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+                       'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
                        'type' => 'Follow',
                        'actor' => $owner['url'],
                        'object' => $object,
@@ -1630,7 +1848,7 @@ class Transmitter
 
                $owner = User::getOwnerDataById($uid);
                $data = ['@context' => ActivityPub::CONTEXT,
-                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+                       'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
                        'type' => 'Accept',
                        'actor' => $owner['url'],
                        'object' => [
@@ -1667,7 +1885,7 @@ class Transmitter
 
                $owner = User::getOwnerDataById($uid);
                $data = ['@context' => ActivityPub::CONTEXT,
-                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+                       'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
                        'type' => 'Reject',
                        'actor' => $owner['url'],
                        'object' => [
@@ -1707,7 +1925,7 @@ class Transmitter
                        return;
                }
 
-               $id = System::baseUrl() . '/activity/' . System::createGUID();
+               $id = DI::baseUrl() . '/activity/' . System::createGUID();
 
                $owner = User::getOwnerDataById($uid);
                $data = ['@context' => ActivityPub::CONTEXT,
@@ -1726,22 +1944,18 @@ class Transmitter
                HTTPSignature::transmit($signed, $profile['inbox'], $uid);
        }
 
-       private static function prependMentions($body, array $permission_block)
+       private static function prependMentions($body, int $uriid)
        {
-               if (Config::get('system', 'disable_implicit_mentions')) {
-                       return $body;
-               }
-
                $mentions = [];
 
-               foreach ($permission_block['to'] as $profile_url) {
-                       $profile = Contact::getDetailsByURL($profile_url);
+               foreach (Tag::getByURIId($uriid, [Tag::IMPLICIT_MENTION]) as $tag) {
+                       $profile = Contact::getByURL($tag['url'], false, ['addr', 'contact-type', 'nick']);
                        if (!empty($profile['addr'])
                                && $profile['contact-type'] != Contact::TYPE_COMMUNITY
                                && !strstr($body, $profile['addr'])
-                               && !strstr($body, $profile_url)
+                               && !strstr($body, $tag['url'])
                        ) {
-                               $mentions[] = '@[url=' . $profile_url . ']' . $profile['nick'] . '[/url]';
+                               $mentions[] = '@[url=' . $tag['url'] . ']' . $profile['nick'] . '[/url]';
                        }
                }