X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FUpdateContacts.php;h=2beb890918538373c87a2e647ba567638da8cba9;hb=34030a736d5e0aa2195c0f472cf69f863c161d83;hp=bf234d989c0983923434cebe869040708433609a;hpb=f9994548c1f1110c7f548e00fcf1b6ee42b9de3b;p=friendica.git

diff --git a/src/Worker/UpdateContacts.php b/src/Worker/UpdateContacts.php
index bf234d989c..2beb890918 100644
--- a/src/Worker/UpdateContacts.php
+++ b/src/Worker/UpdateContacts.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -49,33 +49,46 @@ class UpdateContacts
 			return;
 		}
 
-		// Add every contact our system interacted with and hadn't been updated for a week if unarchived
-		// or for a month if archived.
-		$condition = DBA::mergeConditions($base_condition, ["(`id` IN (SELECT `author-id` FROM `item`) OR
-			`id` IN (SELECT `owner-id` FROM `item`) OR `id` IN (SELECT `causer-id` FROM `item`) OR
-			`id` IN (SELECT `cid` FROM `post-tag`) OR `id` IN (SELECT `cid` FROM `user-contact`) OR `uid` != ?) AND
-			(`last-update` < ? OR (NOT `archive` AND `last-update` < ?))",
+		$condition = DBA::mergeConditions($base_condition,
+			["`uid` != ? AND (`last-update` < ? OR (NOT `failed` AND `last-update` < ?))",
 			0, DateTimeFormat::utc('now - 1 month'), DateTimeFormat::utc('now - 1 week')]);
-		Logger::info('Updatable interacting federated contacts', ['count' => DBA::count('contact', $condition)]);
-		$ids = self::getContactsToUpdate($condition, [], $limit);
-		Logger::info('Fetched interacting federated contacts', ['count' => count($ids)]);
+		$ids = self::getContactsToUpdate($condition, $limit, []);
+		Logger::info('Fetched federated user contacts', ['count' => count($ids)]);
+
+		$conditions = ["`id` IN (SELECT `author-id` FROM `post` WHERE `author-id` = `contact`.`id`)",
+			"`id` IN (SELECT `owner-id` FROM `post` WHERE `owner-id` = `contact`.`id`)",
+			"`id` IN (SELECT `causer-id` FROM `post` WHERE `causer-id` = `contact`.`id`)",
+			"`id` IN (SELECT `cid` FROM `post-tag` WHERE `cid` = `contact`.`id`)",
+			"`id` IN (SELECT `cid` FROM `user-contact` WHERE `cid` = `contact`.`id`)"];
+
+		foreach ($conditions as $contact_condition) {
+			$condition = DBA::mergeConditions($base_condition,
+				[$contact_condition . " AND (`last-update` < ? OR (NOT `failed` AND `last-update` < ?))",
+				DateTimeFormat::utc('now - 1 month'), DateTimeFormat::utc('now - 1 week')]);
+			$ids = self::getContactsToUpdate($condition, $limit, $ids);
+			Logger::info('Fetched interacting federated contacts', ['count' => count($ids), 'condition' => $contact_condition]);
+		}
+
+		if (count($ids) > $limit) {
+			$ids = array_slice($ids, 0, $limit, true);
+		}
 
 		if (!DI::config()->get('system', 'update_active_contacts')) {
 			// Add every contact (mostly failed ones) that hadn't been updated for six months
 			// and every non failed contact that hadn't been updated for a month
 			$condition = DBA::mergeConditions($base_condition,
-				["(`last-update` < ? OR (NOT `archive` AND `last-update` < ?))",
+				["(`last-update` < ? OR (NOT `failed` AND `last-update` < ?))",
 					DateTimeFormat::utc('now - 6 month'), DateTimeFormat::utc('now - 1 month')]);
-			Logger::info('Updatable federated contacts', ['count' => DBA::count('contact', $condition)]);
 			$previous = count($ids);
-			$ids = self::getContactsToUpdate($condition, $ids, $limit - $previous);
+			$ids = self::getContactsToUpdate($condition, $limit - $previous, $ids);
 			Logger::info('Fetched federated contacts', ['count' => count($ids) - $previous]);
 		}
 
 		$count = 0;
 		foreach ($ids as $id) {
-			Worker::add(PRIORITY_LOW, "UpdateContact", $id);
-			++$count;
+			if (Worker::add(PRIORITY_LOW, "UpdateContact", $id)) {
+				++$count;
+			}
 		}
 
 		Logger::info('Initiated update for federated contacts', ['count' => $count]);
@@ -85,14 +98,15 @@ class UpdateContacts
 	 * Returns contact ids based on a given condition
 	 *
 	 * @param array $condition
+	 * @param int $limit
 	 * @param array $ids
 	 * @return array contact ids
 	 */
-	private static function getContactsToUpdate(array $condition, array $ids = [], int $limit)
+	private static function getContactsToUpdate(array $condition, int $limit, array $ids = [])
 	{
-		$contacts = DBA::select('contact', ['id'], $condition, ['limit' => $limit, 'order' => ['last-update']]);
+		$contacts = DBA::select('contact', ['id'], $condition, ['limit' => $limit]);
 		while ($contact = DBA::fetch($contacts)) {
-			$ids[] = $contact['id'];
+			$ids[$contact['id']] = $contact['id'];
 		}
 		DBA::close($contacts);
 		return $ids;