Merge pull request #7997 from annando/zot-aliases

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

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index c059fd3cdf0368b3c8226f1aef8c5d61c5fd78fd..02a755eec6826b1e43ef6b2a10209df918d0b967 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -724,8 +724,18 @@ class Probe
                        $zot_url = self::$baseurl . '/.well-known/zot-info?address=' . $data['addr'];
                }
 
-               if (!empty($zot_url)) {
-                       $data = self::pollZot($zot_url, $data);
+               if (empty($zot_url)) {
+                       return $data;
+               }
+
+               $data = self::pollZot($zot_url, $data);
+
+               if (!empty($data['url']) && !empty($webfinger['aliases']) && is_array($webfinger['aliases'])) {
+                       foreach ($webfinger['aliases'] as $alias) {
+                               if (!strstr($alias, '@') && Strings::normaliseLink($alias) != Strings::normaliseLink($data['url'])) {
+                                       $data['alias'] = $alias;
+                               }
+                       }
                }
 
                return $data;
@@ -746,7 +756,7 @@ class Probe
                if (!is_array($json)) {
                        return $data;
                }
-//print_r($json);
+
                if (empty($data['network'])) {
                        if (!empty($json['protocols']) && in_array('zot', $json['protocols'])) {
                                $data['network'] = Protocol::ZOT;