discord.js 15.0.0-dev.1764331308-444e55a09 → 15.0.0-dev.1764374516-19253f6b7

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "discord.js",
-  "version": "15.0.0-dev.1764331308-444e55a09",
+  "version": "15.0.0-dev.1764374516-19253f6b7",
   "description": "A powerful library for interacting with the Discord API",
   "main": "./src/index.js",
   "types": "./typings/index.d.ts",
@@ -61,12 +61,12 @@
     "magic-bytes.js": "^1.12.1",
     "tslib": "^2.8.1",
     "undici": "7.16.0",
-    "@discordjs/builders": "2.0.0-dev.1764331308-444e55a09",
-    "@discordjs/formatters": "1.0.0-dev.1764331308-444e55a09",
-    "@discordjs/rest": "3.0.0-dev.1764331308-444e55a09",
-    "@discordjs/util": "2.0.0-dev.1764331308-444e55a09",
-    "@discordjs/collection": "3.0.0-dev.1764331308-444e55a09",
-    "@discordjs/ws": "3.0.0-dev.1764331308-444e55a09"
+    "@discordjs/builders": "2.0.0-dev.1764374516-19253f6b7",
+    "@discordjs/collection": "3.0.0-dev.1764374516-19253f6b7",
+    "@discordjs/formatters": "1.0.0-dev.1764374516-19253f6b7",
+    "@discordjs/util": "2.0.0-dev.1764374516-19253f6b7",
+    "@discordjs/rest": "3.0.0-dev.1764374516-19253f6b7",
+    "@discordjs/ws": "3.0.0-dev.1764374516-19253f6b7"
   },
   "devDependencies": {
     "@favware/cliff-jumper": "^4.1.0",

package/src/client/Client.js

@@ -389,15 +389,6 @@ class Client extends AsyncEventEmitter {
     );
     this.ws.on(WebSocketShardEvents.Dispatch, this._handlePacket.bind(this));
 
-    this.ws.on(WebSocketShardEvents.Ready, async data => {
-      for (const guild of data.guilds) {
-        this.expectedGuilds.add(guild.id);
-      }
-
-      this.status = Status.WaitingForGuilds;
-      await this._checkReady();
-    });
-
     this.ws.on(WebSocketShardEvents.HeartbeatComplete, ({ heartbeatAt, latency }, shardId) => {
       this.emit(Events.Debug, `[WS => Shard ${shardId}] Heartbeat acknowledged, latency of ${latency}ms.`);
       this.lastPingTimestamps.set(shardId, heartbeatAt);
@@ -427,7 +418,9 @@ class Client extends AsyncEventEmitter {
         PacketHandlers[packet.t](this, packet, shardId);
       }
 
-      if (this.status === Status.WaitingForGuilds && WaitingForGuildEvents.includes(packet.t)) {
+      if (packet.t === GatewayDispatchEvents.Ready) {
+        await this._checkReady();
+      } else if (this.status === Status.WaitingForGuilds && WaitingForGuildEvents.includes(packet.t)) {
         this.expectedGuilds.delete(packet.d.id);
         await this._checkReady();
       }

package/src/client/websocket/handlers/READY.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { ClientApplication } = require('../../../structures/ClientApplication.js');
+const { Status } = require('../../../util/Status.js');
 
 let ClientUser;
 
@@ -14,6 +15,7 @@ module.exports = (client, { d: data }, shardId) => {
   }
 
   for (const guild of data.guilds) {
+    client.expectedGuilds.add(guild.id);
     guild.shardId = shardId;
     client.guilds._add(guild);
   }
@@ -23,4 +25,6 @@ module.exports = (client, { d: data }, shardId) => {
   } else {
     client.application = new ClientApplication(client, data.application);
   }
+
+  client.status = Status.WaitingForGuilds;
 };