Rework Discord Rate Limiting

VATSIM-UK · Jun 29, 2024 · b1c0159 · b1c0159
1 parent 4d5128d
commit b1c0159
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/app/Jobs/Mship/SyncToDiscord.php b/app/Jobs/Mship/SyncToDiscord.php
@@ -19,6 +19,10 @@ class SyncToDiscord extends Job implements ShouldQueue
 
     public $tries = 3;
 
+    public $backoff = 60;
+
+    public $queue = 'discord';
+
     public function __construct(Account $account)
     {
         $this->account = $account;

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -56,7 +56,9 @@ public function boot()
         });
 
         RateLimiter::for('discord-sync', function (object $job) {
-            return Limit::perHour(1)->by($job->getAccountId());
+            return Limit::perMinute(100)
+                ->perHour(1000)
+                ->by('discord-api-call');
         });
 
         Cookies::essentials()

diff --git a/config/horizon.php b/config/horizon.php
@@ -171,7 +171,7 @@
         'production' => [
             'supervisor-1' => [
                 'connection' => 'redis',
-                'queue' => ['high', 'default'],
+                'queue' => ['high', 'default', 'discord'],
                 'balance' => 'auto',
                 'min-processes' => 2,
                 'max-processes' => 14,
@@ -184,7 +184,7 @@
         'local' => [
             '1' => [
                 'connection' => 'redis',
-                'queue' => ['high', 'default'],
+                'queue' => ['high', 'default', 'discord'],
                 'balance' => 'simple',
                 'processes' => 1,
                 'tries' => 10,