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 49c27fb4f2f93957b072dcc1740193a43ab7b354..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;
@@ -232,7 +233,7 @@ class Probe
 
                if (!$lrdd) {
                        $parts = @parse_url($uri);
-                       if (!$parts) {
+                       if (!$parts || empty($parts["host"]) || empty($parts["path"])) {
                                return [];
                        }
 
@@ -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"];
@@ -988,7 +1007,9 @@ class Probe
 
                if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) {
                        foreach ($webfinger["aliases"] as $alias) {
-                               if (normalise_link($alias) != normalise_link($data["url"]) && ! strstr($alias, "@")) {
+                               if (empty($data["url"]) && !strstr($alias, "@")) {
+                                       $data["url"] = $alias;
+                               } elseif (!strstr($alias, "@") && normalise_link($alias) != normalise_link($data["url"])) {
                                        $data["alias"] = $alias;
                                } elseif (substr($alias, 0, 5) == 'acct:') {
                                        $data["addr"] = substr($alias, 5);
@@ -1593,18 +1614,20 @@ class Probe
                        return false;
                }
 
-               $x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
+               $user = DBA::selectFirst('user', ['prvkey'], ['uid' => $uid]);
 
-               $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
+               $condition = ["`uid` = ? AND `server` != ''", $uid];
+               $fields = ['pass', 'user', 'server', 'port', 'ssltype', 'mailbox'];
+               $mailacct = DBA::selectFirst('mailacct', $fields, $condition);
 
-               if (!DBA::isResult($x) || !DBA::isResult($r)) {
+               if (!DBA::isResult($user) || !DBA::isResult($mailacct)) {
                        return false;
                }
 
-               $mailbox = Email::constructMailboxName($r[0]);
+               $mailbox = Email::constructMailboxName($mailacct);
                $password = '';
-               openssl_private_decrypt(hex2bin($r[0]['pass']), $password, $x[0]['prvkey']);
-               $mbox = Email::connect($mailbox, $r[0]['user'], $password);
+               openssl_private_decrypt(hex2bin($mailacct['pass']), $password, $user['prvkey']);
+               $mbox = Email::connect($mailbox, $mailacct['user'], $password);
                if (!$mbox) {
                        return false;
                }
@@ -1657,7 +1680,6 @@ class Probe
                if (!empty($mbox)) {
                        imap_close($mbox);
                }
-
                return $data;
        }