Zot seems to work now

This commit is contained in:
Michael 2019-12-23 15:07:49 +00:00
parent 2306b949f2
commit 7fd1d674a9

View file

@ -647,9 +647,9 @@ class Probe
if ((!$result && ($network == "")) || ($network == Protocol::OSTATUS)) { if ((!$result && ($network == "")) || ($network == Protocol::OSTATUS)) {
$result = self::ostatus($webfinger); $result = self::ostatus($webfinger);
} }
// if (in_array($network, ['', Protocol::ZOT])) { if (in_array($network, ['', Protocol::ZOT])) {
// $result = self::zot($webfinger, $result); $result = self::zot($webfinger, $result);
// } }
if ((!$result && ($network == "")) || ($network == Protocol::PUMPIO)) { if ((!$result && ($network == "")) || ($network == Protocol::PUMPIO)) {
$result = self::pumpio($webfinger, $addr); $result = self::pumpio($webfinger, $addr);
} }
@ -719,7 +719,7 @@ class Probe
if (empty($zot_url) && !empty($data['addr']) && !empty(self::$baseurl)) { if (empty($zot_url) && !empty($data['addr']) && !empty(self::$baseurl)) {
$condition = ['nurl' => Strings::normaliseLink(self::$baseurl), 'platform' => ['hubzilla']]; $condition = ['nurl' => Strings::normaliseLink(self::$baseurl), 'platform' => ['hubzilla']];
if (!DBA::exists('gserver', $condition)) { if (!DBA::exists('gserver', $condition)) {
exit; return $data;
} }
$zot_url = self::$baseurl . '/.well-known/zot-info?address=' . $data['addr']; $zot_url = self::$baseurl . '/.well-known/zot-info?address=' . $data['addr'];
} }
@ -1324,7 +1324,7 @@ class Probe
} }
if (empty($data["url"]) || empty($hcard_url)) { if (empty($data["url"]) || empty($hcard_url)) {
return $data; return false;
} }
if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) { if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) {