X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=d35490d0d366f7e4ab2b91c10b957e56649345b6;hb=0ab5fed64cdd737817489434f0f008646a28a61d;hp=5beef2ea82bc637f60060811b76218228b48290e;hpb=2761972742da079d58b91d7f125cc1dd33c6db3e;p=friendica.git

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 5beef2ea82..d35490d0d3 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
  *
@@ -139,8 +139,17 @@ class Probe
 		foreach ([Protocol::DIASPORA, Protocol::OSTATUS] as $network) {
 			if (!empty($data['networks'][$network])) {
 				$data['networks'][$network]['subscribe'] = $newdata['subscribe'] ?? '';
-				$data['networks'][$network]['baseurl'] = $newdata['baseurl'] ?? '';
-				$data['networks'][$network]['gsid'] = $newdata['gsid'] ?? 0;
+				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']);
 			}
@@ -687,7 +696,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 [];
 		}
@@ -2211,7 +2220,7 @@ class Probe
 			$approfile = ActivityPub\Transmitter::getProfile($uid);
 
 			$split_name = Diaspora::splitName($owner['name']);
-	
+
 			if (empty($owner['gsid'])) {
 				$owner['gsid'] = GServer::getID($approfile['generator']['url']);
 			}
@@ -2248,7 +2257,7 @@ class Probe
 						'batch'        => $approfile['generator']['url'] . '/receive/public',
 						'notify'       => $owner['notify'],
 						'poll'         => $owner['poll'],
-						'poco'         => $owner['poco'],						
+						'poco'         => $owner['poco'],
 						'network'      => Protocol::DIASPORA,
 						'pubkey'       => $owner['upubkey'],
 					]