From e27ebaee484734aa0aae7e8bbeca8df71a8027aa Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 2 Nov 2019 16:20:17 +0000 Subject: [PATCH] Respect "manually improve" during contact request --- src/Model/Contact.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index c7cfddbb84..a220b237d5 100644 --- 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; -- 2.39.5