Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 19:50:10 +00:00
Code Issues Projects Releases Packages Wiki 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
parent abd5b2a881
commit 50d05cec83
8 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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
]