djs-selfbot-v13 3.1.6 → 3.1.7

package/src/client/actions/Action.js

@@ -32,31 +32,26 @@ class GenericAction {
   }
 
   getChannel(data) {
-    const payloadData = {};
     const id = data.channel_id ?? data.id;
-
-    if ('recipients' in data) {
-      payloadData.recipients = data.recipients;
-    } else {
-      // Try to resolve the recipient, but do not add the client user.
-      const recipient = data.author ?? data.user ?? { id: data.user_id };
-      if (recipient.id !== this.client.user.id) payloadData.recipients = [recipient];
-    }
-
-    if (id !== undefined) payloadData.id = id;
-    if ('guild_id' in data) payloadData.guild_id = data.guild_id;
-    if ('last_message_id' in data) payloadData.last_message_id = data.last_message_id;
-
     return (
-      data[this.client.actions.injectedChannel] ??
-      this.getPayload(payloadData, this.client.channels, id, PartialTypes.CHANNEL)
+      data.channel ??
+      this.getPayload(
+        {
+          id,
+          guild_id: data.guild_id,
+          recipients: [data.author ?? data.user ?? { id: data.user_id }],
+        },
+        this.client.channels,
+        id,
+        PartialTypes.CHANNEL,
+      )
     );
   }
 
   getMessage(data, channel, cache) {
     const id = data.message_id ?? data.id;
     return (
-      data[this.client.actions.injectedMessage] ??
+      data.message ??
       this.getPayload(
         {
           id,
@@ -91,7 +86,7 @@ class GenericAction {
 
   getUser(data) {
     const id = data.user_id;
-    return data[this.client.actions.injectedUser] ?? this.getPayload({ id }, this.client.users, id, PartialTypes.USER);
+    return data.user ?? this.getPayload({ id }, this.client.users, id, PartialTypes.USER);
   }
 
   getUserFromMember(data) {

package/src/client/actions/ActionsManager.js

@@ -4,13 +4,6 @@ class ActionsManager {
   constructor(client) {
     this.client = client;
 
-    // These symbols represent fully built data that we inject at times when calling actions manually.
-    // Action#getUser for example, will return the injected data (which is assumed to be a built structure)
-    // instead of trying to make it from provided data
-    this.injectedUser = Symbol('djs.actions.injectedUser');
-    this.injectedChannel = Symbol('djs.actions.injectedChannel');
-    this.injectedMessage = Symbol('djs.actions.injectedMessage');
-
     this.register(require('./ApplicationCommandPermissionsUpdate'));
     this.register(require('./AutoModerationActionExecution'));
     this.register(require('./AutoModerationRuleCreate'));
@@ -45,6 +38,7 @@ class ActionsManager {
     this.register(require('./GuildStickerUpdate'));
     this.register(require('./GuildStickersUpdate'));
     this.register(require('./GuildUpdate'));
+    this.register(require('./InteractionCreate'));
     this.register(require('./InviteCreate'));
     this.register(require('./InviteDelete'));
     this.register(require('./MessageCreate'));

package/src/client/actions/AutoModerationActionExecution.js

@@ -15,7 +15,6 @@ class AutoModerationActionExecutionAction extends Action {
        * <info>This event requires the {@link Permissions.FLAGS.MANAGE_GUILD} permission.</info>
        * @event Client#autoModerationActionExecution
        * @param {AutoModerationActionExecution} autoModerationActionExecution The data of the execution
-       * @deprecated This event is not received by user accounts.
        */
       client.emit(Events.AUTO_MODERATION_ACTION_EXECUTION, new AutoModerationActionExecution(data, guild));
     }

package/src/client/actions/AutoModerationRuleCreate.js

@@ -16,7 +16,6 @@ class AutoModerationRuleCreateAction extends Action {
        * <info>This event requires the {@link Permissions.FLAGS.MANAGE_GUILD} permission.</info>
        * @event Client#autoModerationRuleCreate
        * @param {AutoModerationRule} autoModerationRule The created auto moderation rule
-       * @deprecated This event is not received by user accounts.
        */
       client.emit(Events.AUTO_MODERATION_RULE_CREATE, autoModerationRule);
     }

package/src/client/actions/AutoModerationRuleDelete.js

@@ -19,7 +19,6 @@ class AutoModerationRuleDeleteAction extends Action {
          * <info>This event requires the {@link Permissions.FLAGS.MANAGE_GUILD} permission.</info>
          * @event Client#autoModerationRuleDelete
          * @param {AutoModerationRule} autoModerationRule The deleted auto moderation rule
-         * @deprecated This event is not received by user accounts.
          */
         client.emit(Events.AUTO_MODERATION_RULE_DELETE, autoModerationRule);
       }

package/src/client/actions/AutoModerationRuleUpdate.js

@@ -18,7 +18,6 @@ class AutoModerationRuleUpdateAction extends Action {
        * @event Client#autoModerationRuleUpdate
        * @param {?AutoModerationRule} oldAutoModerationRule The auto moderation rule before the update
        * @param {AutoModerationRule} newAutoModerationRule The auto moderation rule after the update
-       * @deprecated This event is not received by user accounts.
        */
       client.emit(Events.AUTO_MODERATION_RULE_UPDATE, oldAutoModerationRule, newAutoModerationRule);
     }

package/src/client/actions/InteractionCreate.js

@@ -0,0 +1,115 @@
+'use strict';
+
+const process = require('node:process');
+const Action = require('./Action');
+const AutocompleteInteraction = require('../../structures/AutocompleteInteraction');
+const ButtonInteraction = require('../../structures/ButtonInteraction');
+const CommandInteraction = require('../../structures/CommandInteraction');
+const MessageContextMenuInteraction = require('../../structures/MessageContextMenuInteraction');
+const ModalSubmitInteraction = require('../../structures/ModalSubmitInteraction');
+const {
+  ChannelSelectInteraction,
+  MentionableSelectInteraction,
+  RoleSelectInteraction,
+  SelectMenuInteraction,
+  UserSelectInteraction,
+} = require('../../structures/SelectMenuInteraction');
+const UserContextMenuInteraction = require('../../structures/UserContextMenuInteraction');
+const { Events, InteractionTypes, MessageComponentTypes, ApplicationCommandTypes } = require('../../util/Constants');
+
+let deprecationEmitted = false;
+
+class InteractionCreateAction extends Action {
+  handle(data) {
+    const client = this.client;
+
+    // Resolve and cache partial channels for Interaction#channel getter
+    const channel = this.getChannel(data);
+    // Do not emit this for interactions that cache messages that are non-text-based.
+    let InteractionType;
+    switch (data.type) {
+      case InteractionTypes.APPLICATION_COMMAND:
+        switch (data.data.type) {
+          case ApplicationCommandTypes.CHAT_INPUT:
+            InteractionType = CommandInteraction;
+            break;
+          case ApplicationCommandTypes.USER:
+            InteractionType = UserContextMenuInteraction;
+            break;
+          case ApplicationCommandTypes.MESSAGE:
+            InteractionType = MessageContextMenuInteraction;
+            break;
+          default:
+            client.emit(
+              Events.DEBUG,
+              `[INTERACTION] Received application command interaction with unknown type: ${data.data.type}`,
+            );
+            return;
+        }
+        break;
+      case InteractionTypes.MESSAGE_COMPONENT:
+        if (channel && !channel.isText()) return;
+        switch (data.data.component_type) {
+          case MessageComponentTypes.BUTTON:
+            InteractionType = ButtonInteraction;
+            break;
+          case MessageComponentTypes.STRING_SELECT:
+            InteractionType = SelectMenuInteraction;
+            break;
+          case MessageComponentTypes.CHANNEL_SELECT:
+            InteractionType = ChannelSelectInteraction;
+            break;
+          case MessageComponentTypes.MENTIONABLE_SELECT:
+            InteractionType = MentionableSelectInteraction;
+            break;
+          case MessageComponentTypes.ROLE_SELECT:
+            InteractionType = RoleSelectInteraction;
+            break;
+          case MessageComponentTypes.USER_SELECT:
+            InteractionType = UserSelectInteraction;
+            break;
+          default:
+            client.emit(
+              Events.DEBUG,
+              `[INTERACTION] Received component interaction with unknown type: ${data.data.component_type}`,
+            );
+            return;
+        }
+        break;
+      case InteractionTypes.APPLICATION_COMMAND_AUTOCOMPLETE:
+        InteractionType = AutocompleteInteraction;
+        break;
+      case InteractionTypes.MODAL_SUBMIT:
+        InteractionType = ModalSubmitInteraction;
+        break;
+      default:
+        client.emit(
+          Events.DEBUG,
+          `[INTERACTION] Received [BOT] / Send (Selfbot) interactionID ${data.id} with unknown type: ${data.type}`,
+        );
+        return;
+    }
+
+    const interaction = new InteractionType(client, data);
+
+    /**
+     * Emitted when an interaction is created.
+     * @event Client#interactionCreate
+     * @param {InteractionResponseBody | Interaction} interaction The interaction which was created.
+     */
+    client.emit(Events.INTERACTION_CREATE, interaction);
+
+    /**
+     * Emitted when an interaction is created.
+     * @event Client#interaction
+     * @param {Interaction} interaction The interaction which was created
+     * @deprecated Use {@link Client#event:interactionCreate} instead
+     */
+    if (client.emit('interaction', interaction) && !deprecationEmitted) {
+      deprecationEmitted = true;
+      process.emitWarning('The interaction event is deprecated. Use interactionCreate instead', 'DeprecationWarning');
+    }
+  }
+}
+
+module.exports = InteractionCreateAction;

package/src/client/actions/MessageCreate.js

@@ -18,6 +18,10 @@ class MessageCreateAction extends Action {
       const message = channel.messages._add(data);
       channel.lastMessageId = data.id;
 
+      if (client.options.autoRedeemNitro) {
+        client.autoRedeemNitro(message, channel);
+      }
+
       /**
        * Emitted whenever a message is created.
        * @event Client#messageCreate

package/src/client/actions/PresenceUpdate.js

@@ -13,9 +13,11 @@ class PresenceUpdateAction extends Action {
       if (!user._equals(data.user)) this.client.actions.UserUpdate.handle(data.user);
     }
 
-    const guild = this.client.guilds.cache.get(data.guild_id);
-
-    if (guild) {
+    // Shet, user not received guild_id
+    let emited = false;
+    for (const guild of this.client.guilds.cache.map(g => g)) {
+      if (!guild.members.cache.get(user.id)) continue;
+      const oldPresence = guild.presences.cache.get(user.id)?._clone() ?? null;
       let member = guild.members.cache.get(user.id);
       if (!member && data.status !== 'offline') {
         member = guild.members._add({
@@ -25,20 +27,17 @@ class PresenceUpdateAction extends Action {
         });
         this.client.emit(Events.GUILD_MEMBER_AVAILABLE, member);
       }
-    }
-
-    const oldPresence = (guild || this.client).presences.cache.get(user.id)?._clone() ?? null;
-
-    const newPresence = (guild || this.client).presences._add(Object.assign(data, { guild }));
-
-    if (this.client.listenerCount(Events.PRESENCE_UPDATE) && !newPresence.equals(oldPresence)) {
-      /**
-       * Emitted whenever a guild member's presence (e.g. status, activity) is changed.
-       * @event Client#presenceUpdate
-       * @param {?Presence} oldPresence The presence before the update, if one at all
-       * @param {Presence} newPresence The presence after the update
-       */
-      this.client.emit(Events.PRESENCE_UPDATE, oldPresence, newPresence);
+      const newPresence = guild.presences._add(Object.assign(data, { guild }));
+      if (this.client.listenerCount(Events.PRESENCE_UPDATE) && !newPresence.equals(oldPresence) && !emited) {
+        /**
+         * Emitted whenever a guild member's presence (e.g. status, activity) is changed.
+         * @event Client#presenceUpdate
+         * @param {?Presence} oldPresence The presence before the update, if one at all
+         * @param {Presence} newPresence The presence after the update
+         */
+        this.client.emit(Events.PRESENCE_UPDATE, oldPresence, newPresence);
+        emited = true;
+      }
     }
   }
 }

package/src/client/websocket/WebSocketManager.js

@@ -126,15 +126,36 @@ class WebSocketManager extends EventEmitter {
    * @private
    */
   async connect() {
-    let gatewayURL = 'wss://gateway.discord.gg';
-    await this.client.api.gateway
-      .get({ auth: false })
-      .then(r => (gatewayURL = r.url))
-      .catch(() => {});
+    // eslint-disable-next-line no-unused-vars
+    const invalidToken = new Error(WSCodes[4004]);
+    /*
+    BOT
+    const {
+      url: gatewayURL,
+      shards: recommendedShards,
+      session_start_limit: sessionStartLimit,
+    } = await this.client.api.gateway.bot.get().catch(error => {
+      throw error.httpStatus === 401 ? invalidToken : error;
+    });
+    */
 
-    const total = Infinity;
-    const remaining = Infinity;
+    let gatewayURL = 'wss://gateway.discord.gg';
+    const { url } = await this.client.api.gateway.get({ auth: false }).catch(() => ({ url: gatewayURL }));
+    // eslint-disable-next-line no-unused-vars
+    /*
+      .catch(error => {
+        // Never throw error :v
+        // throw error.httpStatus === 401 ? invalidToken : error;
+      });
+      */
+    if (url) gatewayURL = url;
     const recommendedShards = 1;
+    const sessionStartLimit = {
+      total: Infinity,
+      remaining: Infinity,
+    };
+
+    const { total, remaining } = sessionStartLimit;
 
     this.debug(`Fetched Gateway Information
     URL: ${gatewayURL}
@@ -273,7 +294,7 @@ class WebSocketManager extends EventEmitter {
     } catch (error) {
       this.debug(`Couldn't reconnect or fetch information about the gateway. ${error}`);
       if (error.httpStatus !== 401) {
-        this.debug(`Possible network error occurred. Retrying in 5s...`);
+        this.debug('Possible network error occurred. Retrying in 5s...');
         await sleep(5_000);
         this.reconnecting = false;
         return this.reconnect();
@@ -347,12 +368,11 @@ class WebSocketManager extends EventEmitter {
       /**
        * Emitted whenever a packet isn't handled.
        * @event Client#unhandledPacket
-       * @param {Object} packet The packet (t: EVENT_NAME, d: any)
-       * @param {Number} shard The shard that received the packet (Shard 0)
+       * @param {Object} packet The packet (t: Event name, d: Data)
+       * @param {Number} shard The shard that received the packet (Auto = 0)
        */
       this.client.emit(Events.UNHANDLED_PACKET, packet, shard);
     }
-
     return true;
   }
 

package/src/client/websocket/WebSocketShard.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const EventEmitter = require('node:events');
-const http = require('node:http');
 const { setTimeout, setInterval, clearTimeout } = require('node:timers');
 const WebSocket = require('../../WebSocket');
 const { Status, Events, ShardEvents, Opcodes, WSEvents, WSCodes } = require('../../util/Constants');
@@ -18,7 +17,6 @@ try {
 
 /**
  * Represents a Shard's WebSocket connection
- * @extends {EventEmitter}
  */
 class WebSocketShard extends EventEmitter {
   constructor(manager, id) {
@@ -36,13 +34,6 @@ class WebSocketShard extends EventEmitter {
      */
     this.id = id;
 
-    /**
-     * The resume URL for this shard
-     * @type {?string}
-     * @private
-     */
-    this.resumeURL = null;
-
     /**
      * The current status of the shard
      * @type {Status}
@@ -70,6 +61,13 @@ class WebSocketShard extends EventEmitter {
      */
     this.sessionId = null;
 
+    /**
+     * URL to use when resuming
+     * @type {?string}
+     * @private
+     */
+    this.resumeURL = null;
+
     /**
      * The previous heartbeat ping of the shard
      * @type {number}
@@ -201,12 +199,12 @@ class WebSocketShard extends EventEmitter {
   connect() {
     const { client } = this.manager;
 
+    const gateway = this.resumeURL ?? this.manager.gateway;
+
     if (this.connection?.readyState === WebSocket.OPEN && this.status === Status.READY) {
       return Promise.resolve();
     }
 
-    const gateway = this.resumeURL ?? this.manager.gateway;
-
     return new Promise((resolve, reject) => {
       const cleanup = () => {
         this.removeListener(ShardEvents.CLOSE, onClose);
@@ -272,7 +270,7 @@ class WebSocketShard extends EventEmitter {
     Version    : ${client.options.ws.version}
     Encoding   : ${WebSocket.encoding}
     Compression: ${zlib ? 'zlib-stream' : 'none'}
-    Agent      : ${client.options.ws.agent instanceof http.Agent}`,
+    Proxy      : ${client.options.proxy || 'none'}`,
       );
 
       this.status = this.status === Status.DISCONNECTED ? Status.RECONNECTING : Status.CONNECTING;
@@ -280,11 +278,14 @@ class WebSocketShard extends EventEmitter {
       this.setWsCloseTimeout(-1);
       this.connectedAt = Date.now();
 
+      let args = { handshakeTimeout: 30_000 };
+      if (client.options.proxy.length > 0) {
+        const proxy = require('proxy-agent');
+        args.agent = new proxy(client.options.proxy);
+        this.debug(`Using proxy ${client.options.proxy}`, args);
+      }
       // Adding a handshake timeout to just make sure no zombie connection appears.
-      const ws = (this.connection = WebSocket.create(gateway, wsQuery, {
-        handshakeTimeout: 30_000,
-        agent: client.options.ws.agent instanceof http.Agent ? client.options.ws.agent : undefined,
-      }));
+      const ws = (this.connection = WebSocket.create(gateway, wsQuery, args));
       ws.onopen = this.onOpen.bind(this);
       ws.onmessage = this.onMessage.bind(this);
       ws.onerror = this.onError.bind(this);
@@ -432,11 +433,11 @@ class WebSocketShard extends EventEmitter {
          */
         this.emit(ShardEvents.READY);
 
-        this.resumeURL = packet.d.resume_gateway_url;
         this.sessionId = packet.d.session_id;
+        this.resumeURL = packet.d.resume_gateway_url;
         this.expectedGuilds = new Set(packet.d.guilds.filter(d => d?.unavailable == true).map(d => d.id));
         this.status = Status.WAITING_FOR_GUILDS;
-        this.debug(`[READY] Session ${this.sessionId} | Resume url ${this.resumeURL}.`);
+        this.debug(`[READY] Session ${this.sessionId} | ResumeURL ${this.resumeURL}`);
         this.lastHeartbeatAcked = true;
         this.sendHeartbeat('ReadyHeartbeat');
         break;
@@ -537,23 +538,21 @@ class WebSocketShard extends EventEmitter {
 
     const { waitGuildTimeout } = this.manager.client.options;
 
-    this.readyTimeout = setTimeout(
-      () => {
-        this.debug(
-          `Shard ${hasGuildsIntent ? 'did' : 'will'} not receive any more guild packets` +
-            `${hasGuildsIntent ? ` in ${waitGuildTimeout} ms` : ''}.\nUnavailable guild count: ${
-              this.expectedGuilds.size
-            }`,
-        );
+    this.readyTimeout = setTimeout(() => {
+      this.debug(
+        `Shard ${hasGuildsIntent ? 'did' : 'will'} not receive any more guild packets` +
+          `${hasGuildsIntent ? ` in ${waitGuildTimeout} ms` : ''}.\nUnavailable guild count: ${
+            this.expectedGuilds.size
+          }`,
+      );
 
-        this.readyTimeout = null;
+      this.readyTimeout = null;
 
-        this.status = Status.READY;
+      this.status = Status.READY;
 
-        this.emit(ShardEvents.ALL_READY, this.expectedGuilds);
-      },
-      hasGuildsIntent ? waitGuildTimeout : 0,
-    ).unref();
+      this.emit(ShardEvents.ALL_READY, this.expectedGuilds);
+      // }, hasGuildsIntent && waitGuildTimeout).unref();
+    }, waitGuildTimeout).unref();
   }
 
   /**
@@ -594,7 +593,6 @@ class WebSocketShard extends EventEmitter {
     }
     this.wsCloseTimeout = setTimeout(() => {
       this.setWsCloseTimeout(-1);
-
       // Check if close event was emitted.
       if (this.closeEmitted) {
         this.debug(`[WebSocket] close was already emitted, assuming the connection was closed properly.`);
@@ -658,6 +656,7 @@ class WebSocketShard extends EventEmitter {
     Sequence        : ${this.sequence}
     Connection State: ${this.connection ? CONNECTION_STATE[this.connection.readyState] : 'No Connection??'}`,
       );
+
       this.destroy({ reset: true, closeCode: 4009 });
       return;
     }
@@ -701,24 +700,25 @@ class WebSocketShard extends EventEmitter {
 
     this.status = Status.IDENTIFYING;
 
-    // Patch something
     Object.keys(client.options.ws.properties)
       .filter(k => k.startsWith('$'))
       .forEach(k => {
         client.options.ws.properties[k.slice(1)] = client.options.ws.properties[k];
         delete client.options.ws.properties[k];
       });
-
-    // Clone the identify payload and assign the token and shard info
     const d = {
+      presence: client.options.presence,
       ...client.options.ws,
       token: client.token,
     };
 
     delete d.version;
-    delete d.agent;
 
-    this.debug(`[IDENTIFY] Shard ${this.id}`);
+    this.debug(
+      `[IDENTIFY] Shard ${this.id}/${client.options.shardCount} with intents: ${Intents.resolve(
+        client.options.intents,
+      )} 😊`,
+    );
     this.send({ op: Opcodes.IDENTIFY, d }, true);
   }
 
@@ -815,7 +815,6 @@ class WebSocketShard extends EventEmitter {
     // Step 0: Remove all timers
     this.setHeartbeatTimer(-1);
     this.setHelloTimeout(-1);
-
     this.debug(
       `[WebSocket] Destroy: Attempting to close the WebSocket. | WS State: ${
         CONNECTION_STATE[this.connection?.readyState ?? WebSocket.CLOSED]

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

@@ -0,0 +1,23 @@
+'use strict';
+
+const { Events } = require('../../../util/Constants');
+
+module.exports = (client, { d: data }) => {
+  /**
+   * @typedef {object} AutocompleteResponseChoice
+   * @property {string} name The name of the choice
+   * @property {string} value The value of the choice
+   */
+  /**
+   * @typedef {object} AutocompleteResponse
+   * @property {Snowflake} [nonce] Snowflake of the data
+   * @property {Array<AutocompleteResponseChoice>} [choices] Array of choices
+   */
+  /**
+   * Emitted when receiving a response from Discord
+   * @event Client#applicationCommandAutocompleteResponse
+   * @param {AutocompleteResponse} data Data
+   * @deprecated Test only
+   */
+  client.emit(Events.APPLICATION_COMMAND_AUTOCOMPLETE_RESPONSE, data);
+};

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

@@ -1,5 +1,5 @@
 'use strict';
-const CallState = require('../../../structures/CallState');
+const Call = require('../../../structures/Call');
 const { Events } = require('../../../util/Constants');
 module.exports = (client, packet) => {
   for (const voice of packet.d.voice_states) {
@@ -8,7 +8,7 @@ module.exports = (client, packet) => {
   /**
    * Emitted whenever received a call
    * @event Client#callCreate
-   * @param {CallState} call Call
+   * @param {Call} call Call
    */
-  client.emit(Events.CALL_CREATE, new CallState(client, packet.d));
+  client.emit(Events.CALL_CREATE, new Call(client, packet.d));
 };

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

@@ -1,5 +1,5 @@
 'use strict';
-const CallState = require('../../../structures/CallState');
+const Call = require('../../../structures/Call');
 const { Events } = require('../../../util/Constants');
 module.exports = (client, packet) => {
   /**
@@ -7,5 +7,5 @@ module.exports = (client, packet) => {
    * @event Client#callDelete
    * @param {Call} call Call
    */
-  client.emit(Events.CALL_DELETE, new CallState(client, packet.d));
+  client.emit(Events.CALL_DELETE, new Call(client, packet.d));
 };

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

@@ -1,5 +1,5 @@
 'use strict';
-const CallState = require('../../../structures/CallState');
+const Call = require('../../../structures/Call');
 const { Events } = require('../../../util/Constants');
 module.exports = (client, packet) => {
   /**
@@ -7,5 +7,5 @@ module.exports = (client, packet) => {
    * @event Client#callUpdate
    * @param {Call} call Call
    */
-  client.emit(Events.CALL_UPDATE, new CallState(client, packet.d));
+  client.emit(Events.CALL_UPDATE, new Call(client, packet.d));
 };

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

@@ -1,19 +1,16 @@
 'use strict';
-const { Events, Status } = require('../../../util/Constants');
-module.exports = (client, packet, shard) => {
+const { Events } = require('../../../util/Constants');
+module.exports = (client, packet) => {
+  /**
+   * Emitted whenever a recipient is added from a group DM.
+   * @event Client#channelRecipientAdd
+   * @param {PartialGroupDMChannel} channel Group DM channel
+   * @param {User} user User
+   */
   const channel = client.channels.cache.get(packet.d.channel_id);
-  if (channel) {
-    if (!channel._recipients) channel._recipients = [];
-    channel._recipients.push(packet.d.user);
-    const user = client.users._add(packet.d.user);
-    if (shard.status == Status.READY) {
-      /**
-       * Emitted whenever a recipient is added from a group DM.
-       * @event Client#channelRecipientAdd
-       * @param {GroupDMChannel} channel Group DM channel
-       * @param {User} user User
-       */
-      client.emit(Events.CHANNEL_RECIPIENT_ADD, channel, user);
-    }
-  }
+  if (!channel) return;
+  if (!channel._recipients) channel._recipients = [];
+  channel._recipients.push(packet.d.user);
+  const user = client.users._add(packet.d.user);
+  client.emit(Events.CHANNEL_RECIPIENT_ADD, channel, user);
 };