bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Ensure url property of Probe::uri result is used authoritatively

Browse source 
- Some profile URLs aren't canonical and need to be updated during probe
This commit is contained in:
Hypolite Petovan 2020-06-24 20:57:47 -04:00
commit 50d05cec83
8 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Model/Contact.php
View file

@ -1572,7 +1572,7 @@ class Contact
$data['gsid'] = GServer::getID($data['baseurl']);
}
if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $url) && !$in_loop) {
if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $data['url']) && !$in_loop) {
$contact_id = self::getIdForURL($data["alias"], $uid, true, $default, true);
}
@ -2353,11 +2353,11 @@ class Contact
$condition = ['uid' => $user['uid'], 'poll' => [$ret['poll'], Strings::normaliseLink($ret['poll'])], 'network' => $ret['network'], 'pending' => false];
$contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
if (!DBA::isResult($contact)) {
$condition = ['uid' => $user['uid'], 'nurl' => Strings::normaliseLink($url), 'network' => $ret['network'], 'pending' => false];
$condition = ['uid' => $user['uid'], 'nurl' => Strings::normaliseLink($ret['url']), 'network' => $ret['network'], 'pending' => false];
$contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
}
$protocol = self::getProtocol($url, $ret['network']);
$protocol = self::getProtocol($ret['url'], $ret['network']);
if (($protocol === Protocol::DFRN) && !DBA::isResult($contact)) {
if ($interactive) {
@ -2394,7 +2394,7 @@ class Contact
if (empty($ret['url'])) {
$result['message'] .= DI::l10n()->t('No browser URL could be matched to this address.') . EOL;
}
if (strpos($url, '@') !== false) {
if (strpos($ret['url'], '@') !== false) {
$result['message'] .= DI::l10n()->t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
$result['message'] .= DI::l10n()->t('Use mailto: in front of address to force email check.') . EOL;
}
@ -2418,7 +2418,7 @@ class Contact
$pending = false;
if ($protocol == Protocol::ACTIVITYPUB) {
$apcontact = APContact::getByURL($url, false);
$apcontact = APContact::getByURL($ret['url'], false);
if (isset($apcontact['manually-approve'])) {
$pending = (bool)$apcontact['manually-approve'];
}

2
src/Model/GContact.php
View file

@ -230,8 +230,6 @@ class GContact
throw new Exception('Probing for URL ' . $gcontact['url'] . ' failed');
}
$orig_profile = $gcontact['url'];
$gcontact['server_url'] = $data['baseurl'];
$gcontact = array_merge($gcontact, $data);

7
src/Model/Mail.php
View file

@ -268,7 +268,6 @@ class Mail
$uri = Item::newURI(local_user(), $guid);
$me = Probe::uri($replyto);
if (!$me['name']) {
return -2;
}
@ -277,8 +276,8 @@ class Mail
$recip_handle = $recipient['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
$sender_nick = basename($replyto);
$sender_host = substr($replyto, strpos($replyto, '://') + 3);
$sender_nick = basename($me['url']);
$sender_host = substr($me['url'], strpos($me['url'], '://') + 3);
$sender_host = substr($sender_host, 0, strpos($sender_host, '/'));
$sender_handle = $sender_nick . '@' . $sender_host;
@ -313,7 +312,7 @@ class Mail
'reply' => 0,
'replied' => 0,
'uri' => $uri,
'parent-uri' => $replyto,
'parent-uri' => $me['url'],
'created' => DateTimeFormat::utcNow(),
'unknown' => 1
]