]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Item.php
Some more improvements for posts with shares
[friendica.git] / src / Model / Item.php
index 38191853551dc37203cfc8904a209369095042c7..ced18fc8a68f74aed8557da4522580aa8eb2c73d 100644 (file)
@@ -27,7 +27,6 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Model\Tag;
 use Friendica\Core\Worker;
@@ -93,7 +92,7 @@ class Item
                'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink',
                'wall', 'private', 'starred', 'origin', 'parent-origin', 'title', 'body', 'language',
                'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object',
-               'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'mention', 'global',
+               'quote-uri', 'quote-uri-id', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'mention', 'global',
                'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network', 'author-updated', 'author-gsid', 'author-addr', 'author-uri-id',
                'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network', 'owner-contact-type', 'owner-updated',
                'causer-id', 'causer-link', 'causer-name', 'causer-avatar', 'causer-contact-type', 'causer-network',
@@ -113,9 +112,9 @@ class Item
                        'private', 'title', 'body', 'raw-body', 'location', 'coord', 'app',
                        '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',
+                       'author-id', 'author-addr', 'author-link', 'author-name', 'author-avatar', 'owner-id', 'owner-link', 'contact-uid',
                        'signed_text', 'network', 'wall', 'contact-id', 'plink', 'origin',
-                       'thr-parent-id', 'parent-uri-id', 'postopts', 'pubmail',
+                       'thr-parent-id', 'parent-uri-id', 'quote-uri', 'quote-uri-id', 'postopts', 'pubmail',
                        'event-created', 'event-edited', 'event-start', 'event-finish',
                        'event-summary', 'event-desc', 'event-location', 'event-type',
                        'event-nofinish', 'event-ignore', 'event-id'];
@@ -123,7 +122,7 @@ class Item
        // All fields in the item table
        const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent',
                        'guid', 'uri-id', 'parent-uri-id', 'thr-parent-id', 'conversation', 'vid',
-                       'contact-id', 'wall', 'gravity', 'extid', 'psid',
+                       'quote-uri', 'quote-uri-id', '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', 'post-reason',
@@ -146,6 +145,12 @@ class Item
        const PRIVATE = 1;
        const UNLISTED = 2;
 
+       // Item weight for query ordering
+       const GRAVITY_PARENT   = 0;
+       const GRAVITY_ACTIVITY = 3;
+       const GRAVITY_COMMENT  = 6;
+       const GRAVITY_UNKNOWN  = 9;
+
        /**
         * Update existing item entries
         *
@@ -232,7 +237,7 @@ class Item
 
                foreach ($notify_items as $notify_item) {
                        $post = Post::selectFirst(['uri-id', 'uid'], ['id' => $notify_item]);
-                       Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::POST, (int)$post['uri-id'], (int)$post['uid']);
+                       Worker::add(Worker::PRIORITY_HIGH, 'Notifier', Delivery::POST, (int)$post['uri-id'], (int)$post['uid']);
                }
 
                return $rows;
@@ -246,7 +251,7 @@ class Item
         * @return void
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function markForDeletion(array $condition, int $priority = PRIORITY_HIGH)
+       public static function markForDeletion(array $condition, int $priority = Worker::PRIORITY_HIGH)
        {
                $items = Post::select(['id'], $condition);
                while ($item = Post::fetch($items)) {
@@ -277,7 +282,7 @@ class Item
                        }
 
                        if ($item['uid'] == $uid) {
-                               self::markForDeletionById($item['id'], PRIORITY_HIGH);
+                               self::markForDeletionById($item['id'], Worker::PRIORITY_HIGH);
                        } elseif ($item['uid'] != 0) {
                                Logger::warning('Wrong ownership. Not deleting item', ['id' => $item['id']]);
                        }
@@ -293,7 +298,7 @@ class Item
         * @return boolean success
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function markForDeletionById(int $item_id, int $priority = PRIORITY_HIGH): bool
+       public static function markForDeletionById(int $item_id, int $priority = Worker::PRIORITY_HIGH): bool
        {
                Logger::info('Mark item for deletion by id', ['id' => $item_id, 'callstack' => System::callstack()]);
                // locate item to be deleted
@@ -356,7 +361,7 @@ class Item
                Post\DeliveryData::delete($item['uri-id']);
 
                // If it's the parent of a comment thread, kill all the kids
-               if ($item['gravity'] == GRAVITY_PARENT) {
+               if ($item['gravity'] == self::GRAVITY_PARENT) {
                        self::markForDeletion(['parent' => $item['parent'], 'deleted' => false], $priority);
                }
 
@@ -463,7 +468,7 @@ class Item
                        }
                }
 
-               if ($item['gravity'] == GRAVITY_PARENT) {
+               if ($item['gravity'] == self::GRAVITY_PARENT) {
                        if (Contact::isSharingByURL($item['owner-link'], $item['uid'], true)) {
                                $contact_id = Contact::getIdForURL($item['owner-link'], $item['uid']);
                        } else {
@@ -714,7 +719,7 @@ class Item
                        return 0;
                }
 
-               if ($thread_parent['gravity'] == GRAVITY_PARENT) {
+               if ($thread_parent['gravity'] == Item::GRAVITY_PARENT) {
                        return $uriid;
                }
 
@@ -791,17 +796,17 @@ class Item
                if (isset($item['gravity'])) {
                        return intval($item['gravity']);
                } elseif ($item['parent-uri-id'] === $item['uri-id']) {
-                       return GRAVITY_PARENT;
+                       return self::GRAVITY_PARENT;
                } elseif ($activity->match($item['verb'], Activity::POST)) {
-                       return GRAVITY_COMMENT;
+                       return self::GRAVITY_COMMENT;
                } elseif ($activity->match($item['verb'], Activity::FOLLOW)) {
-                       return GRAVITY_ACTIVITY;
+                       return self::GRAVITY_ACTIVITY;
                } elseif ($activity->match($item['verb'], Activity::ANNOUNCE)) {
-                       return GRAVITY_ACTIVITY;
+                       return self::GRAVITY_ACTIVITY;
                }
 
                Logger::info('Unknown gravity for verb', ['verb' => $item['verb']]);
-               return GRAVITY_UNKNOWN;   // Should not happen
+               return self::GRAVITY_UNKNOWN;   // Should not happen
        }
 
        /**
@@ -816,7 +821,7 @@ class Item
        {
                $orig_item = $item;
 
-               $priority = PRIORITY_HIGH;
+               $priority = Worker::PRIORITY_HIGH;
 
                // If it is a posting where users should get notifications, then define it as wall posting
                if ($notify) {
@@ -826,7 +831,7 @@ class Item
                        $item['protocol'] = Conversation::PARCEL_DIRECT;
                        $item['direction'] = Conversation::PUSH;
 
-                       if (is_int($notify) && in_array($notify, PRIORITIES)) {
+                       if (is_int($notify) && in_array($notify, Worker::PRIORITIES)) {
                                $priority = $notify;
                        }
                } else {
@@ -965,7 +970,7 @@ class Item
                        return 0;
                }
 
-               if ($item['gravity'] !== GRAVITY_PARENT) {
+               if ($item['gravity'] !== self::GRAVITY_PARENT) {
                        $toplevel_parent = self::getTopLevelParent($item);
                        if (empty($toplevel_parent)) {
                                return 0;
@@ -1060,7 +1065,7 @@ class Item
                        }
 
                        // We have to tell the hooks who we are - this really should be improved
-                       if (!local_user()) {
+                       if (!DI::userSession()->getLocalUserId()) {
                                $_SESSION['authenticated'] = true;
                                $_SESSION['uid'] = $uid;
                                $dummy_session = true;
@@ -1119,6 +1124,13 @@ class Item
                $item['raw-body'] = Post\Media::insertFromBody($item['uri-id'], $item['raw-body']);
                $item['raw-body'] = self::setHashtags($item['raw-body']);
 
+               $quote_id = self::getQuoteUriId($item['body']);
+
+               if (!empty($quote_id) && Post::exists(['uri-id' => $quote_id, 'network' => Protocol::FEDERATED])) {
+                       $item['quote-uri-id'] = $quote_id;
+                       $item['raw-body'] = BBCode::removeSharedData($item['raw-body']);
+               }
+
                if (!DBA::exists('contact', ['id' => $item['author-id'], 'network' => Protocol::DFRN])) {
                        Post\Media::insertFromRelevantUrl($item['uri-id'], $item['raw-body']);
                }
@@ -1178,7 +1190,7 @@ class Item
 
                Post::insert($item['uri-id'], $item);
 
-               if ($item['gravity'] == GRAVITY_PARENT) {
+               if ($item['gravity'] == self::GRAVITY_PARENT) {
                        Post\Thread::insert($item['uri-id'], $item);
                }
 
@@ -1187,7 +1199,7 @@ class Item
                }
 
                // Create Diaspora signature
-               if ($item['origin'] && empty($item['diaspora_signed_text']) && ($item['gravity'] != GRAVITY_PARENT)) {
+               if ($item['origin'] && empty($item['diaspora_signed_text']) && ($item['gravity'] != self::GRAVITY_PARENT)) {
                        $signed = Diaspora::createCommentSignature($item);
                        if (!empty($signed)) {
                                $item['diaspora_signed_text'] = json_encode($signed);
@@ -1227,7 +1239,7 @@ class Item
                        return 0;
                }
 
-               if ($item['gravity'] == GRAVITY_PARENT) {
+               if ($item['gravity'] == self::GRAVITY_PARENT) {
                        $item['post-user-id'] = $post_user_id;
                        Post\ThreadUser::insert($item['uri-id'], $item['uid'], $item);
                }
@@ -1245,7 +1257,7 @@ class Item
                // update the commented timestamp on the parent
                if (DI::config()->get('system', 'like_no_comment')) {
                        // Update when it is a comment
-                       $update_commented = in_array($posted_item['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT]);
+                       $update_commented = in_array($posted_item['gravity'], [self::GRAVITY_PARENT, self::GRAVITY_COMMENT]);
                } else {
                        // Update when it isn't a follow or tag verb
                        $update_commented = !in_array($posted_item['verb'], [Activity::FOLLOW, Activity::TAG]);
@@ -1269,7 +1281,7 @@ class Item
                }
 
                if ($notify) {
-                       if (!\Friendica\Content\Feature::isEnabled($posted_item['uid'], 'explicit_mentions') && ($posted_item['gravity'] == GRAVITY_COMMENT)) {
+                       if (!\Friendica\Content\Feature::isEnabled($posted_item['uid'], 'explicit_mentions') && ($posted_item['gravity'] == self::GRAVITY_COMMENT)) {
                                Tag::createImplicitMentions($posted_item['uri-id'], $posted_item['thr-parent-id']);
                        }
                        Hook::callAll('post_local_end', $posted_item);
@@ -1277,7 +1289,7 @@ class Item
                        Hook::callAll('post_remote_end', $posted_item);
                }
 
-               if ($posted_item['gravity'] === GRAVITY_PARENT) {
+               if ($posted_item['gravity'] === self::GRAVITY_PARENT) {
                        self::addShadow($post_user_id);
                } else {
                        self::addShadowPost($post_user_id);
@@ -1312,7 +1324,7 @@ class Item
                }
 
                // Fill the cache with the rendered content.
-               if (in_array($posted_item['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT]) && ($posted_item['uid'] == 0)) {
+               if (in_array($posted_item['gravity'], [self::GRAVITY_PARENT, self::GRAVITY_COMMENT]) && ($posted_item['uid'] == 0)) {
                        self::updateDisplayCache($posted_item['uri-id']);
                }
 
@@ -1328,7 +1340,7 @@ class Item
         */
        public static function getPostReason(array $item): int
        {
-               $actor = ($item['gravity'] == GRAVITY_PARENT) ? $item['owner-id'] : $item['author-id'];
+               $actor = ($item['gravity'] == self::GRAVITY_PARENT) ? $item['owner-id'] : $item['author-id'];
                if (empty($item['origin']) && ($item['uid'] != 0) && Contact::isSharing($actor, $item['uid'])) {
                        return self::PR_FOLLOWER;
                }
@@ -1409,7 +1421,7 @@ class Item
         */
        private static function distributeByTags(array $item)
        {
-               if (($item['uid'] != 0) || ($item['gravity'] != GRAVITY_PARENT) || !in_array($item['network'], Protocol::FEDERATED)) {
+               if (($item['uid'] != 0) || ($item['gravity'] != self::GRAVITY_PARENT) || !in_array($item['network'], Protocol::FEDERATED)) {
                        return;
                }
 
@@ -1535,7 +1547,7 @@ class Item
                        return 0;
                }
 
-               if (($uid != 0) && ($item['gravity'] == GRAVITY_PARENT)) {
+               if (($uid != 0) && ($item['gravity'] == self::GRAVITY_PARENT)) {
                        $owner = User::getOwnerDataById($uid);
                        if (($owner['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY) && !Tag::isMentioned($uri_id, $owner['url'])) {
                                Logger::info('Target user is a forum but is not mentioned here, thread will not be stored', ['uid' => $uid, 'uri-id' => $uri_id]);
@@ -1552,13 +1564,13 @@ class Item
 
                $item = array_merge($item, $fields);
 
-               if (($uid != 0) && Contact::isSharing(($item['gravity'] == GRAVITY_PARENT) ? $item['owner-id'] : $item['author-id'], $uid)) {
+               if (($uid != 0) && Contact::isSharing(($item['gravity'] == Item::GRAVITY_PARENT) ? $item['owner-id'] : $item['author-id'], $uid)) {
                        $item['post-reason'] = self::PR_FOLLOWER;
                }
 
-               $is_reshare = ($item['gravity'] == GRAVITY_ACTIVITY) && ($item['verb'] == Activity::ANNOUNCE);
+               $is_reshare = ($item['gravity'] == self::GRAVITY_ACTIVITY) && ($item['verb'] == Activity::ANNOUNCE);
 
-               if (($uid != 0) && (($item['gravity'] == GRAVITY_PARENT) || $is_reshare) &&
+               if (($uid != 0) && (($item['gravity'] == self::GRAVITY_PARENT) || $is_reshare) &&
                        DI::pConfig()->get($uid, 'system', 'accept_only_sharer') == self::COMPLETION_NONE &&
                        !in_array($item['post-reason'], [self::PR_FOLLOWER, self::PR_TAG, self::PR_TO, self::PR_CC])) {
                        Logger::info('Contact is not a follower, thread will not be stored', ['author' => $item['author-link'], 'uid' => $uid, 'uri-id' => $uri_id, 'post-reason' => $item['post-reason']]);
@@ -1567,7 +1579,7 @@ class Item
 
                $causer = $item['causer-id'] ?: $item['author-id'];
 
-               if (($uri_id != $item['parent-uri-id']) && ($item['gravity'] == GRAVITY_COMMENT) && !Post::exists(['uri-id' => $item['parent-uri-id'], 'uid' => $uid])) {
+               if (($uri_id != $item['parent-uri-id']) && ($item['gravity'] == self::GRAVITY_COMMENT) && !Post::exists(['uri-id' => $item['parent-uri-id'], 'uid' => $uid])) {
                        if (!self::fetchParent($item['parent-uri-id'], $uid, $causer)) {
                                Logger::info('Parent post had not been added', ['uri-id' => $item['parent-uri-id'], 'uid' => $uid, 'causer' => $causer]);
                                return 0;
@@ -1708,7 +1720,7 @@ class Item
                $item['contact-id'] = self::contactId($item);
 
                $notify = false;
-               if ($item['gravity'] == GRAVITY_PARENT) {
+               if ($item['gravity'] == self::GRAVITY_PARENT) {
                        $contact = DBA::selectFirst('contact', [], ['id' => $item['contact-id'], 'self' => false]);
                        if (DBA::isResult($contact)) {
                                $notify = self::isRemoteSelf($contact, $item);
@@ -1738,7 +1750,7 @@ class Item
        private static function addShadow(int $itemid)
        {
                $fields = ['uid', 'private', 'visible', 'deleted', 'network', 'uri-id'];
-               $condition = ['id' => $itemid, 'gravity' => GRAVITY_PARENT];
+               $condition = ['id' => $itemid, 'gravity' => self::GRAVITY_PARENT];
                $item = Post::selectFirst($fields, $condition);
 
                if (!DBA::isResult($item)) {
@@ -1806,7 +1818,7 @@ class Item
                }
 
                // Is it a toplevel post?
-               if ($item['gravity'] == GRAVITY_PARENT) {
+               if ($item['gravity'] == self::GRAVITY_PARENT) {
                        self::addShadow($itemid);
                        return;
                }
@@ -1868,7 +1880,7 @@ class Item
                        return $item['language'];
                }
 
-               if (!in_array($item['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT]) || empty($item['body'])) {
+               if (!in_array($item['gravity'], [self::GRAVITY_PARENT, self::GRAVITY_COMMENT]) || empty($item['body'])) {
                        return '';
                }
 
@@ -2148,13 +2160,13 @@ class Item
                        return false;
                }
 
-               $item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'origin' => false]);
+               $item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id, 'gravity' => [self::GRAVITY_PARENT, self::GRAVITY_COMMENT], 'origin' => false]);
                if (!DBA::isResult($item)) {
                        Logger::debug('Post is an activity or origin or not found at all, quitting here.', ['id' => $item_id]);
                        return false;
                }
 
-               if ($item['gravity'] == GRAVITY_PARENT) {
+               if ($item['gravity'] == self::GRAVITY_PARENT) {
                        if (Tag::isMentioned($item['uri-id'], $owner['url'])) {
                                Logger::info('Mention found in tag.', ['uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
                        } else {
@@ -2199,7 +2211,7 @@ class Item
         */
        private static function autoReshare(array $item)
        {
-               if ($item['gravity'] != GRAVITY_PARENT) {
+               if ($item['gravity'] != self::GRAVITY_PARENT) {
                        return;
                }
 
@@ -2460,7 +2472,7 @@ class Item
                }
 
                $condition = ["`uid` = ? AND NOT `deleted` AND `gravity` = ?",
-                       $uid, GRAVITY_PARENT];
+                       $uid, self::GRAVITY_PARENT];
 
                /*
                 * $expire_network_only = save your own wall posts
@@ -2667,7 +2679,7 @@ class Item
                        $vids = Verb::getID($activity);
                }
 
-               $condition = ['vid' => $vids, 'deleted' => false, 'gravity' => GRAVITY_ACTIVITY,
+               $condition = ['vid' => $vids, 'deleted' => false, 'gravity' => self::GRAVITY_ACTIVITY,
                        'author-id' => $author_id, 'uid' => $item['uid'], 'thr-parent-id' => $uri_id];
                $like_item = Post::selectFirst(['id', 'guid', 'verb'], $condition);
 
@@ -2721,7 +2733,7 @@ class Item
                        'network'       => Protocol::DFRN,
                        'protocol'      => Conversation::PARCEL_DIRECT,
                        'direction'     => Conversation::PUSH,
-                       'gravity'       => GRAVITY_ACTIVITY,
+                       'gravity'       => self::GRAVITY_ACTIVITY,
                        'parent'        => $item['id'],
                        'thr-parent'    => $item['uri'],
                        'owner-id'      => $author_id,
@@ -2762,8 +2774,8 @@ class Item
         */
        public static function getPermissionsConditionArrayByUserId(int $owner_id): array
        {
-               $local_user = local_user();
-               $remote_user = Session::getRemoteContactID($owner_id);
+               $local_user = DI::userSession()->getLocalUserId();
+               $remote_user = DI::userSession()->getRemoteContactID($owner_id);
 
                // default permissions - anonymous user
                $condition = ["`private` != ?", self::PRIVATE];
@@ -2794,8 +2806,8 @@ class Item
         */
        public static function getPermissionsSQLByUserId(int $owner_id, string $table = ''): string
        {
-               $local_user = local_user();
-               $remote_user = Session::getRemoteContactID($owner_id);
+               $local_user = DI::userSession()->getLocalUserId();
+               $remote_user = DI::userSession()->getRemoteContactID($owner_id);
 
                if (!empty($table)) {
                        $table = DBA::quoteIdentifier($table) . '.';
@@ -2846,9 +2858,9 @@ class Item
                        return $l10n->t('event');
                } elseif (!empty($item['resource-id'])) {
                        return $l10n->t('photo');
-               } elseif ($item['gravity'] == GRAVITY_ACTIVITY) {
+               } elseif ($item['gravity'] == self::GRAVITY_ACTIVITY) {
                        return $l10n->t('activity');
-               } elseif ($item['gravity'] == GRAVITY_COMMENT) {
+               } elseif ($item['gravity'] == self::GRAVITY_COMMENT) {
                        return $l10n->t('comment');
                }
 
@@ -2937,19 +2949,44 @@ class Item
                $item['mentions'] = $tags['mentions'];
 
                $body = $item['body'] ?? '';
-               $shared = BBCode::fetchShareAttributes($body);
-               if (!empty($shared['guid'])) {
-                       $shared_item = Post::selectFirst(['uri-id', 'plink', 'has-media'], ['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_item['has-media'] ?? false);
+
+               $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network', 'has-media'];
+
+               $shared_uri_id = 0;
+               $shared_links  = [];
+
+               $shared = DI::contentItem()->getSharedPost($item, $fields);
+               if (!empty($shared['post'])) {
+                       $shared_item  = $shared['post'];
+                       $quote_uri_id = $shared['post']['uri-id'];
+                       $shared_links[] = strtolower($shared['post']['uri']);
+                       $item['body'] = BBCode::removeSharedData($item['body']);
+               } elseif (empty($shared_item['uri-id']) && empty($item['quote-uri-id'])) {
+                       $media = Post\Media::getByURIId($item['uri-id'], [Post\Media::ACTIVITY]);
+                       if (!empty($media)) {
+                               $shared_item = Post::selectFirst($fields, ['plink' => $media[0]['url'], 'uid' => [$item['uid'], 0]]);
+
+                               if (empty($shared_item['uri-id'])) {
+                                       $shared_item = Post::selectFirst($fields, ['uri' => $media[0]['url'], 'uid' => [$item['uid'], 0]]);
+                                       $shared_links[] = strtolower($media[0]['url']);
+                               }
+
+                               $quote_uri_id = $shared_item['uri-id'] ?? 0;
+                       }
+               }
+
+               if (!empty($quote_uri_id)) {
+                       $item['body'] .= "\n" . DI::contentItem()->createSharedBlockByArray($shared_item);
+               }
+
+               if (!empty($shared_item['uri-id'])) {
+                       $shared_uri_id = $shared_item['uri-id'];
+                       $shared_links[] = strtolower($shared_item['plink']);
+                       $shared_attachments = Post\Media::splitAttachments($shared_uri_id, $shared_item['guid'], [], $shared_item['has-media']);
                        $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['has-media'] ?? false);
@@ -2966,8 +3003,8 @@ class Item
 
                // Compile eventual content filter reasons
                $filter_reasons = [];
-               if (!$is_preview && public_contact() != $item['author-id']) {
-                       if (!empty($item['content-warning']) && (!local_user() || !DI::pConfig()->get(local_user(), 'system', 'disable_cw', false))) {
+               if (!$is_preview && DI::userSession()->getPublicContactId() != $item['author-id']) {
+                       if (!empty($item['content-warning']) && (!DI::userSession()->getLocalUserId() || !DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'disable_cw', false))) {
                                $filter_reasons[] = DI::l10n()->t('Content warning: %s', $item['content-warning']);
                        }
 
@@ -3003,7 +3040,7 @@ class Item
                        $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);
+                       $body = BBCode::removeSharedData($body);
                }
 
                $s = self::addVisualAttachments($attachments, $item, $s, false);
@@ -3271,7 +3308,7 @@ class Item
                }
                DI::profiler()->stopRecording();
 
-               if (isset($data['url']) && !in_array($data['url'], $ignore_links)) {
+               if (isset($data['url']) && !in_array(strtolower($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'])) {
@@ -3403,7 +3440,7 @@ class Item
                        $plink = $item['uri'];
                }
 
-               if (local_user()) {
+               if (DI::userSession()->getLocalUserId()) {
                        $ret = [
                                'href' => "display/" . $item['guid'],
                                'orig' => "display/" . $item['guid'],
@@ -3549,21 +3586,6 @@ class Item
                return 0;
        }
 
-       /**
-        * Return share data from an item array (if the item is shared item)
-        * We are providing the complete Item array, because at some time in the future
-        * we hopefully will define these values not in the body anymore but in some item fields.
-        * This function is meant to replace all similar functions in the system.
-        *
-        * @param array $item
-        *
-        * @return array with share information
-        */
-       public static function getShareArray(array $item): array
-       {
-               return BBCode::fetchShareAttributes($item['body']);
-       }
-
        /**
         * Check a prospective item array against user-level permissions
         *
@@ -3593,7 +3615,7 @@ class Item
                        return false;
                }
 
-               if (!empty($item['causer-id']) && ($item['gravity'] === GRAVITY_PARENT) && Contact\User::isIgnored($item['causer-id'], $user_id)) {
+               if (!empty($item['causer-id']) && ($item['gravity'] === self::GRAVITY_PARENT) && Contact\User::isIgnored($item['causer-id'], $user_id)) {
                        Logger::notice('Causer is ignored by user', ['causer-link' => $item['causer-link'] ?? $item['causer-id'], 'uid' => $user_id, 'item-uri' => $item['uri']]);
                        return false;
                }
@@ -3605,9 +3627,10 @@ class Item
         * Improve the data in shared posts
         *
         * @param array $item
+        * @param bool  $add_media
         * @return string body
         */
-       public static function improveSharedDataInBody(array $item): string
+       public static function improveSharedDataInBody(array $item, bool $add_media = false): string
        {
                $shared = BBCode::fetchShareAttributes($item['body']);
                if (empty($shared['guid']) && empty($shared['message_id'])) {
@@ -3617,7 +3640,7 @@ class Item
                $link = $shared['link'] ?: $shared['message_id'];
 
                if (empty($shared_content)) {
-                       $shared_content = DI::contentItem()->createSharedPostByUrl($link, $item['uid'] ?? 0);
+                       $shared_content = DI::contentItem()->createSharedPostByUrl($link, $item['uid'] ?? 0, $add_media);
                }
 
                if (empty($shared_content)) {
@@ -3629,4 +3652,19 @@ class Item
                Logger::debug('New shared data', ['uri-id' => $item['uri-id'], 'link' => $link, 'guid' => $item['guid']]);
                return $item['body'];
        }
+
+       /**
+        * Fetch the uri-id of a quote
+        *
+        * @param string $body
+        * @return integer
+        */
+       private static function getQuoteUriId(string $body): int
+       {
+               $shared = BBCode::fetchShareAttributes($body);
+               if (empty($shared['message_id'])) {
+                       return 0;
+               }
+               return ItemURI::getIdByURI($shared['message_id']);
+       }
 }