Detect and remove contact duplicates

src/Worker/Contact/Remove.php

@@ -23,6 +23,7 @@ namespace Friendica\Worker\Contact;
 
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 
 /**
  * Removes a contact and all its related content
@@ -41,7 +42,7 @@ class Remove extends RemoveContent
 			return false;
 		}
 
-		$ret = DBA::delete('contact', ['id' => $id]);
+		$ret = Contact::deleteById($id);
 		Logger::info('Deleted contact', ['id' => $id, 'result' => $ret]);
 
 		return true;

src/Worker/MergeContact.php

@@ -24,6 +24,7 @@ namespace Friendica\Worker;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
+use Friendica\Model\Contact;
 
 class MergeContact
 {
@@ -68,10 +69,57 @@ class MergeContact
 				DBA::update('thread', ['owner-id' => $new_cid], ['owner-id' => $old_cid]);
 			}
 		} else {
-			/// @todo Check if some other data needs to be adjusted as well, possibly the "rel" status?
+			self::mergePersonalContacts($new_cid, $old_cid);
 		}
 
 		// Remove the duplicate
-		DBA::delete('contact', ['id' => $old_cid]);
+		Contact::deleteById($old_cid);
+	}
+
+	/**
+	 * Merge important fields between two contacts
+	 *
+	 * @param integer $first
+	 * @param integer $duplicate
+	 * @return void
+	 */
+	private static function mergePersonalContacts(int $first, int $duplicate)
+	{
+		$fields = ['self', 'remote_self', 'rel', 'prvkey', 'subhub', 'hub-verify', 'priority', 'writable', 'archive', 'pending',
+			'rating', 'notify_new_posts', 'fetch_further_information', 'ffi_keyword_denylist', 'block_reason'];
+		$c1 = Contact::getById($first, $fields);
+		$c2 = Contact::getById($duplicate, $fields);
+
+		$ctarget = $c1;
+
+		if ($c1['self'] || $c2['self']) {
+			return;
+		}
+
+		$ctarget['rel'] = $c1['rel'] | $c2['rel'];
+		foreach (['prvkey', 'hub-verify', 'priority', 'rating', 'fetch_further_information', 'ffi_keyword_denylist', 'block_reason'] as $field) {
+			$ctarget[$field] = $c1[$field] ?: $c2[$field];
+		}
+
+		foreach (['remote_self', 'subhub', 'writable', 'notify_new_posts'] as $field) {
+			$ctarget[$field] = $c1[$field] || $c2[$field];
+		}
+
+		foreach (['archive', 'pending'] as $field) {
+			$ctarget[$field] = $c1[$field] && $c2[$field];
+		}
+
+		$data = [];
+
+		foreach ($fields as $field) {
+			if ($ctarget[$field] != $c1[$field]) {
+				$data[$field] = $ctarget[$field];
+			}
+		}
+
+		if (empty($data)) {
+			return;
+		}
+		Contact::update($data, ['id' => $first]);
 	}
 }

src/Worker/Notifier.php

@@ -502,7 +502,7 @@ class Notifier
 		$a = DI::app();
 		$delivery_queue_count = 0;
 
-		if ($target_item['verb'] == Activity::ANNOUNCE) {
+		if (!empty($target_item['verb']) && ($target_item['verb'] == Activity::ANNOUNCE)) {
 			Logger::notice('Announces are only delivery via ActivityPub', ['cmd' => $cmd, 'id' => $target_item['id'], 'guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'uri' => $target_item['uri']]);
 			return 0;
 		}

src/Worker/PushSubscription.php

@@ -31,7 +31,6 @@ use Friendica\Model\Contact;
 use Friendica\Model\Post;
 use Friendica\Model\Subscription as ModelSubscription;
 use Friendica\Model\User;
-use Friendica\Navigation\Notifications;
 use Friendica\Network\HTTPException\NotFoundException;
 use Minishlink\WebPush\WebPush;
 use Minishlink\WebPush\Subscription;
@@ -91,7 +90,7 @@ class PushSubscription
 		}
 
 		$message = DI::notificationFactory()->getMessageFromNotification($notification);
-		$title = $message['plain'] ?: '';
+		$title = $message['plain'] ?? '';
 
 		$push = Subscription::create([
 			'contentEncoding' => 'aesgcm',

src/Worker/RemoveUnusedContacts.php

@@ -78,7 +78,7 @@ class RemoveUnusedContacts
 			DBA::delete('post-thread-user', ['author-id' => $contact['id']]);
 			DBA::delete('post-thread-user', ['causer-id' => $contact['id']]);
 
-			DBA::delete('contact', ['id' => $contact['id']]);
+			Contact::deleteById($contact['id']);
 			if ((++$count % 1000) == 0) {
 				Logger::info('In removal', ['count' => $count, 'total' => $total]);
 			}