tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #7800 from annando/manually-improve

Browse source 
AP: Respect "manually approve" during contact request
This commit is contained in:
Hypolite Petovan 2019-11-02 12:45:43 -04:00 committed by GitHub
parent 9f215fc33b 9461446374
commit b8a22de2d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Model/Contact.php
View file

@ -2298,7 +2298,13 @@ class Contact extends BaseObject
$hidden = (($protocol === Protocol::MAIL) ? 1 : 0); $hidden = (($protocol === Protocol::MAIL) ? 1 : 0);
$pending = in_array($protocol, [Protocol::ACTIVITYPUB]); $pending = false;
if ($protocol == Protocol::ACTIVITYPUB) {
$apcontact = APContact::getByURL($url, false);
if (isset($apcontact['manually-approve'])) {
$pending = (bool)$apcontact['manually-approve'];
}
}
if (in_array($protocol, [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) { if (in_array($protocol, [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
$writeable = 1; $writeable = 1;