disgroove 1.1.3-dev.ebbae8a → 1.1.4-dev.1dc1e11

package/dist/Client.js

@@ -15,16 +15,19 @@ class Client extends node_events_1.default {
     intents;
     shards;
     auth;
-    presence;
     rest;
     ws;
     constructor(token, options) {
         super();
         this.token = token;
-        this.intents = options?.intents || utils_1.GatewayIntents.AllNonPrivileged;
-        this.shards = options?.shards || -1;
-        this.auth = options?.auth || "Bot";
-        this.presence = options?.presence;
+        this.intents =
+            options?.intents !== undefined
+                ? Array.isArray(options.intents)
+                    ? options.intents.reduce((sum, num) => sum + num, 0)
+                    : options.intents
+                : utils_1.GatewayIntents.AllNonPrivileged;
+        this.shards = options?.shards ?? -1;
+        this.auth = options?.auth ?? "Bot";
         this.rest = new rest_1.REST(token, this.auth);
         this.ws = new ws_1.default("wss://gateway.discord.gg/?v=10&encoding=json");
     }
@@ -198,31 +201,9 @@ class Client extends node_events_1.default {
             op: utils_1.GatewayOPCodes.PresenceUpdate,
             d: {
                 since: options.status === utils_1.StatusTypes.Idle ? Date.now() : null,
-                activities: options.activities.map((activity) => ({
-                    name: activity.name,
-                    type: activity.type,
-                    url: activity.url,
-                    created_at: activity.createdAt,
-                    timestamps: activity.timestamps,
-                    application_id: activity.applicationId,
-                    details: activity.details,
-                    state: activity.state,
-                    party: activity.party,
-                    assets: activity.assets !== undefined
-                        ? {
-                            large_image: activity.assets.largeImage,
-                            large_text: activity.assets.largeText,
-                            small_image: activity.assets.smallImage,
-                            small_text: activity.assets.smallText,
-                        }
-                        : undefined,
-                    secrets: activity.secrets,
-                    instance: activity.instance,
-                    flags: activity.flags,
-                    buttons: activity.buttons,
-                })),
-                status: options.status,
-                afk: options.afk,
+                activities: options.activity !== undefined ? [options.activity] : null,
+                status: options.status ?? utils_1.StatusTypes.Online,
+                afk: !!options.afk,
             },
         }));
     }
@@ -245,7 +226,7 @@ class Client extends node_events_1.default {
     }
     /** https://discord.com/developers/docs/topics/gateway#connections */
     connect() {
-        this.ws.on("open", () => this.onWebSocketOpen(this.presence));
+        this.ws.on("open", () => this.onWebSocketOpen());
         this.ws.on("message", (data) => this.onWebSocketMessage(data));
         this.ws.on("error", (err) => this.onWebSocketError(err));
         this.ws.on("close", (code, reason) => this.onWebSocketClose(code, reason));
@@ -256,7 +237,7 @@ class Client extends node_events_1.default {
             this.heartbeatInterval = null;
         }
     }
-    async onWebSocketOpen(presence) {
+    async onWebSocketOpen() {
         const gatewayBot = await this.getGatewayBot();
         const shards = this.shards !== -1 ? this.shards : gatewayBot.shards;
         for (let i = 0; i < shards; i++) {
@@ -271,43 +252,13 @@ class Client extends node_events_1.default {
                         browser: "disgroove",
                         device: "disgroove",
                     },
-                    presence: presence !== undefined
-                        ? {
-                            since: presence.status === utils_1.StatusTypes.Idle ? Date.now() : null,
-                            activities: presence.activities.map((activity) => ({
-                                name: activity.name,
-                                type: activity.type,
-                                url: activity.url,
-                                created_at: activity.createdAt,
-                                timestamps: activity.timestamps,
-                                application_id: activity.applicationId,
-                                details: activity.details,
-                                state: activity.state,
-                                party: activity.party,
-                                assets: activity.assets !== undefined
-                                    ? {
-                                        large_image: activity.assets.largeImage,
-                                        large_text: activity.assets.largeText,
-                                        small_image: activity.assets.smallImage,
-                                        small_text: activity.assets.smallText,
-                                    }
-                                    : undefined,
-                                secrets: activity.secrets,
-                                instance: activity.instance,
-                                flags: activity.flags,
-                                buttons: activity.buttons,
-                            })),
-                            status: presence.status,
-                            afk: presence.afk,
-                        }
-                        : undefined,
                 },
             }));
         }
     }
     onWebSocketMessage(data) {
-        const { t, op, d } = JSON.parse(data.toString());
-        switch (op) {
+        const packet = JSON.parse(data.toString());
+        switch (packet.op) {
             case utils_1.GatewayOPCodes.Reconnect:
                 super.emit(utils_1.GatewayEvents.Reconnect);
                 break;
@@ -321,14 +272,14 @@ class Client extends node_events_1.default {
                             op: utils_1.GatewayOPCodes.Heartbeat,
                             d: null,
                         }));
-                    }, d.heartbeat_interval);
+                    }, packet.d.heartbeat_interval);
                     super.emit(utils_1.GatewayEvents.Hello, {
-                        heartbeatInterval: d.heartbeat_interval,
+                        heartbeatInterval: packet.d.heartbeat_interval,
                     });
                 }
                 break;
         }
-        switch (t) {
+        switch (packet.t) {
             case "READY":
                 super.emit(utils_1.GatewayEvents.Ready);
                 break;
@@ -337,10 +288,10 @@ class Client extends node_events_1.default {
                 break;
             case "APPLICATION_COMMAND_PERMISSIONS_UPDATE":
                 super.emit(utils_1.GatewayEvents.ApplicationCommandPermissionsUpdate, {
-                    id: d.id,
-                    applicationId: d.application_id,
-                    guildId: d.guild_id,
-                    permissions: d.permissions.map((permission) => ({
+                    id: packet.d.id,
+                    applicationId: packet.d.application_id,
+                    guildId: packet.d.guild_id,
+                    permissions: packet.d.permissions.map((permission) => ({
                         id: permission.id,
                         type: permission.type,
                         permission: permission.permission,
@@ -348,63 +299,63 @@ class Client extends node_events_1.default {
                 });
                 break;
             case "AUTO_MODERATION_RULE_CREATE":
-                super.emit(utils_1.GatewayEvents.AutoModerationRuleCreate, new structures_1.AutoModerationRule(d, this));
+                super.emit(utils_1.GatewayEvents.AutoModerationRuleCreate, new structures_1.AutoModerationRule(packet.d, this));
                 break;
             case "AUTO_MODERATION_RULE_UPDATE":
-                super.emit(utils_1.GatewayEvents.AutoModerationRuleUpdate, new structures_1.AutoModerationRule(d, this));
+                super.emit(utils_1.GatewayEvents.AutoModerationRuleUpdate, new structures_1.AutoModerationRule(packet.d, this));
                 break;
             case "AUTO_MODERATION_RULE_DELETE":
-                super.emit(utils_1.GatewayEvents.AutoModerationRuleDelete, new structures_1.AutoModerationRule(d, this).toJSON());
+                super.emit(utils_1.GatewayEvents.AutoModerationRuleDelete, new structures_1.AutoModerationRule(packet.d, this).toJSON());
                 break;
             case "AUTO_MODERATION_ACTION_EXECUTION":
                 super.emit(utils_1.GatewayEvents.AutoModerationActionExecution, {
-                    guildId: d.guild_id,
+                    guildId: packet.d.guild_id,
                     action: {
-                        type: d.action.type,
-                        metadata: d.action.metadata,
+                        type: packet.d.action.type,
+                        metadata: packet.d.action.metadata,
                     },
-                    ruleId: d.rule_id,
-                    ruleTriggerType: d.rule_trigger_type,
-                    userId: d.user_id,
-                    channelId: d.channel_id,
-                    messageId: d.message_id,
-                    alertSystemMessageId: d.alert_system_message_id,
-                    content: d.content,
-                    matchedKeyword: d.matched_keyword,
-                    matchedContent: d.matched_content,
+                    ruleId: packet.d.rule_id,
+                    ruleTriggerType: packet.d.rule_trigger_type,
+                    userId: packet.d.user_id,
+                    channelId: packet.d.channel_id,
+                    messageId: packet.d.message_id,
+                    alertSystemMessageId: packet.d.alert_system_message_id,
+                    content: packet.d.content,
+                    matchedKeyword: packet.d.matched_keyword,
+                    matchedContent: packet.d.matched_content,
                 });
                 break;
             case "CHANNEL_CREATE":
-                super.emit(utils_1.GatewayEvents.ChannelCreate, new structures_1.Channel(d, this));
+                super.emit(utils_1.GatewayEvents.ChannelCreate, new structures_1.Channel(packet.d, this));
                 break;
             case "CHANNEL_UPDATE":
-                super.emit(utils_1.GatewayEvents.ChannelUpdate, new structures_1.Channel(d, this));
+                super.emit(utils_1.GatewayEvents.ChannelUpdate, new structures_1.Channel(packet.d, this));
                 break;
             case "CHANNEL_DELETE":
-                super.emit(utils_1.GatewayEvents.ChannelDelete, new structures_1.Channel(d, this).toJSON());
+                super.emit(utils_1.GatewayEvents.ChannelDelete, new structures_1.Channel(packet.d, this).toJSON());
                 break;
             case "CHANNEL_PINS_UPDATE":
                 super.emit(utils_1.GatewayEvents.ChannelPinsUpdate, {
-                    guildId: d.guild_id,
-                    channelId: d.channel_id,
-                    lastPinTimestamp: d.last_pin_timestamp,
+                    guildId: packet.d.guild_id,
+                    channelId: packet.d.channel_id,
+                    lastPinTimestamp: packet.d.last_pin_timestamp,
                 });
                 break;
             case "THREAD_CREATE":
-                super.emit(utils_1.GatewayEvents.ThreadCreate, new structures_1.Channel(d, this));
+                super.emit(utils_1.GatewayEvents.ThreadCreate, new structures_1.Channel(packet.d, this));
                 break;
             case "THREAD_UPDATE":
-                super.emit(utils_1.GatewayEvents.ThreadUpdate, new structures_1.Channel(d, this));
+                super.emit(utils_1.GatewayEvents.ThreadUpdate, new structures_1.Channel(packet.d, this));
                 break;
             case "THREAD_DELETE":
-                super.emit(utils_1.GatewayEvents.ThreadDelete, new structures_1.Channel(d, this).toJSON());
+                super.emit(utils_1.GatewayEvents.ThreadDelete, new structures_1.Channel(packet.d, this).toJSON());
                 break;
             case "THREAD_LIST_SYNC":
                 super.emit(utils_1.GatewayEvents.ThreadListSync, {
-                    guildId: d.guild_id,
-                    channelIds: d.channel_ids,
-                    threads: d.threads.map((channel) => new structures_1.Channel(channel, this)),
-                    members: d.members.map((member) => ({
+                    guildId: packet.d.guild_id,
+                    channelIds: packet.d.channel_ids,
+                    threads: packet.d.threads.map((channel) => new structures_1.Channel(channel, this)),
+                    members: packet.d.members.map((member) => ({
                         id: member.id,
                         userId: member.user_id,
                         joinTimestamp: member.join_timestamp,
@@ -417,22 +368,22 @@ class Client extends node_events_1.default {
                 break;
             case "THREAD_MEMBER_UPDATE":
                 super.emit(utils_1.GatewayEvents.ThreadMemberUpdate, {
-                    id: d.id,
-                    userId: d.user_id,
-                    joinTimestamp: d.join_timestamp,
-                    flags: d.flags,
-                    member: d.member !== undefined
-                        ? new structures_1.GuildMember(d.member, this)
+                    id: packet.d.id,
+                    userId: packet.d.user_id,
+                    joinTimestamp: packet.d.join_timestamp,
+                    flags: packet.d.flags,
+                    member: packet.d.member !== undefined
+                        ? new structures_1.GuildMember(packet.d.member, this)
                         : undefined,
-                    guildId: d.guild_id,
+                    guildId: packet.d.guild_id,
                 });
                 break;
             case "THREAD_MEMBERS_UPDATE":
                 super.emit(utils_1.GatewayEvents.ThreadMembersUpdate, {
-                    id: d.id,
-                    guildId: d.guild_id,
-                    memberCount: d.member_count,
-                    addedMembers: d.added_members?.map((member) => ({
+                    id: packet.d.id,
+                    guildId: packet.d.guild_id,
+                    memberCount: packet.d.member_count,
+                    addedMembers: packet.d.added_members?.map((member) => ({
                         id: member.id,
                         userId: member.user_id,
                         joinTimestamp: member.join_timestamp,
@@ -441,46 +392,46 @@ class Client extends node_events_1.default {
                             ? new structures_1.GuildMember(member.member, this)
                             : undefined,
                     })),
-                    removedMemberIds: d.removed_member_ids,
+                    removedMemberIds: packet.d.removed_member_ids,
                 });
                 break;
             case "GUILD_CREATE":
-                super.emit(utils_1.GatewayEvents.GuildCreate, new structures_1.Guild(d, this));
+                super.emit(utils_1.GatewayEvents.GuildCreate, new structures_1.Guild(packet.d, this));
                 break;
             case "GUILD_UPDATE":
-                super.emit(utils_1.GatewayEvents.GuildUpdate, new structures_1.Guild(d, this));
+                super.emit(utils_1.GatewayEvents.GuildUpdate, new structures_1.Guild(packet.d, this));
                 break;
             case "GUILD_DELETE":
                 super.emit(utils_1.GatewayEvents.GuildDelete, {
-                    id: d.id,
-                    unavailable: d.unavailable,
+                    id: packet.d.id,
+                    unavailable: packet.d.unavailable,
                 });
                 break;
             case "GUILD_AUDIT_LOG_ENTRY_CREATE":
-                super.emit(utils_1.GatewayEvents.GuildAuditLogEntryCreate, (0, utils_1.auditLogEntryToJSON)(d));
+                super.emit(utils_1.GatewayEvents.GuildAuditLogEntryCreate, (0, utils_1.auditLogEntryToJSON)(packet.d));
                 break;
             case "GUILD_BAN_ADD":
                 super.emit(utils_1.GatewayEvents.GuildBanAdd, {
-                    guildId: d.guild_id,
-                    user: new structures_1.User(d.user, this),
+                    guildId: packet.d.guild_id,
+                    user: new structures_1.User(packet.d.user, this),
                 });
                 break;
             case "GUILD_BAN_REMOVE":
                 super.emit(utils_1.GatewayEvents.GuildBanRemove, {
-                    guildId: d.guild_id,
-                    user: new structures_1.User(d.user, this),
+                    guildId: packet.d.guild_id,
+                    user: new structures_1.User(packet.d.user, this),
                 });
                 break;
             case "GUILD_EMOJIS_UPDATE":
                 super.emit(utils_1.GatewayEvents.GuildEmojisUpdate, {
-                    guildId: d.guild_id,
-                    emojis: d.emojis.map((emoji) => new structures_1.Emoji(emoji, this).toJSON()),
+                    guildId: packet.d.guild_id,
+                    emojis: packet.d.emojis.map((emoji) => new structures_1.Emoji(emoji, this).toJSON()),
                 });
                 break;
             case "GUILD_STICKERS_UPDATE":
                 super.emit(utils_1.GatewayEvents.GuildStickersUpdate, {
-                    guildId: d.guild_id,
-                    stickers: d.stickers.map((sticker) => ({
+                    guildId: packet.d.guild_id,
+                    stickers: packet.d.stickers.map((sticker) => ({
                         id: sticker.id,
                         packId: sticker.pack_id,
                         name: sticker.name,
@@ -500,187 +451,189 @@ class Client extends node_events_1.default {
                 break;
             case "GUILD_INTEGRATIONS_UPDATE":
                 super.emit(utils_1.GatewayEvents.GuildIntegrationsUpdate, {
-                    guildId: d.guild_id,
+                    guildId: packet.d.guild_id,
                 });
                 break;
             case "GUILD_MEMBER_ADD":
-                super.emit(utils_1.GatewayEvents.GuildMemberAdd, new structures_1.GuildMember(d, this));
+                super.emit(utils_1.GatewayEvents.GuildMemberAdd, new structures_1.GuildMember(packet.d, this));
                 break;
             case "GUILD_MEMBER_REMOVE":
                 super.emit(utils_1.GatewayEvents.GuildMemberRemove, {
-                    guildId: d.guild_id,
-                    user: new structures_1.User(d.user, this),
+                    guildId: packet.d.guild_id,
+                    user: new structures_1.User(packet.d.user, this),
                 });
                 break;
             case "GUILD_MEMBER_UPDATE":
                 super.emit(utils_1.GatewayEvents.GuildMemberUpdate, {
-                    guildId: d.guild_id,
-                    roles: d.roles,
-                    user: new structures_1.User(d.user, this),
-                    nick: d.nick,
-                    avatar: d.avatar,
-                    joinedAt: d.joined_at,
-                    premiumSince: d.premium_since,
-                    deaf: d.deaf,
-                    mute: d.mute,
-                    pending: d.pending,
-                    communicationDisabledUntil: d.communication_disabled_until,
+                    guildId: packet.d.guild_id,
+                    roles: packet.d.roles,
+                    user: new structures_1.User(packet.d.user, this),
+                    nick: packet.d.nick,
+                    avatar: packet.d.avatar,
+                    joinedAt: packet.d.joined_at,
+                    premiumSince: packet.d.premium_since,
+                    deaf: packet.d.deaf,
+                    mute: packet.d.mute,
+                    pending: packet.d.pending,
+                    communicationDisabledUntil: packet.d.communication_disabled_until,
                 });
                 break;
             case "GUILD_MEMBERS_CHUNK":
                 super.emit(utils_1.GatewayEvents.GuildMembersChunk, {
-                    guildId: d.guild_id,
-                    members: d.members.map((member) => new structures_1.GuildMember(member, this)),
-                    chunkIndex: d.chunk_index,
-                    chunkCount: d.chunk_count,
-                    notFound: d.not_found,
-                    presences: d.presences,
-                    nonce: d.nonce,
+                    guildId: packet.d.guild_id,
+                    members: packet.d.members.map((member) => new structures_1.GuildMember(member, this)),
+                    chunkIndex: packet.d.chunk_index,
+                    chunkCount: packet.d.chunk_count,
+                    notFound: packet.d.not_found,
+                    presences: packet.d.presences,
+                    nonce: packet.d.nonce,
                 });
                 break;
             case "GUILD_ROLE_CREATE":
                 super.emit(utils_1.GatewayEvents.GuildRoleCreate, {
-                    guildId: d.guild_id,
-                    role: new structures_1.Role(d.role, this),
+                    guildId: packet.d.guild_id,
+                    role: new structures_1.Role(packet.d.role, this),
                 });
                 break;
             case "GUILD_ROLE_UPDATE":
                 super.emit(utils_1.GatewayEvents.GuildRoleUpdate, {
-                    guildId: d.guild_id,
-                    role: new structures_1.Role(d.role, this),
+                    guildId: packet.d.guild_id,
+                    role: new structures_1.Role(packet.d.role, this),
                 });
                 break;
             case "GUILD_ROLE_DELETE":
                 super.emit(utils_1.GatewayEvents.GuildRoleDelete, {
-                    guildId: d.guild_id,
-                    roleId: d.role_id,
+                    guildId: packet.d.guild_id,
+                    roleId: packet.d.role_id,
                 });
                 break;
             case "GUILD_SCHEDULED_EVENT_CREATE":
-                super.emit(utils_1.GatewayEvents.GuildScheduledEventCreate, new structures_1.GuildScheduledEvent(d, this));
+                super.emit(utils_1.GatewayEvents.GuildScheduledEventCreate, new structures_1.GuildScheduledEvent(packet.d, this));
                 break;
             case "GUILD_SCHEDULED_EVENT_UPDATE":
-                super.emit(utils_1.GatewayEvents.GuildScheduledEventUpdate, new structures_1.GuildScheduledEvent(d, this));
+                super.emit(utils_1.GatewayEvents.GuildScheduledEventUpdate, new structures_1.GuildScheduledEvent(packet.d, this));
                 break;
             case "GUILD_SCHEDULED_EVENT_DELETE":
-                super.emit(utils_1.GatewayEvents.GuildScheduledEventDelete, new structures_1.GuildScheduledEvent(d, this).toJSON());
+                super.emit(utils_1.GatewayEvents.GuildScheduledEventDelete, new structures_1.GuildScheduledEvent(packet.d, this).toJSON());
                 break;
             case "GUILD_SCHEDULED_EVENT_USER_ADD":
                 super.emit(utils_1.GatewayEvents.GuildScheduledEventUserAdd, {
-                    guildScheduledEventId: d.guild_scheduled_event_id,
-                    userId: d.user_id,
-                    guildId: d.guild_id,
+                    guildScheduledEventId: packet.d.guild_scheduled_event_id,
+                    userId: packet.d.user_id,
+                    guildId: packet.d.guild_id,
                 });
                 break;
             case "GUILD_SCHEDULED_EVENT_USER_REMOVE":
                 super.emit(utils_1.GatewayEvents.GuildScheduledEventUserRemove, {
-                    guildScheduledEventId: d.guild_scheduled_event_id,
-                    userId: d.user_id,
-                    guildId: d.guild_id,
+                    guildScheduledEventId: packet.d.guild_scheduled_event_id,
+                    userId: packet.d.user_id,
+                    guildId: packet.d.guild_id,
                 });
                 break;
             case "INTEGRATION_CREATE":
-                super.emit(utils_1.GatewayEvents.IntegrationCreate, new structures_1.Integration(d, this));
+                super.emit(utils_1.GatewayEvents.IntegrationCreate, new structures_1.Integration(packet.d, this));
                 break;
             case "INTEGRATION_UPDATE":
-                super.emit(utils_1.GatewayEvents.IntegrationUpdate, new structures_1.Integration(d, this));
+                super.emit(utils_1.GatewayEvents.IntegrationUpdate, new structures_1.Integration(packet.d, this));
                 break;
             case "INTEGRATION_DELETE":
                 super.emit(utils_1.GatewayEvents.IntegrationDelete, {
-                    id: d.id,
-                    guildId: d.guild_id,
-                    applicationId: d.application_id,
+                    id: packet.d.id,
+                    guildId: packet.d.guild_id,
+                    applicationId: packet.d.application_id,
                 });
                 break;
             case "INTERACTION_CREATE":
-                super.emit(utils_1.GatewayEvents.InteractionCreate, new structures_1.Interaction(d, this));
+                super.emit(utils_1.GatewayEvents.InteractionCreate, new structures_1.Interaction(packet.d, this));
                 break;
             case "INVITE_CREATE":
                 super.emit(utils_1.GatewayEvents.InviteCreate, {
-                    channelId: d.channel_id,
-                    code: d.code,
-                    createdAt: d.created_at,
-                    guildId: d.guild_id,
-                    inviter: d.inviter !== undefined ? new structures_1.User(d.inviter, this) : undefined,
-                    maxAge: d.max_age,
-                    maxUses: d.max_uses,
-                    targetType: d.target_type,
-                    targetUser: d.target_user !== undefined
-                        ? new structures_1.User(d.target_user, this)
+                    channelId: packet.d.channel_id,
+                    code: packet.d.code,
+                    createdAt: packet.d.created_at,
+                    guildId: packet.d.guild_id,
+                    inviter: packet.d.inviter !== undefined
+                        ? new structures_1.User(packet.d.inviter, this)
+                        : undefined,
+                    maxAge: packet.d.max_age,
+                    maxUses: packet.d.max_uses,
+                    targetType: packet.d.target_type,
+                    targetUser: packet.d.target_user !== undefined
+                        ? new structures_1.User(packet.d.target_user, this)
                         : undefined,
-                    targetApplication: d.target_application !== undefined
-                        ? new structures_1.Application(d.target_application, this)
+                    targetApplication: packet.d.target_application !== undefined
+                        ? new structures_1.Application(packet.d.target_application, this)
                         : undefined,
-                    temporary: d.temporary,
-                    uses: d.uses,
+                    temporary: packet.d.temporary,
+                    uses: packet.d.uses,
                 });
                 break;
             case "INVITE_DELETE":
                 super.emit(utils_1.GatewayEvents.InviteDelete, {
-                    channelId: d.channel_id,
-                    guildId: d.guild_id,
-                    code: d.code,
+                    channelId: packet.d.channel_id,
+                    guildId: packet.d.guild_id,
+                    code: packet.d.code,
                 });
                 break;
             case "MESSAGE_CREATE":
-                super.emit(utils_1.GatewayEvents.MessageCreate, new structures_1.Message(d, this));
+                super.emit(utils_1.GatewayEvents.MessageCreate, new structures_1.Message(packet.d, this));
                 break;
             case "MESSAGE_UPDATE":
-                super.emit(utils_1.GatewayEvents.MessageUpdate, new structures_1.Message(d, this));
+                super.emit(utils_1.GatewayEvents.MessageUpdate, new structures_1.Message(packet.d, this));
                 break;
             case "MESSAGE_DELETE":
-                super.emit(utils_1.GatewayEvents.MessageDelete, new structures_1.Message(d, this).toJSON());
+                super.emit(utils_1.GatewayEvents.MessageDelete, new structures_1.Message(packet.d, this).toJSON());
                 break;
             case "MESSAGE_DELETE_BULK":
                 super.emit(utils_1.GatewayEvents.MessageDeleteBulk, {
-                    ids: d.ids,
-                    channelId: d.channel_id,
-                    guildId: d.guild_id,
+                    ids: packet.d.ids,
+                    channelId: packet.d.channel_id,
+                    guildId: packet.d.guild_id,
                 });
                 break;
             case "MESSAGE_REACTION_ADD":
                 super.emit(utils_1.GatewayEvents.MessageReactionAdd, {
-                    userId: d.user_id,
-                    channelId: d.channel_id,
-                    messageId: d.message_id,
-                    guildId: d.guild_id,
-                    member: d.member !== undefined
-                        ? new structures_1.GuildMember(d.member, this)
+                    userId: packet.d.user_id,
+                    channelId: packet.d.channel_id,
+                    messageId: packet.d.message_id,
+                    guildId: packet.d.guild_id,
+                    member: packet.d.member !== undefined
+                        ? new structures_1.GuildMember(packet.d.member, this)
                         : undefined,
-                    emoji: new structures_1.Emoji(d.emoji, this),
-                    messageAuthorId: d.message_author_id,
+                    emoji: new structures_1.Emoji(packet.d.emoji, this),
+                    messageAuthorId: packet.d.message_author_id,
                 });
                 break;
             case "MESSAGE_REACTION_REMOVE":
                 super.emit(utils_1.GatewayEvents.MessageReactionRemove, {
-                    userId: d.user_id,
-                    channelId: d.channel_id,
-                    messageId: d.message_id,
-                    guildId: d.guild_id,
-                    emoji: new structures_1.Emoji(d.emoji, this),
+                    userId: packet.d.user_id,
+                    channelId: packet.d.channel_id,
+                    messageId: packet.d.message_id,
+                    guildId: packet.d.guild_id,
+                    emoji: new structures_1.Emoji(packet.d.emoji, this),
                 });
                 break;
             case "MESSAGE_REACTION_REMOVE_ALL":
                 super.emit(utils_1.GatewayEvents.MessageReactionRemoveAll, {
-                    channelId: d.channel_id,
-                    messageId: d.message_id,
-                    guildId: d.guild_id,
+                    channelId: packet.d.channel_id,
+                    messageId: packet.d.message_id,
+                    guildId: packet.d.guild_id,
                 });
                 break;
             case "MESSAGE_REACTION_REMOVE_EMOJI":
                 super.emit(utils_1.GatewayEvents.MessageReactionRemoveEmoji, {
-                    channelId: d.channel_id,
-                    guildId: d.guild_id,
-                    messageId: d.message_id,
-                    emoji: new structures_1.Emoji(d.emoji, this),
+                    channelId: packet.d.channel_id,
+                    guildId: packet.d.guild_id,
+                    messageId: packet.d.message_id,
+                    emoji: new structures_1.Emoji(packet.d.emoji, this),
                 });
                 break;
             case "PRESENCE_UPDATE":
                 super.emit(utils_1.GatewayEvents.PresenceUpdate, {
-                    user: new structures_1.User(d.user, this),
-                    guildId: d.guild_id,
-                    status: d.status,
-                    activities: d.activities.map((activity) => ({
+                    user: new structures_1.User(packet.d.user, this),
+                    guildId: packet.d.guild_id,
+                    status: packet.d.status,
+                    activities: packet.d.activities.map((activity) => ({
                         name: activity.name,
                         type: activity.type,
                         url: activity.url,
@@ -705,65 +658,65 @@ class Client extends node_events_1.default {
                         buttons: activity.buttons,
                     })),
                     clientStatus: {
-                        desktop: d.client_status.desktop,
-                        mobile: d.client_status.mobile,
-                        web: d.client_status.web,
+                        desktop: packet.d.client_status.desktop,
+                        mobile: packet.d.client_status.mobile,
+                        web: packet.d.client_status.web,
                     },
                 });
                 break;
             case "STAGE_INSTANCE_CREATE":
-                super.emit(utils_1.GatewayEvents.StageInstanceCreate, new structures_1.StageInstance(d, this));
+                super.emit(utils_1.GatewayEvents.StageInstanceCreate, new structures_1.StageInstance(packet.d, this));
                 break;
             case "STAGE_INSTANCE_UPDATE":
-                super.emit(utils_1.GatewayEvents.StageInstanceUpdate, new structures_1.StageInstance(d, this));
+                super.emit(utils_1.GatewayEvents.StageInstanceUpdate, new structures_1.StageInstance(packet.d, this));
                 break;
             case "STAGE_INSTANCE_DELETE":
-                super.emit(utils_1.GatewayEvents.StageInstanceDelete, new structures_1.StageInstance(d, this).toJSON());
+                super.emit(utils_1.GatewayEvents.StageInstanceDelete, new structures_1.StageInstance(packet.d, this).toJSON());
                 break;
             case "TYPING_START":
                 super.emit(utils_1.GatewayEvents.TypingStart, {
-                    channelId: d.channel_id,
-                    guildId: d.guild_id,
-                    userId: d.user_id,
-                    timestamp: d.timestamp,
-                    member: d.member !== undefined
-                        ? new structures_1.GuildMember(d.member, this)
+                    channelId: packet.d.channel_id,
+                    guildId: packet.d.guild_id,
+                    userId: packet.d.user_id,
+                    timestamp: packet.d.timestamp,
+                    member: packet.d.member !== undefined
+                        ? new structures_1.GuildMember(packet.d.member, this)
                         : undefined,
                 });
                 break;
             case "USER_UPDATE":
-                super.emit(utils_1.GatewayEvents.UserUpdate, new structures_1.User(d, this));
+                super.emit(utils_1.GatewayEvents.UserUpdate, new structures_1.User(packet.d, this));
                 break;
             case "VOICE_STATE_UPDATE":
                 super.emit(utils_1.GatewayEvents.VoiceStateUpdate, {
-                    guildId: d.guild_id,
-                    channelId: d.channel_id,
-                    userId: d.user_id,
-                    member: d.member !== undefined
-                        ? new structures_1.GuildMember(d.member, this)
+                    guildId: packet.d.guild_id,
+                    channelId: packet.d.channel_id,
+                    userId: packet.d.user_id,
+                    member: packet.d.member !== undefined
+                        ? new structures_1.GuildMember(packet.d.member, this)
                         : undefined,
-                    sessionId: d.session_id,
-                    deaf: d.deaf,
-                    mute: d.mute,
-                    selfDeaf: d.self_deaf,
-                    selfMute: d.self_mute,
-                    selfStream: d.self_stream,
-                    selfVideo: d.self_video,
-                    suppress: d.suppress,
-                    requestToSpeakTimestamp: d.request_to_speak_timestamp,
+                    sessionId: packet.d.session_id,
+                    deaf: packet.d.deaf,
+                    mute: packet.d.mute,
+                    selfDeaf: packet.d.self_deaf,
+                    selfMute: packet.d.self_mute,
+                    selfStream: packet.d.self_stream,
+                    selfVideo: packet.d.self_video,
+                    suppress: packet.d.suppress,
+                    requestToSpeakTimestamp: packet.d.request_to_speak_timestamp,
                 });
                 break;
             case "VOICE_SERVER_UPDATE":
                 super.emit(utils_1.GatewayEvents.VoiceServerUpdate, {
-                    token: d.token,
-                    guildId: d.guild_id,
-                    endpoint: d.endpoint,
+                    token: packet.d.token,
+                    guildId: packet.d.guild_id,
+                    endpoint: packet.d.endpoint,
                 });
                 break;
             case "WEBHOOKS_UPDATE":
                 super.emit(utils_1.GatewayEvents.WebhooksUpdate, {
-                    guildId: d.guild_id,
-                    channelId: d.channel_id,
+                    guildId: packet.d.guild_id,
+                    channelId: packet.d.channel_id,
                 });
                 break;
         }