From 618903fef7b374fdc67873b150aad5234f018cc2 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 9 Jan 2022 05:49:11 +0000
Subject: [PATCH] Only update the contact when the header changed

---
 src/Model/Contact.php | 52 +++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index f70d01dd2..fea8d72a0 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -2202,32 +2202,6 @@ class Contact
 		$update = false;
 		$guid = ($ret['guid'] ?? '') ?: Item::guidFromUri($ret['url'], parse_url($ret['url'], PHP_URL_HOST));
 
-		// make sure to not overwrite existing values with blank entries except some technical fields
-		$keep = ['batch', 'notify', 'poll', 'request', 'confirm', 'poco', 'baseurl'];
-		foreach ($ret as $key => $val) {
-			if (!array_key_exists($key, $contact)) {
-				unset($ret[$key]);
-			} elseif (($contact[$key] != '') && ($val === '') && !is_bool($ret[$key]) && !in_array($key, $keep)) {
-				$ret[$key] = $contact[$key];
-			} elseif ($ret[$key] != $contact[$key]) {
-				$update = true;
-			}
-		}
-
-		if (!empty($ret['last-item']) && ($contact['last-item'] < $ret['last-item'])) {
-			$update = true;
-		} else {
-			unset($ret['last-item']);
-		}
-
-		if (empty($uriid)) {
-			$update = true;
-		}
-
-		if (!empty($ret['photo']) && ($ret['network'] != Protocol::FEED)) {
-			self::updateAvatar($id, $ret['photo'], $update);
-		}
-
 		if (empty($ret['header']) && !empty($gsid)) {
 			// Use default banners for certain platforms
 			$gserver = DBA::selectFirst('gserver', ['platform'], ['id' => $gsid]);
@@ -2263,6 +2237,32 @@ class Contact
 			$ret['header'] = 'https://picsum.photos/seed/' . hash('ripemd128', $ret['url']) . '/960/300';
 		}
 
+		// make sure to not overwrite existing values with blank entries except some technical fields
+		$keep = ['batch', 'notify', 'poll', 'request', 'confirm', 'poco', 'baseurl'];
+		foreach ($ret as $key => $val) {
+			if (!array_key_exists($key, $contact)) {
+				unset($ret[$key]);
+			} elseif (($contact[$key] != '') && ($val === '') && !is_bool($ret[$key]) && !in_array($key, $keep)) {
+				$ret[$key] = $contact[$key];
+			} elseif ($ret[$key] != $contact[$key]) {
+				$update = true;
+			}
+		}
+
+		if (!empty($ret['last-item']) && ($contact['last-item'] < $ret['last-item'])) {
+			$update = true;
+		} else {
+			unset($ret['last-item']);
+		}
+
+		if (empty($uriid)) {
+			$update = true;
+		}
+
+		if (!empty($ret['photo']) && ($ret['network'] != Protocol::FEED)) {
+			self::updateAvatar($id, $ret['photo'], $update);
+		}
+
 		$uriid = ItemURI::insert(['uri' => $ret['url'], 'guid' => $guid]);
 
 		if (!$update) {