bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Changed array name, fixed bug that prevented testing most Diaspora endpoints

Browse source
This commit is contained in:
Michael Vogel 2019-08-28 16:54:49 +02:00
parent 3c9834922c
commit 96b895bc3a
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Model/Contact.php
View file

@ -1570,20 +1570,18 @@ class Contact extends BaseObject
return false;
}
$archived = DBA::selectFirst('contact', ['archive', 'url', 'batch'], ['id' => $cid]);
if (!DBA::isResult($archived)) {
$contact = DBA::selectFirst('contact', ['archive', 'url', 'batch'], ['id' => $cid]);
if (!DBA::isResult($contact)) {
return false;
}
if ($archived['archive']) {
if ($contact['archive']) {
return true;
}
$apcontact = APContact::getByURL($archived['url'], false);
if (empty($apcontact)) {
return false;
}
// Check status of ActivityPub endpoints
$apcontact = APContact::getByURL($contact['url'], false);
if (!empty($apcontact)) {
if (!empty($apcontact['inbox']) && DBA::exists('inbox-status', ['archive' => true, 'url' => $apcontact['inbox']])) {
return true;
}
@ -1591,9 +1589,11 @@ class Contact extends BaseObject
if (!empty($apcontact['sharedinbox']) && DBA::exists('inbox-status', ['archive' => true, 'url' => $apcontact['sharedinbox']])) {
return true;
}
}
if (!empty($archived['batch'])) {
return DBA::exists('contact', ['archive' => true, 'batch' => $archived['batch'], 'contact-type' => self::TYPE_RELAY]);
// Check status of Diaspora endpoints
if (!empty($contact['batch'])) {
return DBA::exists('contact', ['archive' => true, 'batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY]);
}
return false;