X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=7eb36d85e025f2aaae996af6db3a6d676cb08f96;hb=3945de5e3b293bed0c2dcfab29cf85568407a6d4;hp=01ea942c869fec0c5e01ca45d7f17deb76d9d1af;hpb=05ed13a2796c37093eb156e6b64d08fda0595c71;p=friendica.git

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 01ea942c86..7eb36d85e0 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -44,6 +44,7 @@ use Friendica\Util\Proxy;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 use Friendica\Worker\Delivery;
+use GuzzleHttp\Psr7\Uri;
 use LanguageDetection\Language;
 
 class Item
@@ -74,6 +75,12 @@ class Item
 	const PR_GLOBAL = 73;
 	const PR_RELAY = 74;
 	const PR_FETCHED = 75;
+	const PR_COMPLETION = 76;
+	const PR_DIRECT = 77;
+	const PR_ACTIVITY = 78;
+	const PR_DISTRIBUTE = 79;
+	const PR_PUSHED = 80;
+	const PR_LOCAL = 81;
 
 	// system.accept_only_sharer setting values
 	const COMPLETION_NONE    = 1;
@@ -83,7 +90,7 @@ class Item
 	// Field list that is used to display the items
 	const DISPLAY_FIELDLIST = [
 		'uid', 'id', 'parent', 'guid', 'network', 'gravity',
-		'uri-id', 'uri', 'thr-parent-id', 'thr-parent', 'parent-uri-id', 'parent-uri',
+		'uri-id', 'uri', 'thr-parent-id', 'thr-parent', 'parent-uri-id', 'parent-uri', 'conversation',
 		'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',
@@ -103,7 +110,7 @@ class Item
 
 	// Field list that is used to deliver items via the protocols
 	const DELIVER_FIELDLIST = ['uid', 'id', 'parent', 'uri-id', 'uri', 'thr-parent', 'parent-uri', 'guid',
-			'parent-guid', 'received', 'created', 'edited', 'verb', 'object-type', 'object', 'target',
+			'parent-guid', 'conversation', 'received', 'created', 'edited', 'verb', 'object-type', 'object', 'target',
 			'private', 'title', 'body', 'raw-body', 'location', 'coord', 'app',
 			'inform', 'deleted', 'extid', 'post-type', 'post-reason', 'gravity',
 			'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
@@ -116,7 +123,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', 'vid',
+			'guid', 'uri-id', 'parent-uri-id', 'thr-parent-id', 'conversation', 'vid',
 			'contact-id', 'wall', 'gravity', 'extid', 'psid',
 			'created', 'edited', 'commented', 'received', 'changed', 'verb',
 			'postopts', 'plink', 'resource-id', 'event-id', 'inform',
@@ -683,14 +690,19 @@ class Item
 			'uri-id', 'parent-uri-id',
 			'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
 			'wall', 'private', 'origin', 'author-id'];
-		$condition = ['uri-id' => $item['thr-parent-id'], 'uid' => $item['uid']];
+		$condition = ['uri-id' => [$item['thr-parent-id'], $item['parent-uri-id']], 'uid' => $item['uid']];
 		$params = ['order' => ['id' => false]];
 		$parent = Post::selectFirst($fields, $condition, $params);
 
-		if (!DBA::isResult($parent) && $item['origin']) {
-			$stored = Item::storeForUserByUriId($item['thr-parent-id'], $item['uid']);
-			Logger::info('Stored thread parent item for user', ['uri-id' => $item['thr-parent-id'], 'uid' => $item['uid'], 'stored' => $stored]);
-			$parent = Post::selectFirst($fields, $condition, $params);
+		if (!DBA::isResult($parent) && Post::exists(['uri-id' => [$item['thr-parent-id'], $item['parent-uri-id']], 'uid' => 0])) {
+			$stored = Item::storeForUserByUriId($item['thr-parent-id'], $item['uid'], ['post-reason' => Item::PR_COMPLETION]);
+			if (!$stored && ($item['thr-parent-id'] != $item['parent-uri-id'])) {
+				$stored = Item::storeForUserByUriId($item['parent-uri-id'], $item['uid'], ['post-reason' => Item::PR_COMPLETION]);
+			}
+			if ($stored) {
+				Logger::info('Stored thread parent item for user', ['uri-id' => $item['thr-parent-id'], 'uid' => $item['uid'], 'stored' => $stored]);
+				$parent = Post::selectFirst($fields, $condition, $params);
+			}
 		}
 
 		if (!DBA::isResult($parent)) {
@@ -709,7 +721,7 @@ class Item
 		$toplevel_parent = Post::selectFirst($fields, $condition, $params);
 
 		if (!DBA::isResult($toplevel_parent) && $item['origin']) {
-			$stored = Item::storeForUserByUriId($item['parent-uri-id'], $item['uid']);
+			$stored = Item::storeForUserByUriId($item['parent-uri-id'], $item['uid'], ['post-reason' => Item::PR_COMPLETION]);
 			Logger::info('Stored parent item for user', ['uri-id' => $item['parent-uri-id'], 'uid' => $item['uid'], 'stored' => $stored]);
 			$toplevel_parent = Post::selectFirst($fields, $condition, $params);
 		}
@@ -787,13 +799,19 @@ class Item
 
 		// Backward compatibility: parent-uri used to be the direct parent uri.
 		// If it is provided without a thr-parent, it probably is the old behavior.
-		$item['thr-parent'] = trim($item['thr-parent'] ?? $item['parent-uri'] ?? $item['uri']);
-		$item['parent-uri'] = $item['thr-parent'];
+		if (empty($item['thr-parent']) || empty($item['parent-uri'])) {
+			$item['thr-parent'] = trim($item['thr-parent'] ?? $item['parent-uri'] ?? $item['uri']);
+			$item['parent-uri'] = $item['thr-parent'];
+		}
 
-		$item['thr-parent-id'] = $item['parent-uri-id'] = ItemURI::getIdByURI($item['thr-parent']);
+		$item['thr-parent-id'] = ItemURI::getIdByURI($item['thr-parent']);
+		$item['parent-uri-id'] = ItemURI::getIdByURI($item['parent-uri']);
 
 		// Store conversation data
-		$item = Conversation::insert($item);
+		$source = $item['source'] ?? '';
+		unset($item['conversation-uri']);
+		unset($item['conversation-href']);
+		unset($item['source']);
 
 		/*
 		 * Do we already have this item?
@@ -892,6 +910,10 @@ class Item
 			$item['post-reason'] = self::PR_FOLLOWER;
 		}
 
+		if ($item['origin'] && empty($item['post-reason'])) {
+			$item['post-reason'] = self::PR_LOCAL;
+		}
+
 		// Ensure that there is an avatar cache
 		Contact::checkAvatarCache($item['author-id']);
 		Contact::checkAvatarCache($item['owner-id']);
@@ -900,7 +922,7 @@ class Item
 		$item['contact-id'] = self::contactId($item);
 
 		if (!empty($item['direction']) && in_array($item['direction'], [Conversation::PUSH, Conversation::RELAY]) &&
-			empty($item['origin']) &&self::isTooOld($item)) {
+			empty($item['origin']) && self::isTooOld($item)) {
 			Logger::info('Item is too old', ['item' => $item]);
 			return 0;
 		}
@@ -966,11 +988,19 @@ class Item
 		} else {
 			$parent_id = 0;
 			$parent_origin = $item['origin'];
+
+			if ($item['wall'] && empty($item['conversation'])) {
+				$item['conversation'] = $item['parent-uri'] . '#context';
+			}
 		}
 
 		$item['parent-uri-id'] = ItemURI::getIdByURI($item['parent-uri']);
 		$item['thr-parent-id'] = ItemURI::getIdByURI($item['thr-parent']);
 
+		if (!empty($item['conversation']) && empty($item['conversation-id'])) {
+			$item['conversation-id'] = ItemURI::getIdByURI($item['conversation']);
+		}
+
 		// Is this item available in the global items (with uid=0)?
 		if ($item['uid'] == 0) {
 			$item['global'] = true;
@@ -1243,6 +1273,9 @@ class Item
 		}
 
 		if ($transmit) {
+			if (!empty($source)) {
+				Post\Activity::insert($item['uri-id'], $source);
+			}
 			Worker::add(['priority' => $priority, 'dont_fork' => true], 'Notifier', $notify_type, (int)$posted_item['uri-id'], (int)$posted_item['uid']);
 		}
 
@@ -1333,14 +1366,8 @@ class Item
 
 		$uids = Tag::getUIDListByURIId($item['uri-id']);
 		foreach ($uids as $uid) {
-			if (Contact::isSharing($item['author-id'], $uid)) {
-				$fields = [];
-			} else {
-				$fields = ['post-reason' => self::PR_TAG];
-			}
-
-			$stored = self::storeForUserByUriId($item['uri-id'], $uid, $fields);
-			Logger::info('Stored item for users', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'fields' => $fields, 'stored' => $stored]);
+			$stored = self::storeForUserByUriId($item['uri-id'], $uid, ['post-reason' => self::PR_TAG]);
+			Logger::info('Stored item for users', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'stored' => $stored]);
 		}
 	}
 
@@ -1364,7 +1391,7 @@ class Item
 		$condition = ['id' => $itemid, 'uid' => 0,
 			'network' => array_merge(Protocol::FEDERATED ,['']),
 			'visible' => true, 'deleted' => false, 'private' => [self::PUBLIC, self::UNLISTED]];
-		$item = Post::selectFirst(self::ITEM_FIELDLIST, $condition);
+		$item = Post::selectFirst(array_merge(self::ITEM_FIELDLIST, ['protocol']), $condition);
 		if (!DBA::isResult($item)) {
 			Logger::warning('Item not found', ['condition' => $condition]);
 			return;
@@ -1432,6 +1459,7 @@ class Item
 			if ($origin_uid == $uid) {
 				$item['diaspora_signed_text'] = $signed_text;
 			}
+			$item['post-reason'] = self::PR_DISTRIBUTE;
 			self::storeForUser($item, $uid);
 		}
 	}
@@ -1452,7 +1480,7 @@ class Item
 			return 0;
 		}
 
-		$item = Post::selectFirst(self::ITEM_FIELDLIST, ['uri-id' => $uri_id, 'uid' => $source_uid]);
+		$item = Post::selectFirst(array_merge(self::ITEM_FIELDLIST, ['protocol']), ['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;
@@ -1583,7 +1611,6 @@ class Item
 		unset($item['event-id']);
 		unset($item['hidden']);
 		unset($item['notification-type']);
-		unset($item['post-reason']);
 
 		// Data from the "post-delivery-data" table
 		unset($item['postopts']);
@@ -1670,7 +1697,7 @@ class Item
 			return;
 		}
 
-		$item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
+		$item = Post::selectFirst(array_merge(self::ITEM_FIELDLIST, ['protocol']), ['id' => $itemid]);
 
 		if (DBA::isResult($item)) {
 			// Preparing public shadow (removing user specific data)
@@ -1706,7 +1733,7 @@ class Item
 	 */
 	private static function addShadowPost(int $itemid)
 	{
-		$item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
+		$item = Post::selectFirst(array_merge(self::ITEM_FIELDLIST, ['protocol']), ['id' => $itemid]);
 		if (!DBA::isResult($item)) {
 			return;
 		}
@@ -2466,7 +2493,7 @@ class Item
 		}
 
 		if (!Post::exists(['uri-id' => $item['parent-uri-id'], 'uid' => $uid])) {
-			$stored = self::storeForUserByUriId($item['parent-uri-id'], $uid);
+			$stored = self::storeForUserByUriId($item['parent-uri-id'], $uid, ['post-reason' => Item::PR_ACTIVITY]);
 			if (($item['parent-uri-id'] == $item['uri-id']) && !empty($stored)) {
 				$item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $stored]);
 				if (!DBA::isResult($item)) {
@@ -2924,9 +2951,13 @@ class Item
 	{
 		// 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);
+		if (!empty($urlparts)) {
+			unset($urlparts['query']);
+			unset($urlparts['fragment']);
+			$url = (string)Uri::fromParts($urlparts);
+		} else {
+			return false;
+		}
 
 		// Remove media links to only search in embedded content
 		// @todo Check images for image link, audio for audio links, ...
@@ -3410,9 +3441,7 @@ class Item
 			return is_numeric($hookData['item_id']) ? $hookData['item_id'] : 0;
 		}
 
-		$fetchQueue = new ActivityPub\FetchQueue();
-		$fetched_uri = ActivityPub\Processor::fetchMissingActivity($fetchQueue, $uri);
-		$fetchQueue->process();
+		$fetched_uri = ActivityPub\Processor::fetchMissingActivity($uri);
 
 		if ($fetched_uri) {
 			$item_id = self::searchByLink($fetched_uri, $uid);