X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=b6f8ffa3d1665e5950aa3b69e9dbb05a868fea50;hb=24a82110fd45a8422efee0677b7acc214aa66e9a;hp=e31097f53cc48f2d75b02a80e0cedc8f2a60f0fd;hpb=31d2a74b0b385eaea556ee45101147197683b8a3;p=friendica.git

diff --git a/src/Model/Item.php b/src/Model/Item.php
index e31097f53c..b6f8ffa3d1 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1554,9 +1554,7 @@ class Item
 			}
 
 			// Update the contact relations
-			if ($item['author-id'] != $parent['author-id']) {
-				DBA::update('contact-relation', ['last-interaction' => $item['created']], ['cid' => $parent['author-id'], 'relation-cid' => $item['author-id']], true);
-			}
+			ContactRelation::store($parent['author-id'], $item['author-id'], $item['created']);
 		}
 
 		return $item;
@@ -1703,6 +1701,10 @@ class Item
 			'photo' => $item['owner-avatar'], 'network' => $item['network']];
 		$item['owner-id'] = ($item['owner-id'] ?? 0) ?: Contact::getIdForURL($item['owner-link'], 0, null, $default);
 
+		// Ensure that there is an avatar cache
+		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);
 
@@ -1964,6 +1966,9 @@ class Item
 
 		check_user_notification($current_post);
 
+		// Distribute items to users who subscribed to their tags
+		self::distributeByTags($item);
+
 		$transmit = $notify || ($item['visible'] && ($parent_origin || $item['origin']));
 
 		if ($transmit) {
@@ -1983,6 +1988,24 @@ class Item
 		return $current_post;
 	}
 
+	/**
+	 * Distribute the given item to users who subscribed to their tags
+	 *
+	 * @param array $item     Processed item
+	 */
+	private static function distributeByTags(array $item)
+	{
+		if (($item['uid'] != 0) || ($item['gravity'] != GRAVITY_PARENT) || !in_array($item['network'], Protocol::FEDERATED)) {
+			return;
+		}
+
+		$uids = Tag::getUIDListByURIId($item['uri-id']);
+		foreach ($uids as $uid) {
+			$stored = self::storeForUserByUriId($item['uri-id'], $uid);
+			Logger::info('Stored item for users', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'stored' => $stored]);
+		}
+	}
+
 	/**
 	 * Insert a new item content entry
 	 *
@@ -2079,13 +2102,6 @@ class Item
 
 		$origin = $item['origin'];
 
-		unset($item['id']);
-		unset($item['parent']);
-		unset($item['mention']);
-		unset($item['wall']);
-		unset($item['origin']);
-		unset($item['starred']);
-
 		$users = [];
 
 		/// @todo add a field "pcid" in the contact table that referrs to the public contact id.
@@ -2145,33 +2161,76 @@ class Item
 			if ($origin_uid == $uid) {
 				$item['diaspora_signed_text'] = $signed_text;
 			}
-			self::storeForUser($itemid, $item, $uid);
+			self::storeForUser($item, $uid);
 		}
 	}
 
 	/**
-	 * Store public items for the receivers
+	 * 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
+	 * @return integer stored item id
+	 */
+	public static function storeForUserByUriId(int $uri_id, int $uid)
+	{
+		$item = self::selectFirst(self::ITEM_FIELDLIST, ['uri-id' => $uri_id, 'uid' => 0]);
+		if (!DBA::isResult($item)) {
+			return 0;
+		}
+
+		if (($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;
+		}
+
+		$stored = self::storeForUser($item, $uid);
+		Logger::info('Public item stored for user', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'stored' => $stored]);
+		return $stored;
+	}
+
+	/**
+	 * Store a public item array for the given users
 	 *
-	 * @param integer $itemid Item ID that should be added
 	 * @param array   $item   The item entry that will be stored
 	 * @param integer $uid    The user that will receive the item entry
+	 * @return integer stored item id
 	 * @throws \Exception
 	 */
-	private static function storeForUser($itemid, $item, $uid)
+	private static function storeForUser(array $item, int $uid)
 	{
+		if (self::exists(['uri-id' => $item['uri-id'], 'uid' => $uid])) {
+			Logger::info('Item already exists', ['uri-id' => $item['uri-id'], 'uid' => $uid]);
+			return 0;
+		}
+
+		unset($item['id']);
+		unset($item['parent']);
+		unset($item['mention']);
+		unset($item['starred']);
+		unset($item['unseen']);
+		unset($item['psid']);
+
 		$item['uid'] = $uid;
 		$item['origin'] = 0;
 		$item['wall'] = 0;
-		if ($item['uri'] == $item['parent-uri']) {
-			$item['contact-id'] = Contact::getIdForURL($item['owner-link'], $uid);
+
+		if ($item['gravity'] == GRAVITY_PARENT) {
+			$contact = Contact::getByURLForUser($item['owner-link'], $uid, false, ['id']);
 		} else {
-			$item['contact-id'] = Contact::getIdForURL($item['author-link'], $uid);
+			$contact = Contact::getByURLForUser($item['author-link'], $uid, false, ['id']);
 		}
 
-		if (empty($item['contact-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)) {
-				return;
+				// Shouldn't happen even less
+				Logger::warning('self contact could not be fetched', ['uid' => $uid, 'item' => $item]);
+				return 0;
 			}
 			$item['contact-id'] = $self['id'];
 		}
@@ -2179,7 +2238,7 @@ class Item
 		/// @todo Handling of "event-id"
 
 		$notify = false;
-		if ($item['uri'] == $item['parent-uri']) {
+		if ($item['gravity'] == GRAVITY_PARENT) {
 			$contact = DBA::selectFirst('contact', [], ['id' => $item['contact-id'], 'self' => false]);
 			if (DBA::isResult($contact)) {
 				$notify = self::isRemoteSelf($contact, $item);
@@ -2189,10 +2248,11 @@ class Item
 		$distributed = self::insert($item, $notify, true);
 
 		if (!$distributed) {
-			Logger::info("Distributed public item wasn't stored", ['id' => $itemid, 'user' => $uid]);
+			Logger::info("Distributed public item wasn't stored", ['uri-id' => $item['uri-id'], 'user' => $uid]);
 		} else {
-			Logger::info('Distributed public item was stored', ['id' => $itemid, 'user' => $uid, 'stored' => $distributed]);
+			Logger::info('Distributed public item was stored', ['uri-id' => $item['uri-id'], 'user' => $uid, 'stored' => $distributed]);
 		}
+		return $distributed;
 	}
 
 	/**
@@ -2980,6 +3040,10 @@ class Item
 			return false;
 		}
 
+		if (!Item::exists(['uri-id' => $item['parent-uri-id'], 'uid' => $uid])) {
+			$stored = self::storeForUserByUriId($item['parent-uri-id'], $uid);
+		}
+
 		// Retrieves the local post owner
 		$owner_self_contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'self' => true]);
 		if (!DBA::isResult($owner_self_contact)) {
@@ -3639,10 +3703,12 @@ class Item
 	 *
 	 * @return integer item id
 	 */
-	public static function fetchByLink($uri, $uid = 0)
+	public static function fetchByLink(string $uri, int $uid = 0)
 	{
+		Logger::info('Trying to fetch link', ['uid' => $uid, 'uri' => $uri]);
 		$item_id = self::searchByLink($uri, $uid);
 		if (!empty($item_id)) {
+			Logger::info('Link found', ['uid' => $uid, 'uri' => $uri, 'id' => $item_id]);
 			return $item_id;
 		}
 
@@ -3653,9 +3719,11 @@ class Item
 		}
 
 		if (!empty($item_id)) {
+			Logger::info('Link fetched', ['uid' => $uid, 'uri' => $uri, 'id' => $item_id]);
 			return $item_id;
 		}
 
+		Logger::info('Link not found', ['uid' => $uid, 'uri' => $uri]);
 		return 0;
 	}
 
@@ -3692,7 +3760,7 @@ class Item
 	 *
 	 * @return array item array with data from the original item
 	 */
-	public static function addShareDataFromOriginal($item)
+	public static function addShareDataFromOriginal(array $item)
 	{
 		$shared = self::getShareArray($item);
 		if (empty($shared)) {
@@ -3714,9 +3782,9 @@ class 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);
+			$id = self::fetchByLink($shared['link'] ?? '', $uid);
 			if (empty($id)) {
-				Logger::info('Original item not found', ['url' => $shared['link'], 'callstack' => System::callstack()]);
+				Logger::info('Original item not found', ['url' => $shared['link'] ?? '', 'callstack' => System::callstack()]);
 				return $item;
 			}