X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=ced18fc8a68f74aed8557da4522580aa8eb2c73d;hb=c65fff6f93e4e33901510343faef69654fd1a97b;hp=8566643ed2eb8a4127a681b5428e51dd1fb07e6c;hpb=bbbbf8fd6b7dec11ddc32304e33a3648568c9625;p=friendica.git

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 8566643ed2..ced18fc8a6 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -27,13 +27,11 @@ 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;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Post;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Diaspora;
@@ -94,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',
@@ -114,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'];
@@ -124,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',
@@ -147,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
 	 *
@@ -233,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;
@@ -247,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)) {
@@ -278,9 +282,9 @@ class Item
 			}
 
 			if ($item['uid'] == $uid) {
-				self::markForDeletionById($item['id'], PRIORITY_HIGH);
+				self::markForDeletionById($item['id'], Worker::PRIORITY_HIGH);
 			} elseif ($item['uid'] != 0) {
-				Logger::notice('Wrong ownership. Not deleting item', ['id' => $item['id']]);
+				Logger::warning('Wrong ownership. Not deleting item', ['id' => $item['id']]);
 			}
 		}
 		DBA::close($items);
@@ -294,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
@@ -357,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);
 		}
 
@@ -448,21 +452,46 @@ class Item
 	 */
 	private static function contactId(array $item): int
 	{
-		if (!empty($item['contact-id']) && DBA::exists('contact', ['self' => true, 'id' => $item['contact-id']])) {
-			return $item['contact-id'];
-		} elseif (($item['gravity'] == GRAVITY_PARENT) && !empty($item['uid']) && !empty($item['contact-id']) && Contact::isSharing($item['contact-id'], $item['uid'])) {
-			return $item['contact-id'];
-		} elseif (!empty($item['uid']) && !Contact::isSharing($item['author-id'], $item['uid'])) {
+		if ($item['uid'] == 0) {
 			return $item['author-id'];
-		} elseif (!empty($item['contact-id'])) {
-			return $item['contact-id'];
-		} else {
-			$contact_id = Contact::getIdForURL($item['author-link'], $item['uid']);
+		}
+
+		if ($item['origin']) {
+			$owner = User::getOwnerDataById($item['uid']);
+			return $owner['id'];
+		}
+
+		if (!empty($item['causer-id']) && Contact::isSharing($item['causer-id'], $item['uid'], true)) {
+			$cdata = Contact::getPublicAndUserContactID($item['causer-id'], $item['uid']);
+			if (!empty($cdata['user'])) {
+				return $cdata['user'];
+			}
+		}
+
+		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 {
+				$contact_id = Contact::getIdForURL($item['owner-link']);
+			}
 			if (!empty($contact_id)) {
 				return $contact_id;
 			}
 		}
-		return $item['author-id'];
+
+		if (Contact::isSharingByURL($item['author-link'], $item['uid'], true)) {
+			$contact_id = Contact::getIdForURL($item['author-link'], $item['uid']);
+		} else {
+			$contact_id = Contact::getIdForURL($item['author-link']);
+		}
+
+		if (!empty($contact_id)) {
+			return $contact_id;
+		}
+
+		Logger::warning('contact-id could not be fetched, using self contact instead.', ['uid' => $item['uid'], 'item' => $item]);
+		$self = Contact::selectFirst(['id'], ['self' => true, 'uid' => $item['uid']]);
+		return $self['id'];
 	}
 
 	/**
@@ -556,7 +585,7 @@ class Item
 		if (!empty($item['uid'])) {
 			$owner = User::getOwnerDataById($item['uid'], false);
 			if (!$owner) {
-				Logger::notice('Missing item user owner data', ['uid' => $item['uid']]);
+				Logger::warning('Missing item user owner data', ['uid' => $item['uid']]);
 				return false;
 			}
 
@@ -677,6 +706,26 @@ class Item
 		return 0;
 	}
 
+	/**
+	 * Fetch the uri-id of the parent for the given uri-id
+	 *
+	 * @param integer $uriid
+	 * @return integer
+	 */
+	public static function getParent(int $uriid): int
+	{
+		$thread_parent = Post::selectFirstPost(['thr-parent-id', 'gravity'], ['uri-id' => $uriid]);
+		if (empty($thread_parent)) {
+			return 0;
+		}
+
+		if ($thread_parent['gravity'] == Item::GRAVITY_PARENT) {
+			return $uriid;
+		}
+
+		return self::getParent($thread_parent['thr-parent-id']);
+	}
+
 	/**
 	 * Fetch top-level parent data for the given item array
 	 *
@@ -747,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
 	}
 
 	/**
@@ -772,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) {
@@ -782,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 {
@@ -895,8 +944,6 @@ class Item
 
 		$item['gravity'] = self::getGravity($item);
 
-		$item['language'] = self::getLanguage($item);
-
 		$default = ['url' => $item['author-link'], 'name' => $item['author-name'],
 			'photo' => $item['author-avatar'], 'network' => $item['network']];
 		$item['author-id'] = ($item['author-id'] ?? 0) ?: Contact::getIdForURL($item['author-link'], 0, null, $default);
@@ -911,7 +958,6 @@ class Item
 		Contact::checkAvatarCache($item['author-id']);
 		Contact::checkAvatarCache($item['owner-id']);
 
-		// The contact-id should be set before "self::insert" was called - but there seems to be issues sometimes
 		$item['contact-id'] = self::contactId($item);
 
 		if (!empty($item['direction']) && in_array($item['direction'], [Conversation::PUSH, Conversation::RELAY]) &&
@@ -924,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;
@@ -1019,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;
@@ -1078,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']);
 		}
@@ -1085,11 +1138,9 @@ class Item
 		// Check for hashtags in the body and repair or add hashtag links
 		$item['body'] = self::setHashtags($item['body']);
 
-		if (stristr($item['verb'], Activity::POKE)) {
-			$notify_type = Delivery::POKE;
-		} else {
-			$notify_type = Delivery::POST;
-		}
+		$item['language'] = self::getLanguage($item);
+
+		$notify_type = Delivery::POST;
 
 		// Filling item related side tables
 		if (!empty($item['attach'])) {
@@ -1139,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);
 		}
 
@@ -1148,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);
@@ -1188,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);
 		}
@@ -1206,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]);
@@ -1230,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);
@@ -1238,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);
@@ -1273,14 +1324,10 @@ 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']);
 		}
 
-		if ($posted_item['origin'] && ($posted_item['uid'] != 0) && in_array($posted_item['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT])) {
-			DI::cache()->delete(ActivityPub\Transmitter::CACHEKEY_OUTBOX . $posted_item['uid']);
-		}
-
 		return $post_user_id;
 	}
 
@@ -1293,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;
 		}
@@ -1374,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;
 		}
 
@@ -1500,6 +1547,14 @@ class Item
 			return 0;
 		}
 
+		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]);
+				return 0;
+			}
+		}
+
 		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;
@@ -1509,35 +1564,61 @@ class Item
 
 		$item = array_merge($item, $fields);
 
-		$item['post-reason'] = self::getPostReason($item);
+		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 ((($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]);
+			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']]);
 			return 0;
 		}
 
-		if (($uri_id != $item['thr-parent-id']) && (($item['gravity'] == GRAVITY_COMMENT) || $is_reshare) && !Post::exists(['uri-id' => $item['thr-parent-id'], 'uid' => $uid])) {
-			// Fetch the origin user for the post
-			$origin_uid = self::GetOriginUidForUriId($item['thr-parent-id'], $uid);
-			if (is_null($origin_uid)) {
-				Logger::info('Origin item was not found', ['uid' => $uid, 'uri-id' => $item['thr-parent-id']]);
+		$causer = $item['causer-id'] ?: $item['author-id'];
+
+		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;
 			}
-
-			$causer = $item['causer-id'] ?: $item['author-id'];
-			$result = self::storeForUserByUriId($item['thr-parent-id'], $uid, ['causer-id' => $causer, 'post-reason' => self::PR_FETCHED], $origin_uid);
-			Logger::info('Fetched thread parent', ['uri-id' => $item['thr-parent-id'], 'uid' => $uid, 'causer' => $causer, 'result' => $result]);
+			Logger::info('Fetched parent post', ['uri-id' => $item['parent-uri-id'], 'uid' => $uid, 'causer' => $causer]);
+		} elseif (($uri_id != $item['thr-parent-id']) && $is_reshare && !Post::exists(['uri-id' => $item['thr-parent-id'], 'uid' => $uid])) {
+			if (!self::fetchParent($item['thr-parent-id'], $uid, $causer)) {
+				Logger::info('Thread parent had not been added', ['uri-id' => $item['thr-parent-id'], 'uid' => $uid, 'causer' => $causer]);
+				return 0;
+			}
+			Logger::info('Fetched thread parent', ['uri-id' => $item['thr-parent-id'], 'uid' => $uid, 'causer' => $causer]);
 		}
 
 		$stored = self::storeForUser($item, $uid);
-		Logger::info('Item stored for user', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'source-uid' => $source_uid, 'stored' => $stored]);
+		Logger::info('Item stored for user', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'causer' => $causer, 'source-uid' => $source_uid, 'stored' => $stored]);
 		return $stored;
 	}
 
+	/**
+	 * Fetch the parent with the given uri-id
+	 *
+	 * @param integer $uri_id
+	 * @param integer $uid
+	 * @param integer $causer
+	 *
+	 * @return integer
+	 */
+	private static function fetchParent(int $uri_id, int $uid, int $causer): int
+	{
+		// Fetch the origin user for the post
+		$origin_uid = self::GetOriginUidForUriId($uri_id, $uid);
+		if (is_null($origin_uid)) {
+			Logger::info('Origin item was not found', ['uid' => $uid, 'uri-id' => $uri_id]);
+			return 0;
+		}
+
+		return self::storeForUserByUriId($uri_id, $uid, ['causer-id' => $causer, 'post-reason' => self::PR_FETCHED], $origin_uid);
+	}
+
 	/**
 	 * Returns the origin uid of a post if the given user is allowed to see it.
 	 *
@@ -1598,20 +1679,21 @@ class Item
 	 */
 	private static function storeForUser(array $item, int $uid): int
 	{
-		if (Post::exists(['uri-id' => $item['uri-id'], 'uid' => $uid])) {
+		$post = Post::selectFirst(['id'], ['uri-id' => $item['uri-id'], 'uid' => $uid]);
+		if (!empty($post['id'])) {
 			if (!empty($item['event-id'])) {
-				$post = Post::selectFirst(['event-id'], ['uri-id' => $item['uri-id'], 'uid' => $uid]);
-				if (!empty($post['event-id'])) {
+				$event_post = Post::selectFirst(['event-id'], ['uri-id' => $item['uri-id'], 'uid' => $uid]);
+				if (!empty($event_post['event-id'])) {
 					$event = DBA::selectFirst('event', ['edited', 'start', 'finish', 'summary', 'desc', 'location', 'nofinish', 'adjust'], ['id' => $item['event-id']]);
 					if (!empty($event)) {
 						// We aren't using "Event::store" here, since we don't want to trigger any further action
-						$ret = DBA::update('event', $event, ['id' => $post['event-id']]);
-						Logger::info('Event updated', ['uid' => $uid, 'source-event' => $item['event-id'], 'target-event' => $post['event-id'], 'ret' => $ret]);
+						$ret = DBA::update('event', $event, ['id' => $event_post['event-id']]);
+						Logger::info('Event updated', ['uid' => $uid, 'source-event' => $item['event-id'], 'target-event' => $event_post['event-id'], 'ret' => $ret]);
 					}
 				}
 			}
-			Logger::info('Item already exists', ['uri-id' => $item['uri-id'], 'uid' => $uid]);
-			return 0;
+			Logger::info('Item already exists', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'id' => $post['id']]);
+			return $post['id'];
 		}
 
 		// Data from the "post-user" table
@@ -1635,28 +1717,10 @@ class Item
 		$item['origin'] = 0;
 		$item['wall'] = 0;
 
-		if ($item['gravity'] == GRAVITY_PARENT) {
-			$contact = Contact::getByURLForUser($item['owner-link'], $uid, false, ['id']);
-		} else {
-			$contact = Contact::getByURLForUser($item['author-link'], $uid, false, ['id']);
-		}
-
-		if (!empty($contact['id'])) {
-			$item['contact-id'] = $contact['id'];
-		} else {
-			// Shouldn't happen at all
-			Logger::warning('contact-id could not be fetched', ['uid' => $uid, 'item' => $item]);
-			$self = DBA::selectFirst('contact', ['id'], ['self' => true, 'uid' => $uid]);
-			if (!DBA::isResult($self)) {
-				// Shouldn't happen even less
-				Logger::warning('self contact could not be fetched', ['uid' => $uid, 'item' => $item]);
-				return 0;
-			}
-			$item['contact-id'] = $self['id'];
-		}
+		$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);
@@ -1686,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)) {
@@ -1754,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;
 		}
@@ -1816,29 +1880,48 @@ 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 '';
+		}
+
+		$languages = self::getLanguageArray(trim($item['title'] . "\n" . $item['body']), 3);
+		if (empty($languages)) {
 			return '';
 		}
 
+		return json_encode($languages);
+	}
+
+	/**
+	 * Get a language array from a given text
+	 *
+	 * @param string  $body
+	 * @param integer $count
+	 * @return array
+	 */
+	public static function getLanguageArray(string $body, int $count): array
+	{
 		// Convert attachments to links
-		$naked_body = BBCode::removeAttachment($item['body']);
+		$naked_body = BBCode::removeAttachment($body);
 		if (empty($naked_body)) {
-			return '';
+			return [];
 		}
 
 		// Remove links and pictures
 		$naked_body = BBCode::removeLinks($naked_body);
 
 		// Convert the title and the body to plain text
-		$naked_body = trim($item['title'] . "\n" . BBCode::toPlaintext($naked_body));
+		$naked_body = BBCode::toPlaintext($naked_body);
 
 		// Remove possibly remaining links
 		$naked_body = preg_replace(Strings::autoLinkRegEx(), '', $naked_body);
 
 		if (empty($naked_body)) {
-			return '';
+			return [];
 		}
 
+		$naked_body = self::getDominantLanguage($naked_body);
+
 		$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
@@ -1846,12 +1929,34 @@ class Item
 		$availableLanguages['fa'] = 'fa';
 
 		$ld = new Language(array_keys($availableLanguages));
-		$languages = $ld->detect($naked_body)->limit(0, 3)->close();
-		if (is_array($languages)) {
-			return json_encode($languages);
-		}
+		return $ld->detect($naked_body)->limit(0, $count)->close() ?: [];
+	}
 
-		return '';
+	/**
+	 * Check if latin or non latin are dominant in the body and only return the dominant one
+	 *
+	 * @param string $body
+	 * @return string
+	 */
+	private static function getDominantLanguage(string $body): string
+	{
+		$latin = '';
+		$non_latin = '';
+		for ($i = 0; $i < mb_strlen($body); $i++) {
+			$character = mb_substr($body, $i, 1);
+			$ord = mb_ord($character);
+
+			// We add the most common characters to both strings.
+			if (($ord <= 64) || ($ord >= 91 && $ord <= 96) || ($ord >= 123 && $ord <= 191) || in_array($ord, [215, 247]) || ($ord >= 697 && $ord <= 735) || ($ord > 65535)) {
+				$latin .= $character;
+				$non_latin .= $character;
+			} elseif ($ord < 768) {
+				$latin .= $character;
+			} else {
+				$non_latin .= $character;
+			}
+		}
+		return (mb_strlen($latin) > mb_strlen($non_latin)) ? $latin : $non_latin;
 	}
 
 	public static function getLanguageMessage(array $item): string
@@ -1952,15 +2057,15 @@ class Item
 			} else {
 				$condition = ['id' => $arr['contact-id'], 'self' => false];
 			}
-			Contact::update(['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']], $condition);
+			Contact::update(['failed' => false, 'local-data' => true, 'success_update' => $arr['received'], 'last-item' => $arr['received']], $condition);
 		}
 		// Now do the same for the system wide contacts with uid=0
 		if ($arr['private'] != self::PRIVATE) {
-			Contact::update(['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']],
+			Contact::update(['failed' => false, 'local-data' => true, 'success_update' => $arr['received'], 'last-item' => $arr['received']],
 				['id' => $arr['owner-id']]);
 
 			if ($arr['owner-id'] != $arr['author-id']) {
-				Contact::update(['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']],
+				Contact::update(['failed' => false, 'local-data' => true, 'success_update' => $arr['received'], 'last-item' => $arr['received']],
 					['id' => $arr['author-id']]);
 			}
 		}
@@ -2055,22 +2160,16 @@ 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) {
-			$tags = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]);
-			foreach ($tags as $tag) {
-				if (Strings::compareLink($owner['url'], $tag['url'])) {
-					$mention = true;
-					Logger::info('Mention found in tag.', ['url' => $tag['url'], 'uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
-				}
-			}
-
-			if (!$mention) {
+		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 {
 				Logger::info('Top-level post without mention is deleted.', ['uri' => $item['uri'], $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
 				Post\User::delete(['uri-id' => $item['uri-id'], 'uid' => $item['uid']]);
 				return true;
@@ -2080,15 +2179,9 @@ class Item
 
 			Hook::callAll('tagged', $arr);
 		} else {
-			$tags = Tag::getByURIId($item['parent-uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]);
-			foreach ($tags as $tag) {
-				if (Strings::compareLink($owner['url'], $tag['url'])) {
-					$mention = true;
-					Logger::info('Mention found in parent tag.', ['url' => $tag['url'], 'uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
-				}
-			}
-
-			if (!$mention) {
+			if (Tag::isMentioned($item['parent-uri-id'], $owner['url'])) {
+				Logger::info('Mention found in parent tag.', ['uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
+			} else {
 				Logger::debug('No mentions found in parent, quitting here.', ['id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
 				return false;
 			}
@@ -2118,7 +2211,7 @@ class Item
 	 */
 	private static function autoReshare(array $item)
 	{
-		if ($item['gravity'] != GRAVITY_PARENT) {
+		if ($item['gravity'] != self::GRAVITY_PARENT) {
 			return;
 		}
 
@@ -2379,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
@@ -2405,16 +2498,16 @@ class Item
 			return;
 		}
 
-		$expire_items = DI::pConfig()->get($uid, 'expire', 'items', true);
+		$expire_items = (bool)DI::pConfig()->get($uid, 'expire', 'items', true);
 
 		// Forcing expiring of items - but not notes and marked items
 		if ($force) {
 			$expire_items = true;
 		}
 
-		$expire_notes = DI::pConfig()->get($uid, 'expire', 'notes', true);
-		$expire_starred = DI::pConfig()->get($uid, 'expire', 'starred', true);
-		$expire_photos = DI::pConfig()->get($uid, 'expire', 'photos', false);
+		$expire_notes = (bool)DI::pConfig()->get($uid, 'expire', 'notes', true);
+		$expire_starred = (bool)DI::pConfig()->get($uid, 'expire', 'starred', true);
+		$expire_photos = (bool)DI::pConfig()->get($uid, 'expire', 'photos', false);
 
 		$expired = 0;
 
@@ -2443,7 +2536,7 @@ class Item
 			++$expired;
 		}
 		DBA::close($items);
-		Logger::notice('User ' . $uid . ": expired $expired items; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
+		Logger::notice('Expired', ['user' => $uid, 'days' => $days, 'network' => $network, 'force' => $force, 'expired' => $expired, 'expire items' => $expire_items, 'expire notes' => $expire_notes, 'expire starred' => $expire_starred, 'expire photos' => $expire_photos, 'condition' => $condition]);
 	}
 
 	public static function firstPostDate(int $uid, bool $wall = false)
@@ -2497,7 +2590,7 @@ class Item
 
 		$item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id]);
 		if (!DBA::isResult($item)) {
-			Logger::notice('like: unknown item', ['id' => $item_id]);
+			Logger::warning('Post had not been fetched', ['id' => $item_id]);
 			return false;
 		}
 
@@ -2526,7 +2619,7 @@ class Item
 		}
 
 		// Retrieve the current logged in user's public contact
-		$author_id = Contact::getIdForURL($owner['url']);
+		$author_id = Contact::getPublicIdByUserId($uid);
 		if (empty($author_id)) {
 			Logger::info('Empty public contact');
 			return false;
@@ -2563,7 +2656,7 @@ class Item
 				$activity = Activity::ANNOUNCE;
 				break;
 			default:
-				Logger::notice('unknown verb', ['verb' => $verb, 'item' => $item_id]);
+				Logger::warning('unknown verb', ['verb' => $verb, 'item' => $item_id]);
 				return false;
 		}
 
@@ -2586,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);
 
@@ -2633,14 +2726,14 @@ class Item
 		$new_item = [
 			'guid'          => System::createUUID(),
 			'uri'           => self::newURI(),
-			'uid'           => $item['uid'],
+			'uid'           => $uid,
 			'contact-id'    => $owner['id'],
 			'wall'          => $item['wall'],
 			'origin'        => 1,
 			'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,
@@ -2656,22 +2749,20 @@ class Item
 			'unseen'        => 1,
 		];
 
-		$signed = Diaspora::createLikeSignature($uid, $new_item);
-		if (!empty($signed)) {
-			$new_item['diaspora_signed_text'] = json_encode($signed);
+		if (in_array($activity, [Activity::LIKE, Activity::DISLIKE])) {
+			$signed = Diaspora::createLikeSignature($uid, $new_item);
+			if (!empty($signed)) {
+				$new_item['diaspora_signed_text'] = json_encode($signed);
+			}
 		}
 
-		$new_item_id = self::insert($new_item);
+		self::insert($new_item, true);
 
 		// If the parent item isn't visible then set it to visible
+		// @todo Check if this is still needed
 		if (!$item['visible']) {
 			self::update(['visible' => true], ['id' => $item['id']]);
 		}
-
-		$new_item['id'] = $new_item_id;
-
-		Hook::callAll('post_local_end', $new_item);
-
 		return true;
 	}
 
@@ -2683,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];
@@ -2715,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) . '.';
@@ -2767,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');
 		}
 
@@ -2858,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);
@@ -2887,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']);
 			}
 
@@ -2924,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);
@@ -3192,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'])) {
@@ -3281,21 +3397,18 @@ class Item
 
 			$options = Post\QuestionOption::getByURIId($item['uri-id']);
 			foreach ($options as $key => $option) {
-				$percent = $question['voters'] ? ($option['replies'] / $question['voters'] * 100) : 0;
-
-				$options[$key]['percent'] = $percent;
-
 				if ($question['voters'] > 0) {
-					$options[$key]['vote'] = DI::l10n()->t('%s (%d%s, %d votes)', $option['name'], round($percent, 1), '%', $option['replies']);
+					$percent = $option['replies'] / $question['voters'] * 100;
+					$options[$key]['vote'] = DI::l10n()->tt('%2$s (%3$d%%, %1$d vote)', '%2$s (%3$d%%, %1$d votes)', $option['replies'], $option['name'], round($percent, 1));
 				} else {
-					$options[$key]['vote'] = DI::l10n()->t('%s (%d votes)', $option['name'], $option['replies']);
+					$options[$key]['vote'] = DI::l10n()->tt('%2$s (%1$d vote)', '%2$s (%1$d votes)', $option['replies'], $option['name'], );
 				}
 			}
 
 			if (!empty($question['voters']) && !empty($question['endtime'])) {
-				$summary = DI::l10n()->t('%d voters. Poll end: %s', $question['voters'], Temporal::getRelativeDate($question['endtime']));
+				$summary = DI::l10n()->tt('%d voter. Poll end: %s', '%d voters. Poll end: %s', $question['voters'], Temporal::getRelativeDate($question['endtime']));
 			} elseif (!empty($question['voters'])) {
-				$summary = DI::l10n()->t('%d voters.', $question['voters']);
+				$summary = DI::l10n()->tt('%d voter.', '%d voters.', $question['voters']);
 			} elseif (!empty($question['endtime'])) {
 				$summary = DI::l10n()->t('Poll end: %s', Temporal::getRelativeDate($question['endtime']));
 		 	} else {
@@ -3327,7 +3440,7 @@ class Item
 			$plink = $item['uri'];
 		}
 
-		if (local_user()) {
+		if (DI::userSession()->getLocalUserId()) {
 			$ret = [
 				'href' => "display/" . $item['guid'],
 				'orig' => "display/" . $item['guid'],
@@ -3473,78 +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']);
-	}
-
-	/**
-	 * Fetch item information for shared items from the original items and adds it.
-	 *
-	 * @param array $item
-	 *
-	 * @return array item array with data from the original item
-	 */
-	public static function addShareDataFromOriginal(array $item): array
-	{
-		$shared = self::getShareArray($item);
-		if (empty($shared)) {
-			return $item;
-		}
-
-		// Real reshares always have got a GUID.
-		if (empty($shared['guid'])) {
-			return $item;
-		}
-
-		$uid = $item['uid'] ?? 0;
-
-		// first try to fetch the item via the GUID. This will work for all reshares that had been created on this system
-		$shared_item = Post::selectFirst(['title', 'body'], ['guid' => $shared['guid'], 'uid' => [0, $uid]]);
-		if (!DBA::isResult($shared_item)) {
-			if (empty($shared['link'])) {
-				return $item;
-			}
-
-			// Otherwhise try to find (and possibly fetch) the item via the link. This should work for Diaspora and ActivityPub posts
-			$id = self::fetchByLink($shared['link'] ?? '', $uid);
-			if (empty($id)) {
-				Logger::info('Original item not found', ['url' => $shared['link'] ?? '', 'callstack' => System::callstack()]);
-				return $item;
-			}
-
-			$shared_item = Post::selectFirst(['title', 'body'], ['id' => $id]);
-			if (!DBA::isResult($shared_item)) {
-				return $item;
-			}
-			Logger::info('Got shared data from url', ['url' => $shared['link'], 'callstack' => System::callstack()]);
-		} else {
-			Logger::info('Got shared data from guid', ['guid' => $shared['guid'], 'callstack' => System::callstack()]);
-		}
-
-		if (!empty($shared_item['title'])) {
-			$body = '[h3]' . $shared_item['title'] . "[/h3]\n" . $shared_item['body'];
-			unset($shared_item['title']);
-		} else {
-			$body = $shared_item['body'];
-		}
-
-		$item['body'] = preg_replace("/\[share ([^\[\]]*)\].*\[\/share\]/ism", '[share $1]' . str_replace('$', '\$', $body) . '[/share]', $item['body']);
-		unset($shared_item['body']);
-
-		return array_merge($item, $shared_item);
-	}
-
 	/**
 	 * Check a prospective item array against user-level permissions
 	 *
@@ -3574,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;
 		}
@@ -3586,36 +3627,44 @@ 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['link'])) {
+		if (empty($shared['guid']) && empty($shared['message_id'])) {
 			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'];
-		}
+		$link = $shared['link'] ?: $shared['message_id'];
 
-		$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'];
+		if (empty($shared_content)) {
+			$shared_content = DI::contentItem()->createSharedPostByUrl($link, $item['uid'] ?? 0, $add_media);
 		}
 
-		$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";
+		if (empty($shared_content)) {
+			return $item['body'];
 		}
 
-		$shared_content .= $shared_item['body'];
+		$item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $shared_content, $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]);
+		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']);
+	}
 }