Merge pull request 'Bluesky: Improve DID detection for custom PDS' (#1533) from heluecht/friendica-addons:bluesky-pds into develop

Reviewed-on: https://git.friendi.ca/friendica/friendica-addons/pulls/1533
pull/1534/head
Tobias Diekershoff 2024-09-02 06:32:54 +02:00
commit 454e9834bf
1 changed files with 11 additions and 15 deletions

View File

@ -1793,25 +1793,21 @@ function bluesky_get_did(string $handle): string
$handle .= '.' . BLUESKY_HOSTNAME; $handle .= '.' . BLUESKY_HOSTNAME;
} }
// Deactivated at the moment, since it isn't reliable by now
//$did = bluesky_get_did_by_dns($handle);
//if ($did != '') {
// return $did;
//}
//$did = bluesky_get_did_by_wellknown($handle);
//if ($did != '') {
// return $did;
//}
$data = bluesky_get(BLUESKY_PDS . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle)); $data = bluesky_get(BLUESKY_PDS . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
if (empty($data) || empty($data->did)) { if (!empty($data) && !empty($data->did)) {
return '';
}
Logger::debug('Got DID by PDS call', ['handle' => $handle, 'did' => $data->did]); Logger::debug('Got DID by PDS call', ['handle' => $handle, 'did' => $data->did]);
return $data->did; return $data->did;
} }
// Possibly a custom PDS.
$did = bluesky_get_did_by_dns($handle);
if ($did != '') {
return $did;
}
return bluesky_get_did_by_wellknown($handle);
}
function bluesky_get_user_did(int $uid, bool $refresh = false): ?string function bluesky_get_user_did(int $uid, bool $refresh = false): ?string
{ {
if (!$refresh) { if (!$refresh) {