Simplified code

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index a9233e8cf29ae0d7927d1e36617e9baaa06b2fee..e61b27d84e30710365cd81803bb7f90871c25f3a 100644 (file)
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -1288,35 +1288,29 @@ 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);
+               } 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('AP followings discovery finished', ['url' => $url]);
+                               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'])) {
                        return;