X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=5872ae587b53fe84efd4248699a98a2d9cf5c064;hb=e27915a819397f391b5c50b5bf15e2475eb084bf;hp=1e6d8406a12697b58bc181708705ede0d4310fbe;hpb=dbad46c37847f894312c0f1318a21f5ce3606cb0;p=friendica.git diff --git a/src/Network/Probe.php b/src/Network/Probe.php index 1e6d8406a1..5872ae587b 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -30,6 +30,7 @@ use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; +use Friendica\Model\GServer; use Friendica\Model\Profile; use Friendica\Protocol\ActivityNamespace; use Friendica\Protocol\ActivityPub; @@ -86,14 +87,16 @@ class Probe "community", "keywords", "location", "about", "hide", "batch", "notify", "poll", "request", "confirm", "poco", "following", "followers", "inbox", "outbox", "sharedinbox", - "priority", "network", "pubkey", "baseurl"]; + "priority", "network", "pubkey", "baseurl", "gsid"]; $newdata = []; foreach ($fields as $field) { if (isset($data[$field])) { $newdata[$field] = $data[$field]; - } else { + } elseif ($field != "gsid") { $newdata[$field] = ""; + } else { + $newdata[$field] = null; } } @@ -370,7 +373,7 @@ class Probe $data[] = ["@attributes" => $link]; } - if (is_array($webfinger["aliases"])) { + if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) { foreach ($webfinger["aliases"] as $alias) { $data[] = ["@attributes" => ["rel" => "alias", @@ -461,6 +464,10 @@ class Probe $data['baseurl'] = self::$baseurl; } + if (!empty($data['baseurl']) && empty($data['gsid'])) { + $data['gsid'] = GServer::getID($data['baseurl']); + } + if (empty($data['network'])) { $data['network'] = Protocol::PHANTOM; }