Update webfinger util, fix bug preventing username with dots

pull/2354/head
Daniel Supernault 5 years ago
parent f6a2448b70
commit c2d194af1d
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7

@ -10,32 +10,15 @@ class Nickname
$url = str_replace('acct:', '', $url); $url = str_replace('acct:', '', $url);
} }
if (!str_contains($url, '@') && filter_var($url, FILTER_VALIDATE_URL)) { if(starts_with($url, '@')) {
$parsed = parse_url($url); $url = substr($url, 1);
$username = str_replace(['/', '\\', '@'], '', $parsed['path']);
return ['domain' => $parsed['host'], 'username' => $username];
} }
$parts = explode('@', $url);
$username = null;
$domain = null;
foreach ($parts as $part) { $parts = explode('@', $url);
$username = $parts[0];
// skip empty array slices $domain = $parts[1];
if (empty($part)) {
continue;
}
// if slice contains . assume its a domain if(parse_url(filter_var('https://test.dev', FILTER_VALIDATE_URL), PHP_URL_HOST))
if (str_contains($part, '.')) {
$domain = filter_var($part, FILTER_VALIDATE_URL) ?
parse_url($part, PHP_URL_HOST) :
$part;
} else {
$username = $part;
}
}
return ['domain' => $domain, 'username' => $username]; return ['domain' => $domain, 'username' => $username];
} }

Loading…
Cancel
Save