Interaction => Unbound

Only certain endpoints are not bound to the global ratelimit, but it's not limited to just Interactions

Author: valzargaming

src/Discord/Http.php

@@ -117,7 +117,7 @@ class Http implements HttpInterface
      *
      * @var SplQueue
      */
-    protected $interactionQueue;
+    protected $unboundQueue;
 
     /**
      * Number of requests that are waiting for a response.
@@ -145,7 +145,7 @@ public function __construct(string $token, LoopInterface $loop, LoggerInterface
         $this->logger = $logger;
         $this->driver = $driver;
         $this->queue = new SplQueue;
-        $this->interactionQueue = new SplQueue;
+        $this->unboundQueue = new SplQueue;
 
         $this->promiseV3 = str_starts_with(InstalledVersions::getVersion('react/promise'), '3.');
     }

src/Discord/HttpInterface.php

@@ -28,7 +28,7 @@ public function put($url, $content = null, array $headers = []): PromiseInterfac
     public function patch($url, $content = null, array $headers = []): PromiseInterface;
     public function delete($url, $content = null, array $headers = []): PromiseInterface;
     public function queueRequest(string $method, Endpoint $url, $content, array $headers = []): PromiseInterface;
-    public static function isInteractionEndpoint(Request $request): bool;
+    public static function isUnboundEndpoint(Request $request): bool;
     public function handleError(ResponseInterface $response): \Throwable;
     public function getUserAgent(): string;
-}
+}

src/Discord/HttpTrait.php

@@ -330,8 +330,8 @@ protected function getBucket(string $key): Bucket
         if (! isset($this->buckets[$key])) {
             $bucket = new Bucket($key, $this->loop, $this->logger, function (Request $request) {
                 $deferred = new Deferred();
-                self::isInteractionEndpoint($request)
-                    ? $this->interactionQueue->enqueue([$request, $deferred])
+                self::isUnboundEndpoint($request)
+                    ? $this->unboundQueue->enqueue([$request, $deferred])
                     : $this->queue->enqueue([$request, $deferred]);
                 $this->checkQueue();
 
@@ -351,7 +351,7 @@ protected function getBucket(string $key): Bucket
     protected function checkQueue(bool $check_interactions = true): void
     {
         if ($check_interactions) {
-            $this->checkInteractionQueue();
+            $this->checkunboundQueue();
         }
 
         if ($this->waiting >= Http::CONCURRENT_REQUESTS || $this->queue->isEmpty()) {
@@ -382,10 +382,10 @@ protected function checkQueue(bool $check_interactions = true): void
      * Checks the interaction queue to see if more requests can be
      * sent out.
      */
-    protected function checkInteractionQueue(): void
+    protected function checkunboundQueue(): void
     {
-        if ($this->interactionQueue->isEmpty()) {
-            $this->logger->debug('http not checking interaction queue', ['waiting' => $this->waiting, 'empty' => $this->interactionQueue->isEmpty()]);
+        if ($this->unboundQueue->isEmpty()) {
+            $this->logger->debug('http not checking interaction queue', ['waiting' => $this->waiting, 'empty' => $this->unboundQueue->isEmpty()]);
 
             return;
         }
@@ -394,7 +394,7 @@ protected function checkInteractionQueue(): void
          * @var Request  $request
          * @var Deferred $deferred
          */
-        [$request, $deferred] = $this->interactionQueue->dequeue();
+        [$request, $deferred] = $this->unboundQueue->dequeue();
 
         $this->executeRequest($request)->then(function ($result) use ($deferred) {
             $this->checkQueue();
@@ -413,10 +413,11 @@ protected function checkInteractionQueue(): void
      * @param  Request $request
      * @return bool
      */
-    public static function isInteractionEndpoint(Request $request): bool
+    public static function isUnboundEndpoint(Request $request): bool
     {
-        $url = $request->getUrl();
-        return strpos($url, '/interactions') === 0 || strpos($url, '/callback') === 0;
+        return
+            (strpos($request->getUrl(), '/interactions') !== false && strpos($request->getUrl(), '/callback') !== false)
+            || (strpos($request->getUrl(), '/webhooks') !== false && strpos($request->getUrl(), '/messages') !== false);
     }
 
     /**