Merge pull request #3797 from pixelfed/staging

Staging

CHANGELOG.md

@@ -25,6 +25,7 @@
 - Update NotificationTransformer, fix mediaTag and modLog types ([b6c06c4b](https://github.com/pixelfed/pixelfed/commit/b6c06c4b))
 - Update landing view, add `app.name` and `app.short_description` for better customizability ([bda9d16b](https://github.com/pixelfed/pixelfed/commit/bda9d16b))
 - Update Profile, fix avatarUrl paths. Fixes #3559 #3634 ([989e4249](https://github.com/pixelfed/pixelfed/commit/989e4249))
+- Update InboxPipeline, bump request timeout from 5s to 60s ([bb120019](https://github.com/pixelfed/pixelfed/commit/bb120019))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)

app/Jobs/InboxPipeline/DeleteWorker.php

@@ -200,7 +200,7 @@ class DeleteWorker implements ShouldQueue
 		if(Helpers::validateUrl($actor->remote_url) == false) {
 			return;
 		}
-		$res = Zttp::timeout(5)->withHeaders([
+		$res = Zttp::timeout(60)->withHeaders([
 		  'Accept'     => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
 		  'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org',
 		])->get($actor->remote_url);

app/Jobs/InboxPipeline/InboxValidator.php

@@ -176,7 +176,7 @@ class InboxValidator implements ShouldQueue
         if(Helpers::validateUrl($actor->remote_url) == false) {
             return;
         }
-        $res = Zttp::timeout(5)->withHeaders([
+        $res = Zttp::timeout(60)->withHeaders([
           'Accept'     => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
           'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org',
         ])->get($actor->remote_url);

app/Jobs/InboxPipeline/InboxWorker.php

@@ -166,7 +166,7 @@ class InboxWorker implements ShouldQueue
         if(Helpers::validateUrl($actor->remote_url) == false) {
             return;
         }
-        $res = Zttp::timeout(5)->withHeaders([
+        $res = Zttp::timeout(60)->withHeaders([
           'Accept'     => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
           'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org',
         ])->get($actor->remote_url);