X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=4a1e1ba77820371c560388262ec672e73b2a896e;hb=960fdb90764ec3c685d940e08008dae8ea60d75c;hp=c54ddc8e997a337dc245aba64f5f8384f378d30d;hpb=8db0e090d7afc3fbfeaf7a587140c80c98233484;p=friendica.git

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index c54ddc8e99..4a1e1ba778 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -38,8 +38,10 @@ use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Protocol\ActivityNamespace;
 use Friendica\Protocol\ActivityPub;
+use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
 use Friendica\Protocol\Feed;
+use Friendica\Protocol\Salmon;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
@@ -52,10 +54,30 @@ use GuzzleHttp\Psr7\Uri;
  */
 class Probe
 {
+	const HOST_META = '/.well-known/host-meta';
 	const WEBFINGER = '/.well-known/webfinger?resource={uri}';
 
+	/**
+	 * @var string Base URL
+	 */
 	private static $baseurl;
-	private static $istimeout;
+
+	/**
+	 * @var boolean Whether a timeout has occured
+	 */
+	private static $isTimeout;
+
+	/**
+	 * Checks if the provided network can be probed
+	 *
+	 * @param string $network
+	 *
+	 * @return boolean
+	 */
+	public static function isProbable(string $network): bool
+	{
+		return (in_array($network, array_merge(Protocol::FEDERATED, [Protocol::ZOT, Protocol::PHANTOM])));
+	}
 
 	/**
 	 * Remove stuff from an URI that doesn't belong there
@@ -66,7 +88,7 @@ class Probe
 	public static function cleanURI(string $rawUri): string
 	{
 		// At first remove leading and trailing junk
-		$rawUri = trim($rawUri, "@#?:/ \t\n\r\0\x0B");
+		$rawUri = trim($rawUri, "@#?: \t\n\r\0\x0B");
 
 		$rawUri = Network::convertToIdn($rawUri);
 
@@ -89,7 +111,8 @@ class Probe
 	 */
 	private static function rearrangeData(array $data): array
 	{
-		$fields = ['name', 'nick', 'guid', 'url', 'addr', 'alias', 'photo', 'header',
+		$fields = ['name', 'given_name', 'family_name', 'nick', 'guid', 'url', 'addr', 'alias',
+		        'photo', 'photo_medium', 'photo_small', 'header',
 				'account-type', 'community', 'keywords', 'location', 'about', 'xmpp', 'matrix',
 				'hide', 'batch', 'notify', 'poll', 'request', 'confirm', 'subscribe', 'poco',
 				'following', 'followers', 'inbox', 'outbox', 'sharedinbox',
@@ -97,13 +120,22 @@ class Probe
 
 		$numeric_fields = ['gsid', 'hide', 'account-type', 'manually-approve'];
 
+		if (!empty($data['photo'])) {
+			$data['photo'] = Network::addBasePath($data['photo'], $data['url']);
+
+			if (!Network::isValidHttpUrl($data['photo'])) {
+				Logger::warning('Invalid URL for photo', ['url' => $data['url'], 'photo' => $data['photo']]);
+				unset($data['photo']);
+			}
+		}
+
 		$newdata = [];
 		foreach ($fields as $field) {
 			if (isset($data[$field])) {
 				if (in_array($field, $numeric_fields)) {
 					$newdata[$field] = (int)$data[$field];
 				} else {
-					$newdata[$field] = $data[$field];
+					$newdata[$field] = trim($data[$field]);
 				}
 			} elseif (!in_array($field, $numeric_fields)) {
 				$newdata[$field] = '';
@@ -112,6 +144,26 @@ class Probe
 			}
 		}
 
+		$newdata['networks'] = [];
+		foreach ([Protocol::DIASPORA, Protocol::OSTATUS] as $network) {
+			if (!empty($data['networks'][$network])) {
+				$data['networks'][$network]['subscribe'] = $newdata['subscribe'] ?? '';
+				if (empty($data['networks'][$network]['baseurl'])) {
+					$data['networks'][$network]['baseurl'] = $newdata['baseurl'] ?? '';
+				} else {
+					$newdata['baseurl'] = $data['networks'][$network]['baseurl'];
+				}
+				if (!empty($newdata['baseurl'])) {
+					$newdata['gsid'] = $data['networks'][$network]['gsid'] = GServer::getID($newdata['baseurl']);
+				} else {
+					$newdata['gsid'] = $data['networks'][$network]['gsid'] = null;
+				}
+
+				$newdata['networks'][$network] = self::rearrangeData($data['networks'][$network]);
+				unset($newdata['networks'][$network]['networks']);
+			}
+		}
+
 		// We don't use the "priority" field anymore and replace it with a dummy.
 		$newdata['priority'] = 0;
 
@@ -131,7 +183,7 @@ class Probe
 		$parts = parse_url($host);
 
 		if (!isset($parts['scheme'])) {
-			$parts = parse_url('http://'.$host);
+			$parts = parse_url('http://' . $host);
 		}
 
 		if (!isset($parts['host'])) {
@@ -147,6 +199,7 @@ class Probe
 	 * It seems as if it was dropped from the standard.
 	 *
 	 * @param string $host The host part of an url
+	 *
 	 * @return array with template and type of the webfinger template for JSON or XML
 	 * @throws HTTPException\InternalServerErrorException
 	 */
@@ -157,10 +210,10 @@ class Probe
 
 		// Handles the case when the hostname contains the scheme
 		if (!parse_url($host, PHP_URL_SCHEME)) {
-			$ssl_url = 'https://' . $host . '/.well-known/host-meta';
-			$url = 'http://' . $host . '/.well-known/host-meta';
+			$ssl_url = 'https://' . $host . self::HOST_META;
+			$url = 'http://' . $host . self::HOST_META;
 		} else {
-			$ssl_url = $host . '/.well-known/host-meta';
+			$ssl_url = $host . self::HOST_META;
 			$url = '';
 		}
 
@@ -181,7 +234,7 @@ class Probe
 			}
 		} elseif ($curlResult->isTimeout()) {
 			Logger::info('Probing timeout', ['url' => $ssl_url]);
-			self::$istimeout = true;
+			self::$isTimeout = true;
 			return [];
 		}
 
@@ -190,10 +243,10 @@ class Probe
 			$connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
 			if ($curlResult->isTimeout()) {
 				Logger::info('Probing timeout', ['url' => $url]);
-				self::$istimeout = true;
+				self::$isTimeout = true;
 				return [];
 			} elseif ($connection_error && $ssl_connection_error) {
-				self::$istimeout = true;
+				self::$isTimeout = true;
 				return [];
 			}
 
@@ -294,7 +347,7 @@ class Probe
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function uri($uri, $network = '', $uid = -1)
+	public static function uri(string $uri, string $network = '', int $uid = -1): array
 	{
 		// Local profiles aren't probed via network
 		if (empty($network) && Contact::isLocal($uri)) {
@@ -305,7 +358,7 @@ class Probe
 		}
 
 		if ($uid == -1) {
-			$uid = local_user();
+			$uid = DI::userSession()->getLocalUserId();
 		}
 
 		if (empty($network) || ($network == Protocol::ACTIVITYPUB)) {
@@ -314,7 +367,7 @@ class Probe
 			$ap_profile = [];
 		}
 
-		self::$istimeout = false;
+		self::$isTimeout = false;
 
 		if ($network != Protocol::ACTIVITYPUB) {
 			$data = self::detect($uri, $network, $uid, $ap_profile);
@@ -322,7 +375,13 @@ class Probe
 				$data = [];
 			}
 			if (empty($data) || (!empty($ap_profile) && empty($network) && (($data['network'] ?? '') != Protocol::DFRN))) {
+				$networks = $data['networks'] ?? [];
+				unset($data['networks']);
+				if (!empty($data['network'])) {
+					$networks[$data['network']] = $data;
+				}
 				$data = $ap_profile;
+				$data['networks'] = $networks;
 			} elseif (!empty($ap_profile)) {
 				$ap_profile['batch'] = '';
 				$data = array_merge($ap_profile, $data);
@@ -443,6 +502,7 @@ class Probe
 	 *
 	 * @param array $result Result array
 	 * @param array $webfinger Webfinger data
+	 *
 	 * @return array result Altered/unaltered result array
 	 */
 	private static function getSubscribeLink(array $result, array $webfinger): array
@@ -464,10 +524,11 @@ class Probe
 	 * Get webfinger data from a given URI
 	 *
 	 * @param string $uri URI
+	 *
 	 * @return array Webfinger data
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	private static function getWebfingerArray(string $uri): array
+	public static function getWebfingerArray(string $uri): array
 	{
 		$parts = parse_url($uri);
 
@@ -521,13 +582,13 @@ class Probe
 			$addr = $uri;
 
 			$webfinger = self::getWebfinger('https://' . $host . self::WEBFINGER, HttpClientAccept::JRD_JSON, $uri, $addr);
-			if (self::$istimeout) {
+			if (self::$isTimeout) {
 				return [];
 			}
 
 			if (empty($webfinger)) {
 				$webfinger = self::getWebfinger('http://' . $host . self::WEBFINGER, HttpClientAccept::JRD_JSON, $uri, $addr);
-				if (self::$istimeout) {
+				if (self::$isTimeout) {
 					return [];
 				}
 			} else {
@@ -536,7 +597,7 @@ class Probe
 
 			if (empty($webfinger)) {
 				$lrdd = self::hostMeta($host);
-				if (self::$istimeout) {
+				if (self::$isTimeout) {
 					return [];
 				}
 				$baseurl = self::$baseurl;
@@ -579,6 +640,7 @@ class Probe
 	 * @param string $type
 	 * @param string $uri
 	 * @param string $addr
+	 *
 	 * @return array webfinger results
 	 */
 	private static function getWebfinger(string $template, string $type, string $uri, string $addr): array
@@ -593,7 +655,7 @@ class Probe
 			$detected = $addr;
 			$path = str_replace('{uri}', urlencode('acct:' . $addr), $template);
 			$webfinger = self::webfinger($path, $type);
-			if (self::$istimeout) {
+			if (self::$isTimeout) {
 				return [];
 			}
 		}
@@ -603,7 +665,7 @@ class Probe
 			$detected = $uri;
 			$path = str_replace('{uri}', urlencode($uri), $template);
 			$webfinger = self::webfinger($path, $type);
-			if (self::$istimeout) {
+			if (self::$isTimeout) {
 				return [];
 			}
 		}
@@ -643,7 +705,7 @@ class Probe
 		}
 
 		$parts = parse_url($uri);
-		if (empty($parts['scheme']) && empty($parts['host']) && !strstr($parts['path'], '@')) {
+		if (empty($parts['scheme']) && empty($parts['host']) && (empty($parts['path']) || strpos($parts['path'], '@') === false)) {
 			Logger::info('URI was not detectable', ['uri' => $uri]);
 			return [];
 		}
@@ -690,21 +752,25 @@ class Probe
 		}
 		if ((!$result && ($network == '')) || ($network == Protocol::DIASPORA)) {
 			$result = self::diaspora($webfinger);
+		} else {
+			$result['networks'][Protocol::DIASPORA] = self::diaspora($webfinger);
 		}
 		if ((!$result && ($network == '')) || ($network == Protocol::OSTATUS)) {
 			$result = self::ostatus($webfinger);
+		} else {
+			$result['networks'][Protocol::OSTATUS] = self::ostatus($webfinger);
 		}
 		if (in_array($network, ['', Protocol::ZOT])) {
 			$result = self::zot($webfinger, $result, $baseurl);
 		}
 		if ((!$result && ($network == '')) || ($network == Protocol::PUMPIO)) {
-			$result = self::pumpio($webfinger, $addr);
+			$result = self::pumpio($webfinger, $addr, $baseurl);
 		}
 		if (empty($result['network']) && empty($ap_profile['network']) || ($network == Protocol::FEED)) {
 			$result = self::feed($uri);
 		} else {
 			// We overwrite the detected nick with our try if the previois routines hadn't detected it.
-			// Additionally it is overwritten when the nickname doesn't make sense (contains spaces).
+			// Additionally, it is overwritten when the nickname doesn't make sense (contains spaces).
 			if ((empty($result['nick']) || (strstr($result['nick'], ' '))) && ($nick != '')) {
 				$result['nick'] = $nick;
 			}
@@ -739,6 +805,7 @@ class Probe
 	 * @param array  $webfinger Webfinger data
 	 * @param array  $data      previously probed data
 	 * @param string $baseUrl   Base URL
+	 *
 	 * @return array Zot data
 	 * @throws HTTPException\InternalServerErrorException
 	 */
@@ -879,6 +946,7 @@ class Probe
 	 *
 	 * @param string $url  Address that should be probed
 	 * @param string $type type
+	 *
 	 * @return array webfinger data
 	 * @throws HTTPException\InternalServerErrorException
 	 */
@@ -888,7 +956,7 @@ class Probe
 
 		$curlResult = DI::httpClient()->get($url, $type, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
 		if ($curlResult->isTimeout()) {
-			self::$istimeout = true;
+			self::$isTimeout = true;
 			return [];
 		}
 		$data = $curlResult->getBody();
@@ -949,6 +1017,7 @@ class Probe
 	 *
 	 * @param string $noscrape_url Link to the noscrape page
 	 * @param array  $data         The already fetched data
+	 *
 	 * @return array noscrape data
 	 * @throws HTTPException\InternalServerErrorException
 	 */
@@ -956,7 +1025,7 @@ class Probe
 	{
 		$curlResult = DI::httpClient()->get($noscrape_url, HttpClientAccept::JSON);
 		if ($curlResult->isTimeout()) {
-			self::$istimeout = true;
+			self::$isTimeout = true;
 			return $data;
 		}
 		$content = $curlResult->getBody();
@@ -1055,7 +1124,7 @@ class Probe
 	 *
 	 * @return int Number of errors
 	 */
-	public static function validDfrn($data)
+	public static function validDfrn(array $data): int
 	{
 		$errors = 0;
 		if (!isset($data['key'])) {
@@ -1218,7 +1287,7 @@ class Probe
 	{
 		$curlResult = DI::httpClient()->get($hcard_url, HttpClientAccept::HTML);
 		if ($curlResult->isTimeout()) {
-			self::$istimeout = true;
+			self::$isTimeout = true;
 			return [];
 		}
 		$content = $curlResult->getBody();
@@ -1262,9 +1331,19 @@ class Probe
 				$data['name'] = $search->item(0)->nodeValue;
 			}
 
+			$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' given_name ')]", $vcard); // */
+			if ($search->length > 0) {
+				$data["given_name"] = $search->item(0)->nodeValue;
+			}
+
+			$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' family_name ')]", $vcard); // */
+			if ($search->length > 0) {
+				$data["family_name"] = $search->item(0)->nodeValue;
+			}
+
 			$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' searchable ')]", $vcard); // */
 			if ($search->length > 0) {
-				$data['searchable'] = $search->item(0)->nodeValue;
+				$data['hide'] = (strtolower($search->item(0)->nodeValue) != 'true');
 			}
 
 			$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' key ')]", $vcard); // */
@@ -1281,7 +1360,7 @@ class Probe
 			}
 		}
 
-		$avatar = [];
+		$avatars = [];
 		if (!empty($vcard)) {
 			$photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */
 			foreach ($photos as $photo) {
@@ -1291,20 +1370,27 @@ class Probe
 				}
 
 				if (isset($attr['src']) && isset($attr['width'])) {
-					$avatar[$attr['width']] = $attr['src'];
+					$avatars[$attr['width']] = self::fixAvatar($attr['src'], $data['baseurl']);
 				}
 
 				// We don't have a width. So we just take everything that we got.
 				// This is a Hubzilla workaround which doesn't send a width.
-				if ((sizeof($avatar) == 0) && !empty($attr['src'])) {
-					$avatar[] = $attr['src'];
+				if (!$avatars && !empty($attr['src'])) {
+					$avatars[] = self::fixAvatar($attr['src'], $data['baseurl']);
 				}
 			}
 		}
 
-		if (sizeof($avatar)) {
-			ksort($avatar);
-			$data['photo'] = self::fixAvatar(array_pop($avatar), $data['baseurl']);
+		if ($avatars) {
+			ksort($avatars);
+			$data['photo'] = array_pop($avatars);
+			if ($avatars) {
+				$data['photo_medium'] = array_pop($avatars);
+			}
+
+			if ($avatars) {
+				$data['photo_small'] = array_pop($avatars);
+			}
 		}
 
 		if ($dfrn) {
@@ -1328,7 +1414,6 @@ class Probe
 			}
 		}
 
-
 		return $data;
 	}
 
@@ -1336,6 +1421,7 @@ class Probe
 	 * Check for Diaspora contact
 	 *
 	 * @param array $webfinger Webfinger data
+	 *
 	 * @return array Diaspora data
 	 * @throws HTTPException\InternalServerErrorException
 	 */
@@ -1430,6 +1516,7 @@ class Probe
 	 *
 	 * @param array $webfinger Webfinger data
 	 * @param bool  $short     Short detection mode
+	 *
 	 * @return array|bool OStatus data or "false" on error or "true" on short mode
 	 * @throws HTTPException\InternalServerErrorException
 	 */
@@ -1476,19 +1563,17 @@ class Probe
 					} elseif (Strings::normaliseLink($pubkey) == 'http://') {
 						$curlResult = DI::httpClient()->get($pubkey, HttpClientAccept::MAGIC_KEY);
 						if ($curlResult->isTimeout()) {
-							self::$istimeout = true;
+							self::$isTimeout = true;
 							return $short ? false : [];
 						}
 						Logger::debug('Fetched public key', ['Content-Type' => $curlResult->getHeader('Content-Type'), 'url' => $pubkey]);
 						$pubkey = $curlResult->getBody();
 					}
 
-					$key = explode('.', $pubkey);
+					try {
+						$data['pubkey'] = Salmon::magicKeyToPem($pubkey);
+					} catch (\Throwable $e) {
 
-					if (sizeof($key) >= 3) {
-						$m = Strings::base64UrlDecode($key[1]);
-						$e = Strings::base64UrlDecode($key[2]);
-						$data['pubkey'] = Crypto::meToPem($m, $e);
 					}
 				}
 			}
@@ -1511,7 +1596,7 @@ class Probe
 		// Fetch all additional data from the feed
 		$curlResult = DI::httpClient()->get($data['poll'], HttpClientAccept::FEED_XML);
 		if ($curlResult->isTimeout()) {
-			self::$istimeout = true;
+			self::$isTimeout = true;
 			return [];
 		}
 		$feed = $curlResult->getBody();
@@ -1556,9 +1641,10 @@ class Probe
 	 * Fetch data from a pump.io profile page
 	 *
 	 * @param string $profile_link Link to the profile page
+	 *
 	 * @return array Profile data
 	 */
-	private static function pumpioProfileData(string $profile_link): array
+	private static function pumpioProfileData(string $profile_link, string $baseurl): array
 	{
 		$curlResult = DI::httpClient()->get($profile_link, HttpClientAccept::HTML);
 		if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
@@ -1602,8 +1688,8 @@ class Probe
 		}
 		if ($avatar) {
 			foreach ($avatar->attributes as $attribute) {
-				if ($attribute->name == 'src') {
-					$data['photo'] = trim($attribute->value);
+				if (($attribute->name == 'src') && !empty($attribute->value)) {
+					$data['photo'] = Network::addBasePath($attribute->value, $baseurl);
 				}
 			}
 		}
@@ -1616,9 +1702,10 @@ class Probe
 	 *
 	 * @param array  $webfinger Webfinger data
 	 * @param string $addr
+	 *
 	 * @return array pump.io data
 	 */
-	private static function pumpio(array $webfinger, string $addr): array
+	private static function pumpio(array $webfinger, string $addr, string $baseurl): array
 	{
 		$data = [];
 		// The array is reversed to take into account the order of preference for same-rel links
@@ -1650,7 +1737,7 @@ class Probe
 			return [];
 		}
 
-		$profile_data = self::pumpioProfileData($data['url']);
+		$profile_data = self::pumpioProfileData($data['url'], $baseurl);
 
 		if (!$profile_data) {
 			return [];
@@ -1673,6 +1760,7 @@ class Probe
 	 *
 	 * @param string $url  Page link
 	 * @param string $body Page body string
+	 *
 	 * @return string|false Feed link or false if body was invalid HTML document
 	 */
 	public static function getFeedLink(string $url, string $body)
@@ -1689,6 +1777,7 @@ class Probe
 		$xpath = new DOMXPath($doc);
 
 		$feedUrl = $xpath->evaluate('string(/html/head/link[@type="application/rss+xml" and @rel="alternate"]/@href)');
+		$feedUrl = $feedUrl ?: $xpath->evaluate('string(/html/head/link[@type="application/atom+xml" and @rel="alternate"]/@href)');
 
 		$feedUrl = $feedUrl ? self::ensureAbsoluteLinkFromHTMLDoc($feedUrl, $url, $xpath) : '';
 
@@ -1705,6 +1794,7 @@ class Probe
 	 * @param string   $href  The potential relative href found in the HTML document
 	 * @param string   $base  The HTML document URL
 	 * @param DOMXPath $xpath The HTML document XPath
+	 *
 	 * @return string Absolute URL
 	 */
 	private static function ensureAbsoluteLinkFromHTMLDoc(string $href, string $base, DOMXPath $xpath): string
@@ -1738,7 +1828,7 @@ class Probe
 				// Resolve arbitrary relative path
 				// Lifted from https://www.php.net/manual/en/function.realpath.php#84012
 				$parts = array_filter(explode('/', $path), 'strlen');
-				$absolutes = array();
+				$absolutes = [];
 				foreach ($parts as $part) {
 					if ('.' == $part) continue;
 					if ('..' == $part) {
@@ -1766,16 +1856,24 @@ class Probe
 	 *
 	 * @param string  $url   Profile link
 	 * @param boolean $probe Do a probe if the page contains a feed link
+	 *
 	 * @return array feed data
 	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function feed(string $url, bool $probe = true): array
 	{
-		$curlResult = DI::httpClient()->get($url, HttpClientAccept::FEED_XML);
+		try {
+			$curlResult = DI::httpClient()->get($url, HttpClientAccept::FEED_XML);
+		} catch(\Throwable $e) {
+			DI::logger()->info('Error requesting feed URL', ['url' => $url, 'exception' => $e]);
+			return [];
+		}
+
 		if ($curlResult->isTimeout()) {
-			self::$istimeout = true;
+			self::$isTimeout = true;
 			return [];
 		}
+
 		$feed = $curlResult->getBody();
 		$feed_data = Feed::import($feed);
 
@@ -1822,6 +1920,7 @@ class Probe
 	 *
 	 * @param string  $uri Profile link
 	 * @param integer $uid User ID
+	 *
 	 * @return array mail data
 	 * @throws \Exception
 	 */
@@ -1862,22 +1961,26 @@ class Probe
 
 		$phost = substr($uri, strpos($uri, '@') + 1);
 
-		$data = [];
-		$data['addr']    = $uri;
-		$data['network'] = Protocol::MAIL;
-		$data['name']    = substr($uri, 0, strpos($uri, '@'));
+		$data = [
+			'addr'    => $uri,
+			'network' => Protocol::MAIL,
+			'name'    => substr($uri, 0, strpos($uri, '@')),
+			'photo'   => Network::lookupAvatarByEmail($uri),
+			'url'     => 'mailto:' . $uri,
+			'notify'  => 'smtp ' . Strings::getRandomHex(),
+			'poll'    => 'email ' . Strings::getRandomHex(),
+		];
+
 		$data['nick']    = $data['name'];
-		$data['photo']   = Network::lookupAvatarByEmail($uri);
-		$data['url']     = 'mailto:'.$uri;
-		$data['notify']  = 'smtp ' . Strings::getRandomHex();
-		$data['poll']    = 'email ' . Strings::getRandomHex();
 
 		$x = Email::messageMeta($mbox, $msgs[0]);
+
 		if (stristr($x[0]->from, $uri)) {
 			$adr = imap_rfc822_parse_adrlist($x[0]->from, '');
 		} elseif (stristr($x[0]->to, $uri)) {
 			$adr = imap_rfc822_parse_adrlist($x[0]->to, '');
 		}
+
 		if (isset($adr)) {
 			foreach ($adr as $feadr) {
 				if ((strcasecmp($feadr->mailbox, $data['name']) == 0)
@@ -1896,9 +1999,11 @@ class Probe
 				}
 			}
 		}
+
 		if (!empty($mbox)) {
 			imap_close($mbox);
 		}
+
 		return $data;
 	}
 
@@ -1907,6 +2012,7 @@ class Probe
 	 *
 	 * @param string $avatar Path to the avatar
 	 * @param string $base   Another path that is hopefully complete
+	 *
 	 * @return string fixed avatar path
 	 * @throws \Exception
 	 */
@@ -1943,6 +2049,7 @@ class Probe
 	 * Fetch the last date that the contact had posted something (publically)
 	 *
 	 * @param array $data  probing result
+	 *
 	 * @return string last activity
 	 */
 	public static function getLastUpdate(array $data): string
@@ -1974,6 +2081,7 @@ class Probe
 	 * Fetch the last activity date from the "noscrape" endpoint
 	 *
 	 * @param array $data Probing result
+	 *
 	 * @return string last activity or true if update was successful or the server was unreachable
 	 */
 	private static function updateFromNoScrape(array $data): string
@@ -2006,6 +2114,7 @@ class Probe
 	 *
 	 * @param string $feed
 	 * @param array  $data Probing result
+	 *
 	 * @return string last activity
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
@@ -2110,6 +2219,7 @@ class Probe
 	 * Probe data from local profiles without network traffic
 	 *
 	 * @param string $url
+	 *
 	 * @return array probed data
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws HTTPException\NotFoundException
@@ -2125,26 +2235,49 @@ class Probe
 			$owner     = User::getOwnerDataById($uid);
 			$approfile = ActivityPub\Transmitter::getProfile($uid);
 
+			$split_name = Diaspora::splitName($owner['name']);
+
 			if (empty($owner['gsid'])) {
 				$owner['gsid'] = GServer::getID($approfile['generator']['url']);
 			}
 
 			$data = [
-				'name' => $owner['name'], 'nick' => $owner['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
-				'url' => $owner['url'], 'addr' => $owner['addr'], 'alias' => $owner['alias'],
-				'photo' => User::getAvatarUrl($owner),
-				'header' => $owner['header'] ? Contact::getHeaderUrlForId($owner['id'], $owner['updated']) : '',
-				'account-type' => $owner['contact-type'], 'community' => ($owner['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
-				'keywords' => $owner['keywords'], 'location' => $owner['location'], 'about' => $owner['about'],
-				'xmpp' => $owner['xmpp'], 'matrix' => $owner['matrix'],
-				'hide' => !$owner['net-publish'], 'batch' => '', 'notify' => $owner['notify'],
-				'poll' => $owner['poll'], 'request' => $owner['request'], 'confirm' => $owner['confirm'],
-				'subscribe' => $approfile['generator']['url'] . '/follow?url={uri}', 'poco' => $owner['poco'],
-				'following' => $approfile['following'], 'followers' => $approfile['followers'],
-				'inbox' => $approfile['inbox'], 'outbox' => $approfile['outbox'],
-				'sharedinbox' => $approfile['endpoints']['sharedInbox'], 'network' => Protocol::DFRN,
-				'pubkey' => $owner['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $owner['gsid'],
-				'manually-approve' => in_array($owner['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])
+				'name'             => $owner['name'], 'nick' => $owner['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
+				'url'              => $owner['url'], 'addr' => $owner['addr'], 'alias' => $owner['alias'],
+				'photo'            => User::getAvatarUrl($owner),
+				'header'           => $owner['header'] ? Contact::getHeaderUrlForId($owner['id'], $owner['updated']) : '',
+				'account-type'     => $owner['contact-type'], 'community' => ($owner['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
+				'keywords'         => $owner['keywords'], 'location' => $owner['location'], 'about' => $owner['about'],
+				'xmpp'             => $owner['xmpp'], 'matrix' => $owner['matrix'],
+				'hide'             => !$owner['net-publish'], 'batch' => '', 'notify' => $owner['notify'],
+				'poll'             => $owner['poll'], 'request' => $owner['request'], 'confirm' => $owner['confirm'],
+				'subscribe'        => $approfile['generator']['url'] . '/contact/follow?url={uri}', 'poco' => $owner['poco'],
+				'following'        => $approfile['following'], 'followers' => $approfile['followers'],
+				'inbox'            => $approfile['inbox'], 'outbox' => $approfile['outbox'],
+				'sharedinbox'      => $approfile['endpoints']['sharedInbox'], 'network' => Protocol::DFRN,
+				'pubkey'           => $owner['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $owner['gsid'],
+				'manually-approve' => in_array($owner['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP]),
+				'networks' => [
+					Protocol::DIASPORA => [
+						'name'         => $owner['name'],
+						'given_name'   => $split_name['first'],
+						'family_name'  => $split_name['last'],
+						'nick'         => $owner['nick'],
+						'guid'         => $approfile['diaspora:guid'],
+						'url'          => $owner['url'],
+						'addr'         => $owner['addr'],
+						'alias'        => $owner['alias'],
+						'photo'        => $owner['photo'],
+						'photo_medium' => $owner['thumb'],
+						'photo_small'  => $owner['micro'],
+						'batch'        => $approfile['generator']['url'] . '/receive/public',
+						'notify'       => $owner['notify'],
+						'poll'         => $owner['poll'],
+						'poco'         => $owner['poco'],
+						'network'      => Protocol::DIASPORA,
+						'pubkey'       => $owner['upubkey'],
+					]
+				]
 			];
 		} catch (Exception $e) {
 			// Default values for non existing targets