Respect "manually improve" during contact request

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index c7cfddbb84a58e51d0611830fbca259237e7fcdb..a220b237d56acfc3c6dbdfaf52797a4bf17a08a0 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -2298,7 +2298,16 @@ class Contact extends BaseObject
 
                $hidden = (($protocol === Protocol::MAIL) ? 1 : 0);
 
-               $pending = in_array($protocol, [Protocol::ACTIVITYPUB]);
+               if ($protocol == Protocol::ACTIVITYPUB) {
+                       $apcontact = APContact::getByURL($url, false);
+                       if (isset($apcontact['manually-approve'])) {
+                               $pending = (bool)$apcontact['manually-approve'];
+                       } else {
+                               $pending = true;
+                       }                       
+               } else {
+                       $pending = false;
+               }
 
                if (in_array($protocol, [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
                        $writeable = 1;