Contact follow and unfollow workd partially

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

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 6e4996de54e54398a1f72bdf457a973364ad15c1..2cf91486bbdd8428ac51f07c1a8061163c478198 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -19,6 +19,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Protocol\Email;
 use Friendica\Protocol\Feed;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
@@ -328,7 +329,18 @@ class Probe
                        $uid = local_user();
                }
 
-               $data = self::detect($uri, $network, $uid);
+               if ($network != Protocol::ACTIVITYPUB) {
+                       $data = self::detect($uri, $network, $uid);
+               } else {
+                       $data = null;
+               }
+
+               if (in_array(defaults($data, 'network', ''), ['', Protocol::PHANTOM])) {
+                       $ap_profile = ActivityPub::fetchProfile($uri);
+                       if (!empty($ap_profile) && ($ap_profile['network'] == Protocol::ACTIVITYPUB)) {
+                               $data = $ap_profile;
+                       }
+               }
 
                if (!isset($data["url"])) {
                        $data["url"] = $uri;
@@ -933,6 +945,13 @@ class Probe
                }
 
                $prof_data = [];
+
+               if (empty($data["addr"]) || empty($data["nick"])) {
+                       $probe_data = self::uri($profile_link);
+                       $data["addr"] = defaults($data, "addr", $probe_data["addr"]);
+                       $data["nick"] = defaults($data, "nick", $probe_data["nick"]);
+               }
+
                $prof_data["addr"]         = $data["addr"];
                $prof_data["nick"]         = $data["nick"];
                $prof_data["dfrn-request"] = $data["request"];
@@ -1598,7 +1617,8 @@ class Probe
                $user = DBA::selectFirst('user', ['prvkey'], ['uid' => $uid]);
 
                $condition = ["`uid` = ? AND `server` != ''", $uid];
-               $mailacct = DBA::selectFirst('mailacct', ['pass', 'user'], $condition);
+               $fields = ['pass', 'user', 'server', 'port', 'ssltype', 'mailbox'];
+               $mailacct = DBA::selectFirst('mailacct', $fields, $condition);
 
                if (!DBA::isResult($user) || !DBA::isResult($mailacct)) {
                        return false;