From 1ce9a31ca443fb8249074acae0e139e418535d91 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 6 Mar 2020 06:44:17 +0000
Subject: [PATCH] Simplified code

---
 src/Model/GContact.php | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index a9233e8cf2..e61b27d84e 100644
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -1288,34 +1288,28 @@ class GContact
 
 		if (!empty($apcontact['followers']) && is_string($apcontact['followers'])) {
 			$followers = ActivityPub::fetchItems($apcontact['followers']);
-			if (!empty($followers)) {
-				Logger::info('Discover AP followers', ['url' => $url, 'contacts' => count($followers)]);
-				foreach ($followers as $follower) {
-					if (DBA::exists('gcontact', ['nurl' => Strings::normaliseLink(($follower))])) {
-						continue;
-					}
-					Logger::info('Discover new AP contact', ['url' => $follower]);
-					Worker::add(PRIORITY_LOW, 'UpdateGContact', $follower);
-				}
-				Logger::info('AP followers discovery finished', ['url' => $url]);
-			}
+		} else {
+			$followers = [];
 		}
 
 		if (!empty($apcontact['following']) && is_string($apcontact['following'])) {
 			$followings = ActivityPub::fetchItems($apcontact['following']);
-			if (!empty($followings)) {
-				Logger::info('Discover AP followings', ['url' => $url, 'contacts' => count($followings)]);
-				foreach ($followings as $following) {
-					if (DBA::exists('gcontact', ['nurl' => Strings::normaliseLink(($following))])) {
-						continue;
-					}
-					Logger::info('Discover new AP contact', ['url' => $following]);
-					Worker::add(PRIORITY_LOW, 'UpdateGContact', $following);
-				}
-				Logger::info('AP followings discovery finished', ['url' => $url]);
-			}
+		} else {
+			$followings = [];
 		}
 
+		if (!empty($followers) || !empty($followings)) {
+			$contacts = array_unique(array_merge($followers, $followings));
+			Logger::info('Discover AP contacts', ['url' => $url, 'contacts' => count($contacts)]);
+			foreach ($contacts as $contact) {
+				if (DBA::exists('gcontact', ['nurl' => Strings::normaliseLink(($contact))])) {
+					continue;
+				}
+				Logger::info('Discover new AP contact', ['url' => $contact]);
+				Worker::add(PRIORITY_LOW, 'UpdateGContact', $contact);
+			}
+			Logger::info('AP contacts discovery finished', ['url' => $url]);
+		}
 
 		$data = Probe::uri($url);
 		if (empty($data['poco'])) {