UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-09-19 15:58:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update WebfingerService

Browse source
This commit is contained in:
Daniel Supernault 2022-12-28 19:42:42 -07:00
parent 492b92140a
commit 26b5b42b86
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/Services/WebfingerService.php
View file

@ -28,13 +28,17 @@ class WebfingerService
return []; return [];
} }
$res = Http::retry(3, 100) try {
->acceptJson() $res = Http::retry(3, 100)
->withHeaders([ ->acceptJson()
'User-Agent' => '(Pixelfed/' . config('pixelfed.version') . '; +' . config('app.url') . ')' ->withHeaders([
]) 'User-Agent' => '(Pixelfed/' . config('pixelfed.version') . '; +' . config('app.url') . ')'
->timeout(20) ])
->get($url); ->timeout(20)
->get($url);
} catch (\Illuminate\Http\Client\ConnectionException $e) {
return [];
}
if(!$res->successful()) { if(!$res->successful()) {
return []; return [];
@ -48,11 +52,9 @@ class WebfingerService
$link = collect($webfinger['links']) $link = collect($webfinger['links'])
->filter(function($link) { ->filter(function($link) {
return $link && return $link &&
isset($link['rel']) && isset($link['rel'], $link['type'], $link['href']) &&
isset($link['type']) && $link['rel'] === 'self' &&
isset($link['href']) && in_array($link['type'], ['application/activity+json','application/ld+json; profile="https://www.w3.org/ns/activitystreams"']);
$link['rel'] == 'self' &&
$link['type'] == 'application/activity+json' || $link['type'] == 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"';
}) })
->pluck('href') ->pluck('href')
->first(); ->first();