From 52f5d924b7a0429669f37570034e7771dd2a1887 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 21 Feb 2022 10:16:38 -0500
Subject: [PATCH] Replace remaining instances of DBA::update('contact') with
 Contact::update()

- This was breaking the synchronisation between the contact and user-contact tables
---
 src/Model/Contact.php     | 2 +-
 src/Protocol/Diaspora.php | 6 ++----
 src/Worker/Notifier.php   | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index d80827c93..9b0020d00 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -2747,7 +2747,7 @@ class Contact
 	public static function removeFollower(array $contact)
 	{
 		if (in_array($contact['rel'] ?? [], [self::FRIEND, self::SHARING])) {
-			DBA::update('contact', ['rel' => self::SHARING], ['id' => $contact['id']]);
+			self::update(['rel' => self::SHARING], ['id' => $contact['id']]);
 		} elseif (!empty($contact['id'])) {
 			self::remove($contact['id']);
 		} else {
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index ea0b2b674..ad8e2bbef 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -837,8 +837,7 @@ class Diaspora
 		// It is deactivated by now, due to side effects. See issue https://github.com/friendica/friendica/pull/4033
 		// It is not removed by now. Possibly the code is needed?
 		//if (!$is_comment && $contact["rel"] == Contact::FOLLOWER && in_array($importer["page-flags"], array(User::PAGE_FLAGS_FREELOVE))) {
-		//	DBA::update(
-		//		'contact',
+		//	Contact::update(
 		//		array('rel' => Contact::FRIEND, 'writable' => true),
 		//		array('id' => $contact["id"], 'uid' => $contact["uid"])
 		//	);
@@ -2123,8 +2122,7 @@ class Diaspora
 	private static function receiveRequestMakeFriend(array $importer, array $contact)
 	{
 		if ($contact["rel"] == Contact::SHARING) {
-			DBA::update(
-				'contact',
+			Contact::update(
 				['rel' => Contact::FRIEND, 'writable' => true],
 				['id' => $contact["id"], 'uid' => $importer["uid"]]
 			);
diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 488ade222..e570b13fe 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -445,7 +445,7 @@ class Notifier
 			$condition = ['network' => Protocol::DFRN, 'uid' => $owner['uid'], 'blocked' => false,
 				'pending' => false, 'archive' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]];
 
-			$contacts = DBA::toArray(DBA::select('contact', ['id', 'url', 'addr', 'name', 'network', 'protocol'], $condition));
+			$contacts = DBA::selectToArray('contact', ['id', 'url', 'addr', 'name', 'network', 'protocol'], $condition);
 
 			$conversants = array_merge($contacts, $participants);