Changed array name, fixed bug that prevented testing most Diaspora endpoints
This commit is contained in:
parent
3c9834922c
commit
96b895bc3a
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue