friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Respect "manually improve" during contact request

This commit is contained in:
Michael 2019-11-02 16:20:17 +00:00
parent bc18cde412
commit e27ebaee48
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Model/Contact.php
View File

@ -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;