]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Item.php
Insert a `user-contact` for every contact
[friendica.git] / src / Model / Item.php
index c814ac9d83f2df3fd6f51a0d6ab16649a070efdb..5cc72b05800bc15ebc60a92effb08baf3c553b8e 100644 (file)
@@ -40,6 +40,7 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
 use Friendica\Util\Network;
+use Friendica\Util\Proxy;
 use Friendica\Util\Strings;
 use Friendica\Worker\Delivery;
 use LanguageDetection\Language;
@@ -55,20 +56,23 @@ class Item
        const PT_VIDEO = 18;
        const PT_DOCUMENT = 19;
        const PT_EVENT = 32;
-       const PT_TAG = 64;
-       const PT_TO = 65;
-       const PT_CC = 66;
-       const PT_BTO = 67;
-       const PT_BCC = 68;
-       const PT_FOLLOWER = 69;
-       const PT_ANNOUNCEMENT = 70;
-       const PT_COMMENT = 71;
-       const PT_STORED = 72;
-       const PT_GLOBAL = 73;
-       const PT_RELAY = 74;
-       const PT_FETCHED = 75;
        const PT_PERSONAL_NOTE = 128;
 
+       // Posting reasons (Why had a post been stored for a user?)
+       const PR_NONE = 0;
+       const PR_TAG = 64;
+       const PR_TO = 65;
+       const PR_CC = 66;
+       const PR_BTO = 67;
+       const PR_BCC = 68;
+       const PR_FOLLOWER = 69;
+       const PR_ANNOUNCEMENT = 70;
+       const PR_COMMENT = 71;
+       const PR_STORED = 72;
+       const PR_GLOBAL = 73;
+       const PR_RELAY = 74;
+       const PR_FETCHED = 75;
+
        // Field list that is used to display the items
        const DISPLAY_FIELDLIST = [
                'uid', 'id', 'parent', 'guid', 'network', 'gravity',
@@ -92,7 +96,7 @@ class Item
        const DELIVER_FIELDLIST = ['uid', 'id', 'parent', 'uri-id', 'uri', 'thr-parent', 'parent-uri', 'guid',
                        'parent-guid', 'received', 'created', 'edited', 'verb', 'object-type', 'object', 'target',
                        'private', 'title', 'body', 'raw-body', 'location', 'coord', 'app',
-                       'inform', 'deleted', 'extid', 'post-type', 'gravity',
+                       'inform', 'deleted', 'extid', 'post-type', 'post-reason', 'gravity',
                        'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
                        'author-id', 'author-link', 'author-name', 'author-avatar', 'owner-id', 'owner-link', 'contact-uid',
                        'signed_text', 'network', 'wall', 'contact-id', 'plink', 'forum_mode', 'origin',
@@ -107,7 +111,7 @@ class Item
                        'contact-id', 'wall', 'gravity', 'extid', 'psid',
                        'created', 'edited', 'commented', 'received', 'changed', 'verb',
                        'postopts', 'plink', 'resource-id', 'event-id', 'inform',
-                       'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'post-type',
+                       'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'post-type', 'post-reason',
                        'private', 'pubmail', 'visible', 'starred',
                        'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global', 'network',
                        'title', 'content-warning', 'body', 'location', 'coord', 'app',
@@ -147,10 +151,18 @@ class Item
                        return false;
                }
 
+               if (isset($fields['extid'])) {
+                       $fields['external-id'] = ItemURI::getIdByURI($fields['extid']);
+               }
+
                if (!empty($fields['verb'])) {
                        $fields['vid'] = Verb::getID($fields['verb']);
                }
 
+               if (!empty($fields['edited'])) {
+                       $previous = Post::selectFirst(['edited'], $condition);
+               }
+
                $rows = Post::update($fields, $condition);
                if (is_bool($rows)) {
                        return $rows;
@@ -164,17 +176,26 @@ class Item
 
                Logger::info('Updating per single row method', ['fields' => $fields, 'condition' => $condition]);
 
-               $items = Post::select(['id', 'origin', 'uri-id', 'uid'], $condition);
+               $items = Post::select(['id', 'origin', 'uri-id', 'uid', 'author-network'], $condition);
 
                $notify_items = [];
 
                while ($item = DBA::fetch($items)) {
                        if (!empty($fields['body'])) {
+                               Post\Media::insertFromAttachmentData($item['uri-id'], $fields['body']);
+
                                $content_fields = ['raw-body' => trim($fields['raw-body'] ?? $fields['body'])];
-       
+
                                // Remove all media attachments from the body and store them in the post-media table
+                               // @todo On shared postings (Diaspora style and commented reshare) don't fetch content from the shared part
                                $content_fields['raw-body'] = Post\Media::insertFromBody($item['uri-id'], $content_fields['raw-body']);
                                $content_fields['raw-body'] = self::setHashtags($content_fields['raw-body']);
+
+                               if ($item['author-network'] != Protocol::DFRN) {
+                                       Post\Media::insertFromRelevantUrl($item['uri-id'], $content_fields['raw-body']);
+                               }
+
+                               Post\Content::update($item['uri-id'], $content_fields);
                        }
 
                        if (!empty($fields['file'])) {
@@ -186,8 +207,8 @@ class Item
                        }
 
                        // We only need to notfiy others when it is an original entry from us.
-                       // Only call the notifier when the item has some content relevant change.
-                       if ($item['origin'] && in_array('edited', array_keys($fields))) {
+                       // Only call the notifier when the item had been edited and records had been changed.
+                       if ($item['origin'] && !empty($fields['edited']) && ($previous['edited'] != $fields['edited'])) {
                                $notify_items[] = $item['id'];
                        }
                }
@@ -342,7 +363,7 @@ class Item
                return true;
        }
 
-       private static function guid($item, $notify)
+       public static function guid($item, $notify)
        {
                if (!empty($item['guid'])) {
                        return Strings::escapeTags(trim($item['guid']));
@@ -447,18 +468,14 @@ class Item
                // Checking if there is already an item with the same guid
                $condition = ['guid' => $item['guid'], 'network' => $item['network'], 'uid' => $item['uid']];
                if (Post::exists($condition)) {
-                       Logger::notice('Found already existing item', [
-                               'guid' => $item['guid'],
-                               'uid' => $item['uid'],
-                               'network' => $item['network']
-                       ]);
+                       Logger::notice('Found already existing item', $condition);
                        return true;
                }
 
                $condition = ['uri-id' => $item['uri-id'], 'uid' => $item['uid'],
                        'network' => [$item['network'], Protocol::DFRN]];
                if (Post::exists($condition)) {
-                       Logger::notice('duplicated item with the same uri found.', $item);
+                       Logger::notice('duplicated item with the same uri found.', $condition);
                        return true;
                }
 
@@ -466,7 +483,7 @@ class Item
                if (in_array($item['network'], [Protocol::DFRN, Protocol::DIASPORA])) {
                        $condition = ['guid' => $item['guid'], 'uid' => $item['uid']];
                        if (Post::exists($condition)) {
-                               Logger::notice('duplicated item with the same guid found.', $item);
+                               Logger::notice('duplicated item with the same guid found.', $condition);
                                return true;
                        }
                } elseif ($item['network'] == Protocol::OSTATUS) {
@@ -501,7 +518,7 @@ class Item
        public static function isValid(array $item)
        {
                // When there is no content then we don't post it
-               if ($item['body'] . $item['title'] == '') {
+               if (($item['body'] . $item['title'] == '') && (empty($item['uri-id']) || !Post\Media::existsByURIId($item['uri-id']))) {
                        Logger::notice('No body, no title.');
                        return false;
                }
@@ -689,7 +706,7 @@ class Item
                return GRAVITY_UNKNOWN;   // Should not happen
        }
 
-       public static function insert($item, $notify = false, $dontcache = false)
+       public static function insert(array $item, bool $notify = false, bool $post_local = true)
        {
                $orig_item = $item;
 
@@ -744,6 +761,10 @@ class Item
                        return 0;
                }
 
+               if (!isset($item['post-type'])) {
+                       $item['post-type'] = empty($item['title']) ? self::PT_NOTE : self::PT_ARTICLE;
+               }
+
                $item['wall']          = intval($item['wall'] ?? 0);
                $item['extid']         = trim($item['extid'] ?? '');
                $item['author-name']   = trim($item['author-name'] ?? '');
@@ -762,7 +783,6 @@ class Item
                $item['coord']         = trim($item['coord'] ?? '');
                $item['visible']       = (isset($item['visible']) ? intval($item['visible']) : 1);
                $item['deleted']       = 0;
-               $item['post-type']     = ($item['post-type'] ?? '') ?: self::PT_ARTICLE;
                $item['verb']          = trim($item['verb'] ?? '');
                $item['object-type']   = trim($item['object-type'] ?? '');
                $item['object']        = trim($item['object'] ?? '');
@@ -810,7 +830,7 @@ class Item
 
                $actor = ($item['gravity'] == GRAVITY_PARENT) ? $item['owner-id'] : $item['author-id'];
                if (!$item['origin'] && ($item['uid'] != 0) && Contact::isSharing($actor, $item['uid'])) {
-                       $item['post-type'] = self::PT_FOLLOWER;
+                       $item['post-reason'] = self::PR_FOLLOWER;
                }
 
                // Ensure that there is an avatar cache
@@ -911,11 +931,29 @@ class Item
                        $item["private"] = self::PRIVATE;
                }
 
-               if ($notify) {
+               if ($notify && $post_local) {
                        $item['edit'] = false;
                        $item['parent'] = $parent_id;
+
+                       // Trigger automatic reactions for addons
+                       $item['api_source'] = true;
+
+                       // We have to tell the hooks who we are - this really should be improved
+                       if (!local_user()) {
+                               $_SESSION['authenticated'] = true;
+                               $_SESSION['uid'] = $uid;
+                               $dummy_session = true;
+                       } else {
+                               $dummy_session = false;
+                       }
+
                        Hook::callAll('post_local', $item);
-               } else {
+
+                       if ($dummy_session) {
+                               unset($_SESSION['authenticated']);
+                               unset($_SESSION['uid']);
+                       }
+               } elseif (!$notify) {
                        Hook::callAll('post_remote', $item);
                }
 
@@ -945,16 +983,27 @@ class Item
                        self::setOwnerforResharedItem($item);
                }
 
+               if (isset($item['attachments'])) {
+                       foreach ($item['attachments'] as $attachment) {
+                               $attachment['uri-id'] = $item['uri-id'];
+                               Post\Media::insert($attachment);
+                       }
+                       unset($item['attachments']);
+               }
+
+               Post\Media::insertFromAttachmentData($item['uri-id'], $item['body']);
+
                // Remove all media attachments from the body and store them in the post-media table
                $item['raw-body'] = Post\Media::insertFromBody($item['uri-id'], $item['raw-body']);
                $item['raw-body'] = self::setHashtags($item['raw-body']);
 
+               if (!DBA::exists('contact', ['id' => $item['author-id'], 'network' => Protocol::DFRN])) {
+                       Post\Media::insertFromRelevantUrl($item['uri-id'], $item['raw-body']);
+               }
+
                // Check for hashtags in the body and repair or add hashtag links
                $item['body'] = self::setHashtags($item['body']);
 
-               // Fill the cache field
-               self::putInCache($item);
-
                if (stristr($item['verb'], Activity::POKE)) {
                        $notify_type = Delivery::POKE;
                } else {
@@ -968,6 +1017,32 @@ class Item
 
                if (empty($item['event-id'])) {
                        unset($item['event-id']);
+
+                       $ev = Event::fromBBCode($item['body']);
+                       if ((!empty($ev['desc']) || !empty($ev['summary'])) && !empty($ev['start'])) {
+                               Logger::info('Event found.');
+                               $ev['cid']       = $item['contact-id'];
+                               $ev['uid']       = $item['uid'];
+                               $ev['uri']       = $item['uri'];
+                               $ev['edited']    = $item['edited'];
+                               $ev['private']   = $item['private'];
+                               $ev['guid']      = $item['guid'];
+                               $ev['plink']     = $item['plink'];
+                               $ev['network']   = $item['network'];
+                               $ev['protocol']  = $item['protocol'] ?? Conversation::PARCEL_UNKNOWN;
+                               $ev['direction'] = $item['direction'] ?? Conversation::UNKNOWN;
+                               $ev['source']    = $item['source'] ?? '';
+
+                               $event = DBA::selectFirst('event', ['id'], ['uri' => $item['uri'], 'uid' => $item['uid']]);
+                               if (DBA::isResult($event)) {
+                                       $ev['id'] = $event['id'];
+                               }
+
+                               $event_id = Event::store($ev);
+                               $item = Event::getItemArrayForImportedId($event_id, $item);
+
+                               Logger::info('Event was stored', ['id' => $event_id]);
+                       }
                }
 
                if (empty($item['causer-id'])) {
@@ -984,7 +1059,14 @@ class Item
                        Post\Content::insert($item['uri-id'], $item);
                }
 
-               // Diaspora signature
+               // Create Diaspora signature
+               if ($item['origin'] && empty($item['diaspora_signed_text']) && ($item['gravity'] != GRAVITY_PARENT)) {
+                       $signed = Diaspora::createCommentSignature($item);
+                       if (!empty($signed)) {
+                               $item['diaspora_signed_text'] = json_encode($signed);
+                       }
+               }
+
                if (!empty($item['diaspora_signed_text'])) {
                        DBA::replace('diaspora-interaction', ['uri-id' => $item['uri-id'], 'interaction' => $item['diaspora_signed_text']]);
                }
@@ -1059,12 +1141,13 @@ class Item
                        return 0;
                }
 
-               if (!$dontcache) {
-                       if ($notify) {
-                               Hook::callAll('post_local_end', $posted_item);
-                       } else {
-                               Hook::callAll('post_remote_end', $posted_item);
-                       }               
+               if ($notify) {
+                       if (!\Friendica\Content\Feature::isEnabled($posted_item['uid'], 'explicit_mentions') && ($posted_item['gravity'] == GRAVITY_COMMENT)) {
+                               Tag::createImplicitMentions($posted_item['uri-id'], $posted_item['thr-parent-id']);
+                       }
+                       Hook::callAll('post_local_end', $posted_item);
+               } else {
+                       Hook::callAll('post_remote_end', $posted_item);
                }
 
                if ($posted_item['gravity'] === GRAVITY_PARENT) {
@@ -1077,8 +1160,6 @@ class Item
 
                Post\UserNotification::setNotification($posted_item['uri-id'], $posted_item['uid']);
 
-               check_user_notification($posted_item['uri-id'], $posted_item['uid']);
-
                // Distribute items to users who subscribed to their tags
                self::distributeByTags($posted_item);
 
@@ -1089,7 +1170,7 @@ class Item
 
                if ($transmit) {
                        // Don't relay participation messages
-                       if (($posted_item['verb'] == Activity::FOLLOW) && 
+                       if (($posted_item['verb'] == Activity::FOLLOW) &&
                                (!$posted_item['origin'] || ($posted_item['author-id'] != Contact::getPublicIdByUserId($uid)))) {
                                Logger::info('Participation messages will not be relayed', ['item' => $posted_item['id'], 'uri' => $posted_item['uri'], 'verb' => $posted_item['verb']]);
                                $transmit = false;
@@ -1115,7 +1196,7 @@ class Item
         */
        private static function setOwnerforResharedItem(array $item)
        {
-               $parent = Post::selectFirst(['id', 'causer-id', 'owner-id', 'author-id', 'author-link', 'origin', 'post-type'],
+               $parent = Post::selectFirst(['id', 'causer-id', 'owner-id', 'author-id', 'author-link', 'origin', 'post-reason'],
                        ['uri-id' => $item['thr-parent-id'], 'uid' => $item['uid']]);
                if (!DBA::isResult($parent)) {
                        Logger::error('Parent not found', ['uri-id' => $item['thr-parent-id'], 'uid' => $item['uid']]);
@@ -1135,7 +1216,7 @@ class Item
                }
 
                if ($author['contact-type'] != Contact::TYPE_COMMUNITY) {
-                       if ($parent['post-type'] == self::PT_ANNOUNCEMENT) {
+                       if ($parent['post-reason'] == self::PR_ANNOUNCEMENT) {
                                Logger::info('The parent is already marked as announced: quit', ['causer' => $parent['causer-id'], 'owner' => $parent['owner-id'], 'author' => $parent['author-id'], 'uid' => $item['uid']]);
                                return;
                        }
@@ -1144,13 +1225,10 @@ class Item
                                Logger::info('The resharer is no forum: quit', ['resharer' => $item['author-id'], 'owner' => $parent['owner-id'], 'author' => $parent['author-id'], 'uid' => $item['uid']]);
                                return;
                        }
-                       self::update(['post-type' => self::PT_ANNOUNCEMENT, 'causer-id' => $item['author-id']], ['id' => $parent['id']]);
-                       Logger::info('Set announcement post-type', ['uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid']]);
-                       return;
                }
 
-               self::update(['owner-id' => $item['author-id'], 'contact-id' => $cid], ['id' => $parent['id']]);
-               Logger::info('Change owner of the parent', ['uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid'], 'owner-id' => $item['author-id'], 'contact-id' => $cid]);
+               self::update(['post-reason' => self::PR_ANNOUNCEMENT, 'causer-id' => $item['author-id']], ['id' => $parent['id']]);
+               Logger::info('Set announcement post-reason', ['uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid']]);
        }
 
        /**
@@ -1169,7 +1247,7 @@ class Item
                        if (Contact::isSharing($item['author-id'], $uid)) {
                                $fields = [];
                        } else {
-                               $fields = ['post-type' => self::PT_TAG];
+                               $fields = ['post-reason' => self::PR_TAG];
                        }
 
                        $stored = self::storeForUserByUriId($item['uri-id'], $uid, $fields);
@@ -1272,29 +1350,53 @@ class Item
        /**
         * Store a public item defined by their URI-ID for the given users
         *
-        * @param integer $uri_id URI-ID of the given item
-        * @param integer $uid    The user that will receive the item entry
-        * @param array   $fields Additional fields to be stored
+        * @param integer $uri_id     URI-ID of the given item
+        * @param integer $uid        The user that will receive the item entry
+        * @param array   $fields     Additional fields to be stored
+        * @param integer $source_uid User id of the source post
         * @return integer stored item id
         */
-       public static function storeForUserByUriId(int $uri_id, int $uid, array $fields = [])
+       public static function storeForUserByUriId(int $uri_id, int $uid, array $fields = [], int $source_uid = 0)
        {
-               $item = Post::selectFirst(self::ITEM_FIELDLIST, ['uri-id' => $uri_id, 'uid' => 0]);
+               if ($uid == $source_uid) {
+                       Logger::warning('target UID must not be be equal to the source UID', ['uri-id' => $uri_id, 'uid' => $uid]);
+                       return 0;
+               }
+
+               $item = Post::selectFirst(self::ITEM_FIELDLIST, ['uri-id' => $uri_id, 'uid' => $source_uid]);
                if (!DBA::isResult($item)) {
+                       Logger::warning('Item could not be fetched', ['uri-id' => $uri_id, 'uid' => $source_uid]);
                        return 0;
                }
 
-               if (($item['private'] == self::PRIVATE) || !in_array($item['network'], Protocol::FEDERATED)) {
+               if (($source_uid == 0) && (($item['private'] == self::PRIVATE) || !in_array($item['network'], Protocol::FEDERATED))) {
                        Logger::notice('Item is private or not from a federated network. It will not be stored for the user.', ['uri-id' => $uri_id, 'uid' => $uid, 'private' => $item['private'], 'network' => $item['network']]);
                        return 0;
                }
 
-               $item['post-type'] = self::PT_STORED;
+               $item['post-reason'] = self::PR_STORED;
 
                $item = array_merge($item, $fields);
 
+               $is_reshare = ($item['gravity'] == GRAVITY_ACTIVITY) && ($item['verb'] == Activity::ANNOUNCE);
+
+               if ((($item['gravity'] == GRAVITY_PARENT) || $is_reshare) &&
+                       DI::pConfig()->get($uid, 'system', 'accept_only_sharer') &&
+                       !Contact::isSharingByURL($item['author-link'], $uid) &&
+                       !Contact::isSharingByURL($item['owner-link'], $uid)) {
+                       Logger::info('Contact is not a follower, thread will not be stored', ['author' => $item['author-link'], 'uid' => $uid]);
+                       return 0;
+               }
+
+               if ((($item['gravity'] == GRAVITY_COMMENT) || $is_reshare) && !Post::exists(['uri-id' => $item['thr-parent-id'], 'uid' => $uid])) {
+                       // Only do an auto complete with the source uid "0" to prevent privavy problems
+                       $causer = $item['causer-id'] ?: $item['author-id'];
+                       $result = self::storeForUserByUriId($item['thr-parent-id'], $uid, ['causer-id' => $causer, 'post-reason' => self::PR_FETCHED]);
+                       Logger::info('Fetched thread parent', ['uri-id' => $item['thr-parent-id'], 'uid' => $uid, 'causer' => $causer, 'result' => $result]);
+               }
+
                $stored = self::storeForUser($item, $uid);
-               Logger::info('Public item stored for user', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'stored' => $stored]);
+               Logger::info('Item stored for user', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'source-uid' => $source_uid, 'stored' => $stored]);
                return $stored;
        }
 
@@ -1314,11 +1416,18 @@ class Item
                }
 
                unset($item['id']);
-               unset($item['parent']);
                unset($item['mention']);
                unset($item['starred']);
                unset($item['unseen']);
                unset($item['psid']);
+               unset($item['pinned']);
+               unset($item['ignored']);
+               unset($item['pubmail']);
+               unset($item['forum_mode']);
+
+               unset($item['event-id']);
+               unset($item['hidden']);
+               unset($item['notification-type']);
 
                $item['uid'] = $uid;
                $item['origin'] = 0;
@@ -1344,8 +1453,6 @@ class Item
                        $item['contact-id'] = $self['id'];
                }
 
-               /// @todo Handling of "event-id"
-
                $notify = false;
                if ($item['gravity'] == GRAVITY_PARENT) {
                        $contact = DBA::selectFirst('contact', [], ['id' => $item['contact-id'], 'self' => false]);
@@ -1354,12 +1461,12 @@ class Item
                        }
                }
 
-               $distributed = self::insert($item, $notify, true);
+               $distributed = self::insert($item, $notify);
 
                if (!$distributed) {
-                       Logger::info("Distributed public item wasn't stored", ['uri-id' => $item['uri-id'], 'user' => $uid]);
+                       Logger::info("Distributed item wasn't stored", ['uri-id' => $item['uri-id'], 'user' => $uid]);
                } else {
-                       Logger::info('Distributed public item was stored', ['uri-id' => $item['uri-id'], 'user' => $uid, 'stored' => $distributed]);
+                       Logger::info('Distributed item was stored', ['uri-id' => $item['uri-id'], 'user' => $uid, 'stored' => $distributed]);
                }
                return $distributed;
        }
@@ -1416,14 +1523,14 @@ class Item
                        unset($item['starred']);
                        unset($item['postopts']);
                        unset($item['inform']);
-                       unset($item['post-type']);
+                       unset($item['post-reason']);
                        if ($item['uri-id'] == $item['parent-uri-id']) {
                                $item['contact-id'] = $item['owner-id'];
                        } else {
                                $item['contact-id'] = $item['author-id'];
                        }
 
-                       $public_shadow = self::insert($item, false, true);
+                       $public_shadow = self::insert($item);
 
                        Logger::info('Stored public shadow', ['thread' => $itemid, 'id' => $public_shadow]);
                }
@@ -1479,10 +1586,10 @@ class Item
                unset($item['starred']);
                unset($item['postopts']);
                unset($item['inform']);
-               unset($item['post-type']);
+               unset($item['post-reason']);
                $item['contact-id'] = Contact::getIdForURL($item['author-link']);
 
-               $public_shadow = self::insert($item, false, true);
+               $public_shadow = self::insert($item);
 
                Logger::info('Stored public shadow', ['uri-id' => $item['uri-id'], 'id' => $public_shadow]);
 
@@ -1530,7 +1637,13 @@ class Item
                        return '';
                }
 
-               $ld = new Language(DI::l10n()->getAvailableLanguages());
+               $availableLanguages = DI::l10n()->getAvailableLanguages();
+               // See https://github.com/friendica/friendica/issues/10511
+               // Persian is manually added to language detection until a persian translation is provided for the interface, at
+               // which point it will be automatically available through `getAvailableLanguages()` and this should be removed.
+               $availableLanguages['fa'] = 'fa';
+
+               $ld = new Language($availableLanguages);
                $languages = $ld->detect($naked_body)->limit(0, 3)->close();
                if (is_array($languages)) {
                        return json_encode($languages);
@@ -1637,7 +1750,7 @@ class Item
                        // or it had been done by a "regular" contact.
                        if (!empty($arr['wall'])) {
                                $condition = ['id' => $arr['contact-id']];
-                       } else { 
+                       } else {
                                $condition = ['id' => $arr['contact-id'], 'self' => false];
                        }
                        DBA::update('contact', ['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']], $condition);
@@ -1690,7 +1803,7 @@ class Item
                                        return ("[bookmark=" . str_replace("#", "#", $match[1]) . "]" . str_replace("#", "#", $match[2]) . "[/bookmark]");
                                }, $body);
 
-                       $body = preg_replace_callback("/\[attachment (.*)\](.*?)\[\/attachment\]/ism",
+                       $body = preg_replace_callback("/\[attachment (.*?)\](.*?)\[\/attachment\]/ism",
                                function ($match) {
                                        return ("[attachment " . str_replace("#", "#", $match[1]) . "]" . $match[2] . "[/attachment]");
                                }, $body);
@@ -1772,7 +1885,7 @@ class Item
                                }
                        }
                }
-               
+
                if (!$mention) {
                        if (($community_page || $prvgroup) &&
                                  !$item['wall'] && !$item['origin'] && ($item['gravity'] == GRAVITY_PARENT)) {
@@ -1800,6 +1913,15 @@ class Item
                        return false;
                }
 
+               self::performActivity($item['id'], 'announce', $uid);
+
+               /**
+                * All the following lines are only needed for private forums and compatibility to older systems without AP support.
+                * A possible way would be that the followers list of a forum would always be readable by all followers.
+                * So this would mean that the comment distribution could be done exactly for the intended audience.
+                * Or possibly we could store the receivers that had been in the "announce" message above and use this.
+                */
+
                // now change this copy of the post to a forum head message and deliver to all the tgroup members
                $self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'], ['uid' => $uid, 'self' => true]);
                if (!DBA::isResult($self)) {
@@ -1809,8 +1931,13 @@ class Item
                $owner_id = Contact::getIdForURL($self['url']);
 
                // also reset all the privacy bits to the forum default permissions
-
-               $private = ($user['allow_cid'] || $user['allow_gid'] || $user['deny_cid'] || $user['deny_gid']) ? self::PRIVATE : self::PUBLIC;
+               if ($user['allow_cid'] || $user['allow_gid'] || $user['deny_cid'] || $user['deny_gid']) {
+                       $private = self::PRIVATE;
+               } elseif (DI::pConfig()->get($user['uid'], 'system', 'unlisted')) {
+                       $private = self::UNLISTED;
+               } else {
+                       $private = self::PUBLIC;
+               }
 
                $psid = PermissionSet::getIdFromACL(
                        $user['uid'],
@@ -1828,8 +1955,6 @@ class Item
 
                Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'Notifier', Delivery::POST, (int)$item['uri-id'], (int)$item['uid']);
 
-               self::performActivity($item['id'], 'announce', $uid);
-
                return false;
        }
 
@@ -1939,13 +2064,6 @@ class Item
                        $result = true;
                }
 
-               // Trigger automatic reactions for addons
-               $datarray['api_source'] = true;
-
-               // We have to tell the hooks who we are - this really should be improved
-               $_SESSION['authenticated'] = true;
-               $_SESSION['uid'] = $contact['uid'];
-
                return (bool)$result;
        }
 
@@ -2157,7 +2275,7 @@ class Item
 
                        // Only expire posts, not photos and photo comments
 
-                       if (!$expire_photos && (!empty($item['resource-id']) || ($item['post-type'] == self::PT_IMAGE))) {
+                       if (!$expire_photos && !empty($item['resource-id'])) {
                                continue;
                        } elseif (!$expire_starred && intval($item['starred'])) {
                                continue;
@@ -2432,10 +2550,10 @@ class Item
 
        /**
         * Get a permission SQL string for the given user
-        * 
-        * @param int $owner_id 
-        * @param string $table 
-        * @return string 
+        *
+        * @param int $owner_id
+        * @param string $table
+        * @return string
         */
        public static function getPermissionsSQLByUserId(int $owner_id, string $table = '')
        {
@@ -2525,7 +2643,7 @@ class Item
                ) {
                        self::addRedirToImageTags($item);
 
-                       $item['rendered-html'] = BBCode::convert($item['body']);
+                       $item['rendered-html'] = BBCode::convertForUriId($item['uri-id'], $item['body']);
                        $item['rendered-hash'] = hash('md5', BBCode::VERSION . '::' . $body);
 
                        $hook_data = ['item' => $item, 'rendered-html' => $item['rendered-html'], 'rendered-hash' => $item['rendered-hash']];
@@ -2566,7 +2684,7 @@ class Item
                                        continue;
                                }
 
-                               if ((local_user() == $item['uid']) && ($item['private'] == self::PRIVATE) && ($item['contact-id'] != $app->contact['id']) && ($item['network'] == Protocol::DFRN)) {
+                               if ((local_user() == $item['uid']) && ($item['private'] == self::PRIVATE) && ($item['contact-id'] != $app->getContactId()) && ($item['network'] == Protocol::DFRN)) {
                                        $img_url = 'redir/' . $item['contact-id'] . '?url=' . urlencode($mtch[1]);
                                        $item['body'] = str_replace($mtch[0], '[img]' . $img_url . '[/img]', $item['body']);
                                }
@@ -2607,6 +2725,29 @@ class Item
                $item['hashtags'] = $tags['hashtags'];
                $item['mentions'] = $tags['mentions'];
 
+               $body = $item['body'] ?? '';
+               $shared = BBCode::fetchShareAttributes($body);
+               if (!empty($shared['guid'])) {
+                       $shared_item = Post::selectFirst(['uri-id', 'plink'], ['guid' => $shared['guid']]);
+                       $shared_uri_id = $shared_item['uri-id'] ?? 0;
+                       $shared_links = [strtolower($shared_item['plink'] ?? '')];
+                       $shared_attachments = Post\Media::splitAttachments($shared_uri_id, $shared['guid']);
+                       $shared_links = array_merge($shared_links, array_column($shared_attachments['visual'], 'url'));
+                       $shared_links = array_merge($shared_links, array_column($shared_attachments['link'], 'url'));
+                       $shared_links = array_merge($shared_links, array_column($shared_attachments['additional'], 'url'));
+                       $item['body'] = self::replaceVisualAttachments($shared_attachments, $item['body']);
+               } else {
+                       $shared_uri_id = 0;
+                       $shared_links = [];
+               }
+               $attachments = Post\Media::splitAttachments($item['uri-id'], $item['guid'] ?? '', $shared_links);
+               $item['body'] = self::replaceVisualAttachments($attachments, $item['body'] ?? '');
+
+               $item['body'] = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", "\n", $item['body']);
+               self::putInCache($item);
+               $item['body'] = $body;
+               $s = $item["rendered-html"];
+
                // Compile eventual content filter reasons
                $filter_reasons = [];
                if (!$is_preview && public_contact() != $item['author-id']) {
@@ -2614,6 +2755,8 @@ class Item
                                $filter_reasons[] = DI::l10n()->t('Content warning: %s', $item['content-warning']);
                        }
 
+                       $item['attachments'] = $attachments;
+
                        $hook_data = [
                                'item' => $item,
                                'filter_reasons' => $filter_reasons
@@ -2623,9 +2766,6 @@ class Item
                        unset($hook_data);
                }
 
-               self::putInCache($item);
-               $s = $item["rendered-html"];
-
                $hook_data = [
                        'item' => $item,
                        'html' => $s,
@@ -2643,50 +2783,16 @@ class Item
                        return $s;
                }
 
-               $as = '';
-               $vhead = false;
-               foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]) as $attachment) {
-                       $mime = $attachment['mimetype'];
-
-                       $author = ['uid' => 0, 'id' => $item['author-id'],
-                               'network' => $item['author-network'], 'url' => $item['author-link']];
-                       $the_url = Contact::magicLinkByContact($author, $attachment['url']);
-
-                       if (strpos($mime, 'video') !== false) {
-                               if (!$vhead) {
-                                       $vhead = true;
-                                       DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('videos_head.tpl'));
-                               }
-
-                               $as .= Renderer::replaceMacros(Renderer::getMarkupTemplate('video_top.tpl'), [
-                                       '$video' => [
-                                               'id'     => $item['author-id'],
-                                               'title'  => DI::l10n()->t('View Video'),
-                                               'src'    => $the_url,
-                                               'mime'   => $mime,
-                                       ],
-                               ]);
-                       }
-
-                       $filetype = strtolower(substr($mime, 0, strpos($mime, '/')));
-                       if ($filetype) {
-                               $filesubtype = strtolower(substr($mime, strpos($mime, '/') + 1));
-                               $filesubtype = str_replace('.', '-', $filesubtype);
-                       } else {
-                               $filetype = 'unkn';
-                               $filesubtype = 'unkn';
-                       }
-
-                       $title = Strings::escapeHtml(trim(($attachment['description'] ?? '') ?: $attachment['url']));
-                       $title .= ' ' . ($attachment['size'] ?? 0) . ' ' . DI::l10n()->t('bytes');
-
-                       $icon = '<div class="attachtype icon s22 type-' . $filetype . ' subtype-' . $filesubtype . '"></div>';
-                       $as .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="_blank" rel="noopener noreferrer" >' . $icon . '</a>';
+               if (!empty($shared_attachments)) {
+                       $s = self::addVisualAttachments($shared_attachments, $item, $s, true);
+                       $s = self::addLinkAttachment($shared_uri_id ?: $item['uri-id'], $shared_attachments, $body, $s, true, []);
+                       $s = self::addNonVisualAttachments($shared_attachments, $item, $s, true);
+                       $body = preg_replace("/\s*\[share .*?\].*?\[\/share\]\s*/ism", '', $body);
                }
 
-               if ($as != '') {
-                       $s .= '<div class="body-attach">'.$as.'<div class="clear"></div></div>';
-               }
+               $s = self::addVisualAttachments($attachments, $item, $s, false);
+               $s = self::addLinkAttachment($item['uri-id'], $attachments, $body, $s, false, $shared_links);
+               $s = self::addNonVisualAttachments($attachments, $item, $s, false);
 
                // Map.
                if (strpos($s, '<div class="map">') !== false && !empty($item['coord'])) {
@@ -2697,8 +2803,8 @@ class Item
                }
 
                // Replace friendica image url size with theme preference.
-               if (!empty($a->theme_info['item_image_size'])) {
-                       $ps = $a->theme_info['item_image_size'];
+               if (!empty($a->getThemeInfoValue('item_image_size'))) {
+                       $ps = $a->getThemeInfoValue('item_image_size');
                        $s = preg_replace('|(<img[^>]+src="[^"]+/photo/[0-9a-f]+)-[0-9]|', "$1-" . $ps, $s);
                }
 
@@ -2710,6 +2816,307 @@ class Item
                return $hook_data['html'];
        }
 
+       /**
+        * Check if the body contains a link
+        *
+        * @param string $body
+        * @param string $url
+        * @param int    $type
+        * @return bool
+        */
+       public static function containsLink(string $body, string $url, int $type = 0)
+       {
+               // Make sure that for example site parameters aren't used when testing if the link is contained in the body
+               $urlparts = parse_url($url);
+               unset($urlparts['query']);
+               unset($urlparts['fragment']);
+               $url = Network::unparseURL($urlparts);
+
+               // Remove media links to only search in embedded content
+               // @todo Check images for image link, audio for audio links, ...
+               if (in_array($type, [Post\Media::AUDIO, Post\Media::VIDEO, Post\Media::IMAGE])) {
+                       $body = preg_replace("/\[url=[^\[\]]*\](.*)\[\/url\]/Usi", ' $1 ', $body);
+               }
+
+               if (strpos($body, $url)) {
+                       return true;
+               }
+               foreach ([0, 1, 2] as $size) {
+                       if (preg_match('#/photo/.*-' . $size . '\.#ism', $url) &&
+                               strpos(preg_replace('#(/photo/.*)-[012]\.#ism', '$1-' . $size . '.', $body), $url)) {
+                               return true;
+                       }
+               }
+               return false;
+       }
+
+       /**
+        * Replace visual attachments in the body
+        *
+        * @param array $attachments
+        * @param string $body
+        * @return string modified body
+        */
+       private static function replaceVisualAttachments(array $attachments, string $body)
+       {
+               DI::profiler()->startRecording('rendering');
+
+               foreach ($attachments['visual'] as $attachment) {
+                       if (!empty($attachment['preview'])) {
+                               $body = str_replace($attachment['preview'], Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_LARGE), $body);
+                       } elseif ($attachment['filetype'] == 'image') {
+                               $body = str_replace($attachment['url'], Post\Media::getUrlForId($attachment['id']), $body);
+                       }
+               }
+               DI::profiler()->stopRecording();
+               return $body;
+       }
+
+       /**
+        * Add visual attachments to the content
+        *
+        * @param array $attachments
+        * @param array $item
+        * @param string $content
+        * @return string modified content
+        */
+       private static function addVisualAttachments(array $attachments, array $item, string $content, bool $shared)
+       {
+               DI::profiler()->startRecording('rendering');
+               $leading = '';
+               $trailing = '';
+
+               // @todo In the future we should make a single for the template engine with all media in it. This allows more flexibilty.
+               foreach ($attachments['visual'] as $attachment) {
+                       if (self::containsLink($item['body'], $attachment['preview'] ?? $attachment['url'], $attachment['type'])) {
+                               continue;
+                       }
+
+                       if (!empty($attachment['preview'])) {
+                               $preview_url = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_LARGE);
+                       } else {
+                               $preview_url = '';
+                       }
+
+                       if (($attachment['filetype'] == 'video')) {
+                               /// @todo Move the template to /content as well
+                               $media = Renderer::replaceMacros(Renderer::getMarkupTemplate('video_top.tpl'), [
+                                       '$video' => [
+                                               'id'      => $attachment['id'],
+                                               'src'     => $attachment['url'],
+                                               'name'    => $attachment['name'] ?: $attachment['url'],
+                                               'preview' => $preview_url,
+                                               'mime'    => $attachment['mimetype'],
+                                       ],
+                               ]);
+                               if (($item['post-type'] ?? null) == Item::PT_VIDEO) {
+                                       $leading .= $media;
+                               } else {
+                                       $trailing .= $media;
+                               }
+                       } elseif ($attachment['filetype'] == 'audio') {
+                               $media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/audio.tpl'), [
+                                       '$audio' => [
+                                               'id'     => $attachment['id'],
+                                               'src'    => $attachment['url'],
+                                               'name'   => $attachment['name'] ?: $attachment['url'],
+                                               'mime'   => $attachment['mimetype'],
+                                       ],
+                               ]);
+                               if (($item['post-type'] ?? null) == Item::PT_AUDIO) {
+                                       $leading .= $media;
+                               } else {
+                                       $trailing .= $media;
+                               }
+                       } elseif ($attachment['filetype'] == 'image') {
+                               $media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image.tpl'), [
+                                       '$image' => [
+                                               'src'        => Post\Media::getUrlForId($attachment['id']),
+                                               'preview'    => Post\Media::getPreviewUrlForId($attachment['id'], ($attachment['width'] > $attachment['height']) ? Proxy::SIZE_MEDIUM : Proxy::SIZE_LARGE),
+                                               'attachment' => $attachment,
+                                       ],
+                               ]);
+                               // On Diaspora posts the attached pictures are leading
+                               if ($item['network'] == Protocol::DIASPORA) {
+                                       $leading .= $media;
+                               } else {
+                                       $trailing .= $media;
+                               }
+                       }
+               }
+
+               if ($shared) {
+                       $content = str_replace(BBCode::TOP_ANCHOR, '<div class="body-attach">' . $leading . '<div class="clear"></div></div>' . BBCode::TOP_ANCHOR, $content);
+                       $content = str_replace(BBCode::BOTTOM_ANCHOR, '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>' . BBCode::BOTTOM_ANCHOR, $content);
+               } else {
+                       if ($leading != '') {
+                               $content = '<div class="body-attach">' . $leading . '<div class="clear"></div></div>' . $content;
+                       }
+
+                       if ($trailing != '') {
+                               $content .= '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>';
+                       }
+               }
+
+               DI::profiler()->stopRecording();
+               return $content;
+       }
+
+       /**
+        * Add link attachment to the content
+        *
+        * @param array  $attachments
+        * @param string $body
+        * @param string $content
+        * @param bool   $shared
+        * @param array  $ignore_links A list of URLs to ignore
+        * @return string modified content
+        */
+       private static function addLinkAttachment(int $uriid, array $attachments, string $body, string $content, bool $shared, array $ignore_links)
+       {
+               DI::profiler()->startRecording('rendering');
+               // @ToDo Check only for audio and video
+               $preview = empty($attachments['visual']);
+
+               if (!empty($attachments['link'])) {
+                       foreach ($attachments['link'] as $link) {
+                               $found = false;
+                               foreach ($ignore_links as $ignore_link) {
+                                       if (Strings::compareLink($link['url'], $ignore_link)) {
+                                               $found = true;
+                                       }
+                               }
+                               // @todo Judge between the links to use the one with most information
+                               if (!$found && (empty($attachment) || !empty($link['author-name']) ||
+                                       (empty($attachment['name']) && !empty($link['name'])) ||
+                                       (empty($attachment['description']) && !empty($link['description'])) ||
+                                       (empty($attachment['preview']) && !empty($link['preview'])))) {
+                                       $attachment = $link;
+                               }
+                       }
+               }
+
+               if (!empty($attachment)) {
+                       $data = [
+                               'after' => '',
+                               'author_name' => $attachment['author-name'] ?? '',
+                               'author_url' =>  $attachment['author-url'] ?? '',
+                               'description' => $attachment['description'] ?? '',
+                               'image' => '',
+                               'preview' => '',
+                               'provider_name' => $attachment['publisher-name'] ?? '',
+                               'provider_url' => $attachment['publisher-url'] ?? '',
+                               'text' => '',
+                               'title' => $attachment['name'] ?? '',
+                               'type' => 'link',
+                               'url' => $attachment['url']];
+
+                       if ($preview && !empty($attachment['preview'])) {
+                               if ($attachment['preview-width'] >= 500) {
+                                       $data['image'] = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_MEDIUM);
+                               } else {
+                                       $data['preview'] = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_MEDIUM);
+                               }
+                       }
+
+                       if (!empty($data['description']) && !empty($content)) {
+                               similar_text($data['description'], $content, $percent);
+                       } else {
+                               $percent = 0;
+                       }
+
+                       if (!empty($data['description']) && (($data['title'] == $data['description']) || ($percent > 95) || (strpos($content, $data['description']) !== false))) {
+                               $data['description'] = '';
+                       }
+
+                       if (($data['author_name'] ?? '') == ($data['provider_name'] ?? '')) {
+                               $data['author_name'] = '';
+                       }
+
+                       if (($data['author_url'] ?? '') == ($data['provider_url'] ?? '')) {
+                               $data['author_url'] = '';
+                       }
+               } elseif (preg_match("/.*(\[attachment.*?\].*?\[\/attachment\]).*/ism", $body, $match)) {
+                       $data = BBCode::getAttachmentData($match[1]);
+               }
+               DI::profiler()->stopRecording();
+
+               if (isset($data['url']) && !in_array($data['url'], $ignore_links)) {
+                       if (!empty($data['description']) || !empty($data['image']) || !empty($data['preview'])) {
+                               $parts = parse_url($data['url']);
+                               if (!empty($parts['scheme']) && !empty($parts['host'])) {
+                                       if (empty($data['provider_name'])) {
+                                               $data['provider_name'] = $parts['host'];
+                                       }
+                                       if (empty($data['provider_url']) || empty(parse_url($data['provider_url'], PHP_URL_SCHEME))) {
+                                               $data['provider_url'] = $parts['scheme'] . '://' . $parts['host'];
+
+                                               if (!empty($parts['port'])) {
+                                                       $data['provider_url'] .= ':' . $parts['port'];
+                                               }
+                                       }
+                               }
+
+                               // @todo Use a template
+                               $rendered = BBCode::convertAttachment('', BBCode::INTERNAL, false, $data, $uriid);
+                       } elseif (!self::containsLink($content, $data['url'], Post\Media::HTML)) {
+                               $rendered = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/link.tpl'), [
+                                       '$url'  => $data['url'],
+                                       '$title' => $data['title'],
+                               ]);
+                       } else {
+                               return $content;
+                       }
+
+                       if ($shared) {
+                               return str_replace(BBCode::BOTTOM_ANCHOR, BBCode::BOTTOM_ANCHOR . $rendered, $content);
+                       } else {
+                               return $content . $rendered;
+                       }
+               }
+               return $content;
+       }
+
+       /**
+        * Add non visual attachments to the content
+        *
+        * @param array $attachments
+        * @param array $item
+        * @param string $content
+        * @return string modified content
+        */
+       private static function addNonVisualAttachments(array $attachments, array $item, string $content)
+       {
+               DI::profiler()->startRecording('rendering');
+               $trailing = '';
+               foreach ($attachments['additional'] as $attachment) {
+                       if (strpos($item['body'], $attachment['url'])) {
+                               continue;
+                       }
+
+                       $author = ['uid' => 0, 'id' => $item['author-id'],
+                               'network' => $item['author-network'], 'url' => $item['author-link']];
+                       $the_url = Contact::magicLinkByContact($author, $attachment['url']);
+
+                       $title = Strings::escapeHtml(trim(($attachment['description'] ?? '') ?: $attachment['url']));
+
+                       if (!empty($attachment['size'])) {
+                               $title .= ' ' . $attachment['size'] . ' ' . DI::l10n()->t('bytes');
+                       }
+
+                       /// @todo Use a template
+                       $icon = '<div class="attachtype icon s22 type-' . $attachment['filetype'] . ' subtype-' . $attachment['subtype'] . '"></div>';
+                       $trailing .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="_blank" rel="noopener noreferrer" >' . $icon . '</a>';
+               }
+
+               if ($trailing != '') {
+                       $content .= '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>';
+               }
+
+               DI::profiler()->stopRecording();
+               return $content;
+       }
+
        /**
         * get private link for item
         *
@@ -2724,18 +3131,19 @@ class Item
                                'href' => "display/" . $item['guid'],
                                'orig' => "display/" . $item['guid'],
                                'title' => DI::l10n()->t('View on separate page'),
-                               'orig_title' => DI::l10n()->t('view on separate page'),
+                               'orig_title' => DI::l10n()->t('View on separate page'),
                        ];
 
                        if (!empty($item['plink'])) {
-                               $ret["href"] = DI::baseUrl()->remove($item['plink']);
-                               $ret["title"] = DI::l10n()->t('link to source');
+                               $ret['href'] = DI::baseUrl()->remove($item['plink']);
+                               $ret['title'] = DI::l10n()->t('Link to source');
                        }
                } elseif (!empty($item['plink']) && ($item['private'] != self::PRIVATE)) {
                        $ret = [
                                'href' => $item['plink'],
                                'orig' => $item['plink'],
-                               'title' => DI::l10n()->t('link to source'),
+                               'title' => DI::l10n()->t('Link to source'),
+                               'orig_title' => DI::l10n()->t('Link to source'),
                        ];
                } else {
                        $ret = [];
@@ -2798,8 +3206,8 @@ class Item
        }
 
        /**
-        * Return the URI for a link to the post 
-        * 
+        * Return the URI for a link to the post
+        *
         * @param string $uri URI or link to post
         *
         * @return string URI
@@ -2973,4 +3381,41 @@ class Item
 
                return true;
        }
+
+       /**
+        * Improve the data in shared posts
+        *
+        * @param array $item
+        * @return string body
+        */
+       public static function improveSharedDataInBody(array $item)
+       {
+               $shared = BBCode::fetchShareAttributes($item['body']);
+               if (empty($shared['link'])) {
+                       return $item['body'];
+               }
+
+               $id = self::fetchByLink($shared['link']);
+               Logger::info('Fetched shared post', ['uri-id' => $item['uri-id'], 'id' => $id, 'author' => $shared['profile'], 'url' => $shared['link'], 'guid' => $shared['guid'], 'callstack' => System::callstack()]);
+               if (!$id) {
+                       return $item['body'];
+               }
+
+               $shared_item = Post::selectFirst(['author-name', 'author-link', 'author-avatar', 'plink', 'created', 'guid', 'title', 'body'], ['id' => $id]);
+               if (!DBA::isResult($shared_item)) {
+                       return $item['body'];
+               }
+
+               $shared_content = BBCode::getShareOpeningTag($shared_item['author-name'], $shared_item['author-link'], $shared_item['author-avatar'], $shared_item['plink'], $shared_item['created'], $shared_item['guid']);
+
+               if (!empty($shared_item['title'])) {
+                       $shared_content .= '[h3]'.$shared_item['title'].'[/h3]'."\n";
+               }
+
+               $shared_content .= $shared_item['body'];
+
+               $item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $shared_content . '[/share]', $item['body']);
+               Logger::info('New shared data', ['uri-id' => $item['uri-id'], 'id' => $id, 'shared_item' => $shared_item]);
+               return $item['body'];
+       }
 }