From: Michael <heluecht@pirati.ca>
Date: Mon, 19 Jul 2021 04:49:58 +0000 (+0000)
Subject: Don't probe non existing local contacts
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=01abea7c258ba45b348b93c89aabef5e653c21f4;p=friendica.git

Don't probe non existing local contacts
---

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 12a5b26925..9ee338e8fd 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -2201,39 +2201,33 @@ class Probe
 	 */
 	private static function localProbe(string $url)
 	{
-		$uid = User::getIdForURL($url);
-		if (empty($uid)) {
-			return [];
-		}
-
-		$profile = User::getOwnerDataById($uid);
-		if (empty($profile)) {
-			return [];
-		}
-
-		$approfile = ActivityPub\Transmitter::getProfile($uid);
-		if (empty($approfile)) {
-			return [];
+		if ($uid = User::getIdForURL($url)) {
+			$profile   = User::getOwnerDataById($uid);
+			$approfile = ActivityPub\Transmitter::getProfile($uid);
+
+			if (empty($profile['gsid'])) {
+				$profile['gsid'] = GServer::getID($approfile['generator']['url']);
+			}
+
+			$data = ['name' => $profile['name'], 'nick' => $profile['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
+				'url' => $profile['url'], 'addr' => $profile['addr'], 'alias' => $profile['alias'],
+				'photo' => Contact::getAvatarUrlForId($profile['id'], $profile['updated']),
+				'header' => $profile['header'] ? Contact::getHeaderUrlForId($profile['id'], $profile['updated']) : '',
+				'account-type' => $profile['contact-type'], 'community' => ($profile['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
+				'keywords' => $profile['keywords'], 'location' => $profile['location'], 'about' => $profile['about'], 
+				'hide' => !$profile['net-publish'], 'batch' => '', 'notify' => $profile['notify'],
+				'poll' => $profile['poll'], 'request' => $profile['request'], 'confirm' => $profile['confirm'],
+				'subscribe' => $approfile['generator']['url'] . '/follow?url={uri}', 'poco' => $profile['poco'], 
+				'following' => $approfile['following'], 'followers' => $approfile['followers'],
+				'inbox' => $approfile['inbox'], 'outbox' => $approfile['outbox'],
+				'sharedinbox' => $approfile['endpoints']['sharedInbox'], 'network' => Protocol::DFRN, 
+				'pubkey' => $profile['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $profile['gsid'],
+				'manually-approve' => in_array($profile['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])];
+		} else {
+			// Default values for non existing targets
+			$data = ['name' => $url, 'nick' => $url, 'url' => $url, 'network' => Protocol::PHANTOM,
+				'photo' => DI::baseUrl() . Contact::DEFAULT_AVATAR_PHOTO];
 		}
-
-		if (empty($profile['gsid'])) {
-			$profile['gsid'] = GServer::getID($approfile['generator']['url']);
-		}
-
-		$data = ['name' => $profile['name'], 'nick' => $profile['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
-			'url' => $profile['url'], 'addr' => $profile['addr'], 'alias' => $profile['alias'],
-			'photo' => Contact::getAvatarUrlForId($profile['id'], $profile['updated']),
-			'header' => $profile['header'] ? Contact::getHeaderUrlForId($profile['id'], $profile['updated']) : '',
-			'account-type' => $profile['contact-type'], 'community' => ($profile['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
-			'keywords' => $profile['keywords'], 'location' => $profile['location'], 'about' => $profile['about'], 
-			'hide' => !$profile['net-publish'], 'batch' => '', 'notify' => $profile['notify'],
-			'poll' => $profile['poll'], 'request' => $profile['request'], 'confirm' => $profile['confirm'],
-			'subscribe' => $approfile['generator']['url'] . '/follow?url={uri}', 'poco' => $profile['poco'], 
-			'following' => $approfile['following'], 'followers' => $approfile['followers'],
-			'inbox' => $approfile['inbox'], 'outbox' => $approfile['outbox'],
-			'sharedinbox' => $approfile['endpoints']['sharedInbox'], 'network' => Protocol::DFRN, 
-			'pubkey' => $profile['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $profile['gsid'],
-			'manually-approve' => in_array($profile['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])];
 		return self::rearrangeData($data);		
 	}
 }