Merge pull request #3935 from pixelfed/staging

Update FederationController, add two new queues (follow, shared) to p…

CHANGELOG.md

@@ -48,6 +48,7 @@
 - Update sidebar menu, when clicking on the active feed/timeline buttons force a reload and scroll to top of feed ([78a5575d](https://github.com/pixelfed/pixelfed/commit/78a5575d))
 - Update InboxPipeline, increase timeout from 60s to 300s ([d1b888b5](https://github.com/pixelfed/pixelfed/commit/d1b888b5))
 - Update backup config, fixes #3793, #3920, #3931 ([b0c4cc30](https://github.com/pixelfed/pixelfed/commit/b0c4cc30))
+- Update FederationController, add two new queues (follow, shared) to prioritize follow request handling ([8ba33864](https://github.com/pixelfed/pixelfed/commit/8ba33864))
 -  ([](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/Http/Controllers/FederationController.php

@@ -166,17 +166,19 @@ class FederationController extends Controller
 				if(Cache::get($lockKey) !== null) {
 					return;
 				} else {
-					Cache::put($lockKey, 1, 3600);
+					Cache::put($lockKey, 1, 43200);
 					usleep(5000);
 				}
 			}
 			dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
+		} else if( isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
+			dispatch(new InboxValidator($username, $headers, $payload))->onQueue('follow');
 		} else {
 			$lockKey = 'pf:ap:user-inbox:activity:' . hash('sha256', $obj['id']);
 			if(Cache::get($lockKey) !== null) {
 				return;
 			}
-			Cache::put($lockKey, 1, 3600);
+			Cache::put($lockKey, 1, 43200);
 			usleep(5000);
 			dispatch(new InboxValidator($username, $headers, $payload))->onQueue('high');
 		}
@@ -219,10 +221,12 @@ class FederationController extends Controller
 					return;
 				}
 			}
-			Cache::put($lockKey, 1, 3600);
+			Cache::put($lockKey, 1, 43200);
 			dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
+		} else if( isset($obj['type']) && in_array($obj['type'], ['Follow', 'Accept'])) {
+			dispatch(new InboxWorker($headers, $payload))->onQueue('follow');
 		} else {
-			dispatch(new InboxWorker($headers, $payload))->onQueue('high');
+			dispatch(new InboxWorker($headers, $payload))->onQueue('shared');
 		}
 		return;
 	}

config/horizon.php

@@ -80,6 +80,8 @@ return [
 
 	'waits' => [
 		'redis:feed' => 30,
+		'redis:follow' => 30,
+		'redis:shared' => 30,
 		'redis:default' => 30,
 		'redis:low' => 30,
 		'redis:high' => 30,
@@ -169,7 +171,7 @@ return [
 		'production' => [
 			'supervisor-1' => [
 				'connection'    => 'redis',
-				'queue'         => ['high', 'default', 'feed', 'low', 'story', 'delete', 'mmo'],
+				'queue'         => ['high', 'default', 'follow', 'shared', 'feed', 'low', 'story', 'delete', 'mmo'],
 				'balance'       => env('HORIZON_BALANCE_STRATEGY', 'auto'),
 				'minProcesses'  => env('HORIZON_MIN_PROCESSES', 1),
 				'maxProcesses'  => env('HORIZON_MAX_PROCESSES', 20),
@@ -183,7 +185,7 @@ return [
 		'local' => [
 			'supervisor-1' => [
 				'connection'    => 'redis',
-				'queue'         => ['high', 'default', 'feed', 'low', 'story', 'delete', 'mmo'],
+				'queue'         => ['high', 'default', 'follow', 'shared', 'feed', 'low', 'story', 'delete', 'mmo'],
 				'balance'       => 'auto',
 				'minProcesses' => 1,
 				'maxProcesses'  => 20,