chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #4737 from pixelfed/staging 

Update http client
This commit is contained in:
daniel 2023-11-06 02:09:21 -07:00 committed by GitHub
parent 091fa1a62b c7b304ef20
commit aaa0c7f76c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/InboxPipeline/InboxValidator.php
View File

@ -193,7 +193,7 @@ class InboxValidator implements ShouldQueue
} }
try { try {
$res = Http::timeout(20)->withHeaders([ $res = Http::withOptions(['allow_redirects' => false])->timeout(20)->withHeaders([
'Accept' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', 'Accept' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org', 'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org',
])->get($actor->remote_url); ])->get($actor->remote_url);

2
app/Jobs/InboxPipeline/InboxWorker.php
View File

@ -173,7 +173,7 @@ class InboxWorker implements ShouldQueue
} }
try { try {
$res = Http::timeout(20)->withHeaders([ $res = Http::withOptions(['allow_redirects' => false])->timeout(20)->withHeaders([
'Accept' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', 'Accept' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org', 'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org',
])->get($actor->remote_url); ])->get($actor->remote_url);

2
app/Jobs/StatusPipeline/StatusRemoteUpdatePipeline.php
View File

@ -90,7 +90,7 @@ class StatusRemoteUpdatePipeline implements ShouldQueue
]); ]);
$nm->each(function($n, $key) use($status) { $nm->each(function($n, $key) use($status) {
$res = Http::retry(3, 100, throw: false)->head($n['url']); $res = Http::withOptions(['allow_redirects' => false])->retry(3, 100, throw: false)->head($n['url']);
if(!$res->successful()) { if(!$res->successful()) {
return; return;

2
app/Services/ActivityPubFetchService.php
View File

@ -28,7 +28,7 @@ class ActivityPubFetchService
$headers['User-Agent'] = 'PixelFedBot/1.0.0 (Pixelfed/'.config('pixelfed.version').'; +'.config('app.url').')'; $headers['User-Agent'] = 'PixelFedBot/1.0.0 (Pixelfed/'.config('pixelfed.version').'; +'.config('app.url').')';
try { try {
$res = Http::withHeaders($headers) $res = Http::withOptions(['allow_redirects' => false])->withHeaders($headers)
->timeout(30) ->timeout(30)
->connectTimeout(5) ->connectTimeout(5)
->retry(3, 500) ->retry(3, 500)