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;
$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;
$prof_data = [];
- // The "addr" is not always part of the fetched data
- if (!empty($data["addr"])) {
- $prof_data["addr"] = $data["addr"];
+ 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"];
$prof_data["dfrn-confirm"] = $data["confirm"];
$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;