Merge pull request #12604 from nupplaphil/bug/marco_r

[friendica.git] / src / Network / Probe.php

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 8a8e1a01f1e7aa6a60fe38f3da28deea937e37dd..d35490d0d366f7e4ab2b91c10b957e56649345b6 100644 (file)
--- 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,9 +2220,7 @@ class Probe
                        $approfile = ActivityPub\Transmitter::getProfile($uid);
 
                        $split_name = Diaspora::splitName($owner['name']);
-                       $firstname = $split_name['first'];
-                       $lastname = $split_name['last'];
-       
+
                        if (empty($owner['gsid'])) {
                                $owner['gsid'] = GServer::getID($approfile['generator']['url']);
                        }
@@ -2237,8 +2244,8 @@ class Probe
                                'networks' => [
                                        Protocol::DIASPORA => [
                                                'name'         => $owner['name'],
-                                               'given_name'   => $firstname,
-                                               'family_name'  => $lastname,
+                                               'given_name'   => $split_name['first'],
+                                               'family_name'  => $split_name['last'],
                                                'nick'         => $owner['nick'],
                                                'guid'         => $approfile['diaspora:guid'],
                                                'url'          => $owner['url'],
@@ -2250,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'],
                                        ]