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

Merge pull request #12736 from MrPetovan/bug/12733-webfinger-apcontact

Browse Source 
Replace custom WebFinger implementation by Probe::getWebfingerArray in APContact::fetchWebfingerData
This commit is contained in:
Michael Vogel
2023-01-27 08:27:20 +01:00
committed by GitHub
parent d54d2c58e8 79dc5c177e
commit 1d7d6fe35c
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Model/APContact.php
View File

@@ -71,21 +71,14 @@ class APContact
return $data;
}
$data = ['addr' => $addr];
$template = 'https://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr);
$webfinger = Probe::webfinger(str_replace('{uri}', urlencode($addr), $template), HttpClientAccept::JRD_JSON);
if (empty($webfinger['links'])) {
$template = 'http://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr);
$webfinger = Probe::webfinger(str_replace('{uri}', urlencode($addr), $template), HttpClientAccept::JRD_JSON);
if (empty($webfinger['links'])) {
return [];
}
$data['baseurl'] = 'http://' . $addr_parts[1];
} else {
$data['baseurl'] = 'https://' . $addr_parts[1];
$webfinger = Probe::getWebfingerArray($addr);
if (empty($webfinger['webfinger']['links'])) {
return [];
}
foreach ($webfinger['links'] as $link) {
$data['baseurl'] = $webfinger['baseurl'];
foreach ($webfinger['webfinger']['links'] as $link) {
if (empty($link['rel'])) {
continue;
}