From ad6be21b56902a3dedcbcb5a2651ca5869210a77 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Mon, 4 Nov 2024 20:02:44 +0000
Subject: [PATCH] Fix defaults in Contact model

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

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index c6bdba2dc0..de5c50da8f 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -2706,8 +2706,6 @@ class Contact
 	 *
 	 * @param int   $id
 	 * @param array $contact
-	 *
-	 * @return boolean
 	 */
 	private static function hasLocalData(int $id, array $contact): bool
 	{
@@ -2767,6 +2765,8 @@ class Contact
 			'network', 'alias', 'baseurl', 'gsid', 'forum', 'prv', 'contact-type', 'pubkey', 'last-item', 'xmpp', 'matrix',
 			'created', 'last-update'
 		];
+
+		/** @var array<string,mixed> */
 		$contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
 		if (!DBA::isResult($contact)) {
 			return false;
@@ -2792,22 +2792,22 @@ class Contact
 
 		$has_local_data = self::hasLocalData($id, $contact);
 
-		$uid = $contact['uid'];
+		$uid = $contact['uid'] ?? null;
 		unset($contact['uid']);
 
-		$uriid = $contact['uri-id'];
+		$uriid = $contact['uri-id'] ?? null;
 		unset($contact['uri-id']);
 
-		$pubkey = $contact['pubkey'];
+		$pubkey = $contact['pubkey'] ?? null;
 		unset($contact['pubkey']);
 
-		$created = $contact['created'];
+		$created = $contact['created'] ?? '';
 		unset($contact['created']);
 
-		$last_update = $contact['last-update'];
+		$last_update = $contact['last-update'] ?? '';
 		unset($contact['last-update']);
 
-		$contact['photo'] = $contact['avatar'];
+		$contact['photo'] = $contact['avatar'] ?? null;
 		unset($contact['avatar']);
 
 		$updated = DateTimeFormat::utcNow();
-- 
2.39.5