From 96b895bc3aa753261a3c648ee8cc545eb3196dcb Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Wed, 28 Aug 2019 16:54:49 +0200
Subject: [PATCH] Changed array name, fixed bug that prevented testing most
 Diaspora endpoints

---
 src/Model/Contact.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 0bde409fa..6887b9d0a 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1570,30 +1570,30 @@ 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;
+			}
+
+			if (!empty($apcontact['sharedinbox']) && DBA::exists('inbox-status', ['archive' => true, 'url' => $apcontact['sharedinbox']])) {
+				return true;
+			}
 		}
 
-		if (!empty($apcontact['inbox']) && DBA::exists('inbox-status', ['archive' => true, 'url' => $apcontact['inbox']])) {
-			return true;
-		}
-
-		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;