From dc382b5288cc62bda17ac238e320fe00323993d1 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 14 Jan 2025 06:06:28 +0000
Subject: [PATCH] Changed contact update rule / added logging

---
 src/Module/Photo.php         | 5 +++--
 src/Worker/UpdateContact.php | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 30e6d57672..87da6be55b 100644
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -27,6 +27,7 @@ use Friendica\Network\HTTPException;
 use Friendica\Network\HTTPException\NotModifiedException;
 use Friendica\Object\Image;
 use Friendica\Security\OpenWebAuth;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
 use Friendica\Util\ParseUrl;
 use Friendica\Util\Proxy;
@@ -297,7 +298,7 @@ class Photo extends BaseApi
 
 				return MPhoto::createPhotoForExternalResource($link['url'], (int)DI::userSession()->getLocalUserId(), $link['mimetype'] ?? '', $link['blurhash'] ?? '', $link['width'] ?? 0, $link['height'] ?? 0);
 			case 'contact':
-				$fields = ['uid', 'uri-id', 'url', 'nurl', 'avatar', 'photo', 'blurhash', 'xmpp', 'addr', 'network', 'failed', 'updated'];
+				$fields = ['uid', 'uri-id', 'url', 'nurl', 'avatar', 'photo', 'blurhash', 'xmpp', 'addr', 'network', 'failed', 'updated', 'next-update'];
 				$contact = Contact::getById($id, $fields);
 				if (empty($contact)) {
 					return false;
@@ -355,7 +356,7 @@ class Photo extends BaseApi
 					} else {
 						// Only update federated accounts that hadn't failed before and hadn't been updated recently
 						$update = in_array($contact['network'], Protocol::FEDERATED) && !$contact['failed']
-							&& ((time() - strtotime($contact['updated']) > 86400));
+							&& ($contact['next-update'] < DateTimeFormat::utcNow());
 						if ($update) {
 							$curlResult = DI::httpClient()->head($url, [HttpClientOptions::ACCEPT_CONTENT => HttpClientAccept::IMAGE, HttpClientOptions::REQUEST => HttpClientRequest::CONTENTTYPE]);
 							$update = !$curlResult->isSuccess() && ($curlResult->getReturnCode() == 404);
diff --git a/src/Worker/UpdateContact.php b/src/Worker/UpdateContact.php
index aad6a93db2..ded4679fe6 100644
--- a/src/Worker/UpdateContact.php
+++ b/src/Worker/UpdateContact.php
@@ -51,6 +51,7 @@ class UpdateContact
 			return 0;
 		}
 
+		Logger::debug('Update contact', ['id' => $contact_id]);
 		return Worker::add($run_parameters, 'UpdateContact', $contact_id);
 	}
 }