Moved updating personal contacts to updatecontact

src/Model/Contact.php

@@ -1722,31 +1722,38 @@ class Contact
 		}
 
 		// Search for duplicated contacts and get rid of them
-		if (self::removeDuplicates(Strings::normaliseLink($url), $uid) || ($uid != 0)) {
+		if (self::removeDuplicates(Strings::normaliseLink($url), $uid)) {
 			return;
 		}
 
-		// Archive or unarchive the contact. We only need to do this for the public contact.
+		// Archive or unarchive the contact.
-		// The archive/unarchive function will update the personal contacts by themselves.
 		$contact = DBA::selectFirst('contact', [], ['id' => $id]);
 		if (!DBA::isResult($contact)) {
 			Logger::info('Couldn\'t select contact for archival.', ['id' => $id]);
 			return;
 		}
 
-		if (!empty($fields['success_update'])) {
+		if (isset($fields['failed'])) {
-			self::unmarkForArchival($contact);
+			if ($fields['failed']) {
-		} elseif (!empty($fields['failure_update'])) {
+				self::markForArchival($contact);
-			self::markForArchival($contact);
+			} else {
+				self::unmarkForArchival($contact);
+			}
 		}
 
-		$condition = ['self' => false, 'nurl' => Strings::normaliseLink($url), 'network' => Protocol::FEDERATED];
+		if ($contact['uid'] != 0) {
+			return;
+		}
 
-		// These contacts are sharing with us, we don't poll them.
+		// Update contact data for all users
-		// This means that we don't set the update fields in "OnePoll.php".
+		$condition = ['self' => false, 'nurl' => Strings::normaliseLink($url)];
-		$condition['rel'] = self::SHARING;
+
+		$condition['network'] = [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB];
 		DBA::update('contact', $fields, $condition);
 
+		// We mustn't set the update fields for OStatus contacts since they are updated in OnePoll
+		$condition['network'] = Protocol::OSTATUS;
+
 		// If the contact failed, propagate the update fields to all contacts
 		if (empty($fields['failed'])) {
 			unset($fields['last-update']);
@@ -1758,8 +1765,6 @@ class Contact
 			return;
 		}
 
-		// We are polling these contacts, so we mustn't set the update fields here.
-		$condition['rel'] = [self::FOLLOWER, self::FRIEND];
 		DBA::update('contact', $fields, $condition);
 	}
 
@@ -1957,7 +1962,7 @@ class Contact
 			$ret['name-date'] = $updated;
 		}
 
-		if ($uid == 0) {
+		if (($uid == 0) || in_array($ret['network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
 			$ret['last-update'] = $updated;
 			$ret['success_update'] = $updated;
 		}
@@ -2224,8 +2229,11 @@ class Contact
 		self::updateAvatar($contact_id, $ret['photo']);
 
 		// pull feed and consume it, which should subscribe to the hub.
-
+		if ($contact['network'] == Protocol::OSTATUS) {
-		Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force");
+			Worker::add(PRIORITY_HIGH, 'OnePoll', $contact_id, 'force');
+		} else {
+			Worker::add(PRIORITY_HIGH, 'UpdateContact', $contact_id);
+		}
 
 		$owner = User::getOwnerDataById($user['uid']);
 

src/Module/Contact.php

@@ -181,9 +181,11 @@ class Contact extends BaseModule
 			if ($result['success']) {
 				DBA::update('contact', ['subhub' => 1], ['id' => $contact_id]);
 			}
-		} else {
+
 			// pull feed and consume it, which should subscribe to the hub.
 			Worker::add(PRIORITY_HIGH, 'OnePoll', $contact_id, 'force');
+		} else {
+			Worker::add(PRIORITY_HIGH, 'UpdateContact', $contact_id);
 		}
 	}
 

src/Worker/Cron.php

@@ -61,7 +61,7 @@ class Cron
 		Worker::add(PRIORITY_MEDIUM, 'PollContacts');
 
 		// Update contact information
-		Worker::add(PRIORITY_LOW, 'UpdatePublicContacts');
+		Worker::add(PRIORITY_LOW, 'UpdateContacts');
 
 		// Update server information
 		Worker::add(PRIORITY_LOW, 'UpdateGServers');

src/Worker/OnePoll.php

@@ -56,7 +56,7 @@ class OnePoll
 
 		// We never probe mail contacts since their probing demands a mail from the contact in the inbox.
 		// We don't probe feed accounts by default since they are polled in a higher frequency, but forced probes are okay.
-		if (!in_array($contact['network'], [Protocol::MAIL, Protocol::FEED]) || ($force && ($contact['network'] == Protocol::FEED))) {
+		if ($force && ($contact['network'] == Protocol::FEED)) {
 			$success = Contact::updateFromProbe($contact_id);
 		} else {
 			$success = true;

src/Worker/PollContacts.php

@@ -41,8 +41,7 @@ class PollContacts
 			$abandon_days = 0;
 		}
 
-		$condition = ['network' => [Protocol::DFRN, Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::FEED, 
+		$condition = ['network' => [Protocol::FEED, Protocol::MAIL, Protocol::OSTATUS], 'self' => false, 'blocked' => false];
-			Protocol::MAIL, Protocol::ZOT, Protocol::PHANTOM], 'self' => false, 'blocked' => false];
 
 		if (!empty($abandon_days)) {
 			$condition = DBA::mergeConditions($condition,

src/Worker/UpdateContacts.php

@@ -29,52 +29,54 @@ use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
 
 /**
- * Update public contacts
+ * Update federated contacts
  */
-class UpdatePublicContacts
+class UpdateContacts
 {
 	public static function execute()
 	{
 		$count = 0;
 		$ids = [];
-		$base_condition = ['network' => Protocol::FEDERATED, 'uid' => 0, 'self' => false];
+		$base_condition = ['network' => array_merge(Protocol::FEDERATED, [Protocol::ZOT, Protocol::PHANTOM]), 'self' => false];
 
-		$existing = Worker::countWorkersByCommand('UpdateContact');
+		$update_limit = DI::config()->get('system', 'contact_update_limit');
-		Logger::info('Already existing jobs', ['existing' => $existing]);
+		if (empty($update_limit)) {
-		if ($existing > 100) {
 			return;
 		}
 
-		$limit = 100 - $existing;
+		$updating = Worker::countWorkersByCommand('UpdateContact');
-
+		$limit = $update_limit - $updating;
-		if (!DI::config()->get('system', 'update_active_contacts')) {
+		if ($limit <= 0) {
-			$part = 3;
+			Logger::info('The number of currently running jobs exceed the limit');
-			// Add every contact (mostly failed ones) that hadn't been updated for six months
+			return;
-			$condition = DBA::mergeConditions($base_condition,
-				["`last-update` < ?", DateTimeFormat::utc('now - 6 month')]);
-			$ids = self::getContactsToUpdate($condition, $ids, round($limit / $part));
-
-			// Add every non failed contact that hadn't been updated for a month
-			$condition = DBA::mergeConditions($base_condition,
-				["NOT `failed` AND `last-update` < ?", DateTimeFormat::utc('now - 1 month')]);
-			$ids = self::getContactsToUpdate($condition, $ids, round($limit / $part));
-		} else {
-			$part = 1;
 		}
 
-		// Add every contact our system interacted with and hadn't been updated for a week
+		// 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`)) AND
+			`id` IN (SELECT `cid` FROM `post-tag`) OR `id` IN (SELECT `cid` FROM `user-contact`) OR `uid` != ?) AND
-			`last-update` < ?", DateTimeFormat::utc('now - 1 week')]);
+			(`last-update` < ? OR (NOT `archive` AND `last-update` < ?))",
-		$ids = self::getContactsToUpdate($condition, $ids, round($limit / $part));
+			0, DateTimeFormat::utc('now - 1 month'), DateTimeFormat::utc('now - 1 week')]);
+		$ids = self::getContactsToUpdate($condition, $ids, $limit - count($ids));
+
+		Logger::info('Fetched interacting federated contacts', ['count' => count($ids)]);
+
+		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` < ?))",
+					DateTimeFormat::utc('now - 6 month'), DateTimeFormat::utc('now - 1 month')]);
+			$ids = self::getContactsToUpdate($condition, $ids, $limit - count($ids));
+		}
 
 		foreach ($ids as $id) {
 			Worker::add(PRIORITY_LOW, "UpdateContact", $id);
 			++$count;
 		}
 
-		Logger::info('Initiated update for public contacts', ['count' => $count]);
+		Logger::info('Initiated update for federated contacts', ['count' => $count]);
 	}
 
 	/**

static/defaults.config.php

@@ -131,6 +131,10 @@ return [
 		// Don't display sharing accounts on the global community
 		'community_no_sharer' => false,
 
+		// contact_update_limit (Integer)
+		// How much contacts should be checked at a time?
+		'contact_update_limit' => 100,
+
 		// cron_interval (Integer)
 		// Minimal period in minutes between two calls of the "Cron" worker job.
 		'cron_interval' => 5,