clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12222 from MrPetovan/bug/12219-hovercard-stay-local 

Fix support for `/contact/123456/conversations` URLs in Module\Contact\Hovercard
This commit is contained in:
Tobias Diekershoff 2022-11-20 08:10:42 +01:00 committed by GitHub
parent 99c6e65be4 83c04ac433
commit d1a85f1fa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Module/Contact/Hovercard.php
View File

@ -44,11 +44,12 @@ class Hovercard extends BaseModule
throw new HTTPException\ForbiddenException();
}
// If a contact is connected the url is internally changed to 'contact/redir/CID'. We need the pure url to search for
// the contact. So we strip out the contact id from the internal url and look in the contact table for
// the real url (nurl)
if (strpos($contact_url, 'contact/') === 0) {
$remote_contact = Contact::selectFirst(['nurl'], ['id' => intval(basename($contact_url))]);
/* Possible formats for relative URLs that need to be converted to the absolute contact URL:
* - contact/redir/123456
* - contact/123456/conversations
*/
if (strpos($contact_url, 'contact/') === 0 && preg_match('/(\d+)/', $contact_url, $matches)) {
$remote_contact = Contact::selectFirst(['nurl'], ['id' => $matches[1]]);
$contact_url = $remote_contact['nurl'] ?? '';
}