From e4edc6f192ed59727d3b254369d2b7a2a7c6c2ed Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 17 May 2024 21:45:42 -0600 Subject: [PATCH 1/2] Update ActivityPubFetchService, fix Friendica bug --- app/Services/ActivityPubFetchService.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Services/ActivityPubFetchService.php b/app/Services/ActivityPubFetchService.php index 4b515859c..119199eaa 100644 --- a/app/Services/ActivityPubFetchService.php +++ b/app/Services/ActivityPubFetchService.php @@ -28,7 +28,13 @@ class ActivityPubFetchService $headers['User-Agent'] = 'PixelFedBot/1.0.0 (Pixelfed/'.config('pixelfed.version').'; +'.config('app.url').')'; try { - $res = Http::withOptions(['allow_redirects' => false]) + $res = Http::withoutVerifying() + ->withOptions([ + 'allow_redirects' => [ + 'max' => 2, + 'protocols' => ['https'], + ] + ]) ->withHeaders($headers) ->timeout(30) ->connectTimeout(5) From e03e7c0d734d23b12427cff343ef3a1881584510 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 17 May 2024 21:47:16 -0600 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3478de163..696936b8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Update ApiV1Controller, add pe (pixelfed entity) support to /api/v1/statuses/{id}/context endpoint ([d645d6ca](https://github.com/pixelfed/pixelfed/commit/d645d6ca)) - Update Admin Curated Onboarding, add select-all/mass action operations ([b22cac94](https://github.com/pixelfed/pixelfed/commit/b22cac94)) - Update AdminCuratedRegisterController, fix existing account approval ([cbb96cfd](https://github.com/pixelfed/pixelfed/commit/cbb96cfd)) +- Update ActivityPubFetchService, fix Friendica bug ([e4edc6f1](https://github.com/pixelfed/pixelfed/commit/e4edc6f1)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.12.1 (2024-05-07)](https://github.com/pixelfed/pixelfed/compare/v0.12.0...v0.12.1)