Use webfinger in apcontact fetch

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

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index bd8b717779f61e2923e889cdad6b526939b20293..db4ef517d54a7270b6423e50a50539cd2496601e 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -389,7 +389,11 @@ class Probe
 
                self::$istimeout = false;
 
-               $data = self::detect($uri, $network, $uid);
+               if ($network != Protocol::ACTIVITYPUB) {
+                       $data = self::detect($uri, $network, $uid);
+               } else {
+                       $data = null;
+               }
 
                // When the previous detection process had got a time out
                // we could falsely detect a Friendica profile as AP profile.
@@ -397,9 +401,7 @@ class Probe
                        $ap_profile = ActivityPub::probeProfile($uri);
 
                        if (empty($data) || (!empty($ap_profile) && empty($network) && (($data['network'] ?? '') != Protocol::DFRN))) {
-                               $subscribe = $data['subscribe'] ?? '';
                                $data = $ap_profile;
-                               $data['subscribe'] = $subscribe;
                        } elseif (!empty($ap_profile)) {
                                $ap_profile['batch'] = '';
                                $data = array_merge($ap_profile, $data);
@@ -921,7 +923,7 @@ class Probe
         * @return array webfinger data
         * @throws HTTPException\InternalServerErrorException
         */
-       private static function webfinger($url, $type)
+       public static function webfinger($url, $type)
        {
                $xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20);