disgroove 2.2.2-dev.db6cb16 → 2.2.3-dev.4f98e3d

package/dist/lib/gateway/Shard.js

@@ -31,18 +31,21 @@ const ws_1 = __importDefault(require("ws"));
 const constants_1 = require("../constants");
 const utils_1 = require("../utils");
 const pkg = __importStar(require("../../package.json"));
+const transformers_1 = require("../transformers");
 class Shard {
     id;
     heartbeatInterval;
     client;
     ws;
     sessionID;
+    resumeGatewayURL;
     constructor(id, client) {
         this.id = id;
         this.heartbeatInterval = null;
         this.client = client;
         this.ws = new ws_1.default("wss://gateway.discord.gg/?v=10&encoding=json", client.ws);
         this.sessionID = null;
+        this.resumeGatewayURL = null;
     }
     /** https://discord.com/developers/docs/topics/gateway#connections */
     connect() {
@@ -85,33 +88,34 @@ class Shard {
         }));
     }
     onDispatch(packet) {
-        this.client.emit(constants_1.GatewayEvents.Dispatch, packet);
+        this.client.emit("dispatch", packet);
         switch (packet.t) {
-            case "READY":
+            case constants_1.GatewayEvents.Ready:
                 {
                     this.sessionID = packet.d.session_id;
-                    this.client.user = this.client.util.userFromRaw(packet.d.user);
+                    this.resumeGatewayURL = packet.d.resume_gateway_url;
+                    this.client.user = transformers_1.Users.userFromRaw(packet.d.user);
                     this.client.application = packet.d.application;
-                    this.client.emit(constants_1.GatewayEvents.Ready);
+                    this.client.emit("ready");
                 }
                 break;
-            case "RESUMED":
-                this.client.emit(constants_1.GatewayEvents.Resumed);
+            case constants_1.GatewayEvents.Resumed:
+                this.client.emit("resumed");
                 break;
-            case "APPLICATION_COMMAND_PERMISSIONS_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.ApplicationCommandPermissionsUpdate, this.client.util.guildApplicationCommandPermissionsFromRaw(packet.d));
+            case constants_1.GatewayEvents.ApplicationCommandPermissionsUpdate:
+                this.client.emit("applicationCommandPermissionsUpdate", transformers_1.Guilds.guildApplicationCommandPermissionsFromRaw(packet.d));
                 break;
-            case "AUTO_MODERATION_RULE_CREATE":
-                this.client.emit(constants_1.GatewayEvents.AutoModerationRuleCreate, this.client.util.autoModerationRuleFromRaw(packet.d));
+            case constants_1.GatewayEvents.AutoModerationRuleCreate:
+                this.client.emit("autoModerationRuleCreate", transformers_1.AutoModeration.autoModerationRuleFromRaw(packet.d));
                 break;
-            case "AUTO_MODERATION_RULE_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.AutoModerationRuleUpdate, this.client.util.autoModerationRuleFromRaw(packet.d));
+            case constants_1.GatewayEvents.AutoModerationRuleUpdate:
+                this.client.emit("autoModerationRuleUpdate", transformers_1.AutoModeration.autoModerationRuleFromRaw(packet.d));
                 break;
-            case "AUTO_MODERATION_RULE_DELETE":
-                this.client.emit(constants_1.GatewayEvents.AutoModerationRuleDelete, this.client.util.autoModerationRuleFromRaw(packet.d));
+            case constants_1.GatewayEvents.AutoModerationRuleDelete:
+                this.client.emit("autoModerationRuleDelete", transformers_1.AutoModeration.autoModerationRuleFromRaw(packet.d));
                 break;
-            case "AUTO_MODERATION_ACTION_EXECUTION":
-                this.client.emit(constants_1.GatewayEvents.AutoModerationActionExecution, {
+            case constants_1.GatewayEvents.AutoModerationActionExecution:
+                this.client.emit("autoModerationActionExecution", {
                     guildID: packet.d.guild_id,
                     action: {
                         type: packet.d.action.type,
@@ -132,136 +136,136 @@ class Shard {
                     matchedContent: packet.d.matched_content,
                 });
                 break;
-            case "CHANNEL_CREATE":
-                this.client.emit(constants_1.GatewayEvents.ChannelCreate, this.client.util.channelFromRaw(packet.d));
+            case constants_1.GatewayEvents.ChannelCreate:
+                this.client.emit("channelCreate", transformers_1.Channels.channelFromRaw(packet.d));
                 break;
-            case "CHANNEL_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.ChannelUpdate, this.client.util.channelFromRaw(packet.d));
+            case constants_1.GatewayEvents.ChannelUpdate:
+                this.client.emit("channelUpdate", transformers_1.Channels.channelFromRaw(packet.d));
                 break;
-            case "CHANNEL_DELETE":
-                this.client.emit(constants_1.GatewayEvents.ChannelDelete, this.client.util.channelFromRaw(packet.d));
+            case constants_1.GatewayEvents.ChannelDelete:
+                this.client.emit("channelDelete", transformers_1.Channels.channelFromRaw(packet.d));
                 break;
-            case "CHANNEL_PINS_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.ChannelPinsUpdate, {
+            case constants_1.GatewayEvents.ChannelPinsUpdate:
+                this.client.emit("channelPinsUpdate", {
                     guildID: packet.d.guild_id,
                     channelID: packet.d.channel_id,
                     lastPinTimestamp: packet.d.last_pin_timestamp,
                 });
                 break;
-            case "THREAD_CREATE":
-                this.client.emit(constants_1.GatewayEvents.ThreadCreate, this.client.util.channelFromRaw(packet.d));
+            case constants_1.GatewayEvents.ThreadCreate:
+                this.client.emit("threadCreate", transformers_1.Channels.channelFromRaw(packet.d));
                 break;
-            case "THREAD_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.ThreadUpdate, this.client.util.channelFromRaw(packet.d));
+            case constants_1.GatewayEvents.ThreadUpdate:
+                this.client.emit("threadUpdate", transformers_1.Channels.channelFromRaw(packet.d));
                 break;
-            case "THREAD_DELETE":
-                this.client.emit(constants_1.GatewayEvents.ThreadDelete, this.client.util.channelFromRaw(packet.d));
+            case constants_1.GatewayEvents.ThreadDelete:
+                this.client.emit("threadDelete", transformers_1.Channels.channelFromRaw(packet.d));
                 break;
-            case "THREAD_LIST_SYNC":
-                this.client.emit(constants_1.GatewayEvents.ThreadListSync, {
+            case constants_1.GatewayEvents.ThreadListSync:
+                this.client.emit("threadListSync", {
                     guildID: packet.d.guild_id,
                     channelIDs: packet.d.channel_ids,
-                    threads: packet.d.threads.map((thread) => this.client.util.channelFromRaw(thread)),
-                    members: packet.d.members.map((threadMember) => this.client.util.threadMemberFromRaw(threadMember)),
+                    threads: packet.d.threads.map((thread) => transformers_1.Channels.channelFromRaw(thread)),
+                    members: packet.d.members.map((threadMember) => transformers_1.Channels.threadMemberFromRaw(threadMember)),
                 });
                 break;
-            case "THREAD_MEMBER_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.ThreadMemberUpdate, {
+            case constants_1.GatewayEvents.ThreadMemberUpdate:
+                this.client.emit("threadMemberUpdate", {
                     id: packet.d.id,
                     userID: packet.d.user_id,
                     joinTimestamp: packet.d.join_timestamp,
                     flags: packet.d.flags,
                     member: packet.d.member !== undefined
-                        ? this.client.util.guildMemberFromRaw(packet.d.member)
+                        ? transformers_1.Guilds.guildMemberFromRaw(packet.d.member)
                         : undefined,
                     guildID: packet.d.guild_id,
                 });
                 break;
-            case "THREAD_MEMBERS_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.ThreadMembersUpdate, {
+            case constants_1.GatewayEvents.ThreadMembersUpdate:
+                this.client.emit("threadMembersUpdate", {
                     id: packet.d.id,
                     guildID: packet.d.guild_id,
                     memberCount: packet.d.member_count,
-                    addedMembers: packet.d.members.map((threadMember) => this.client.util.threadMemberFromRaw(threadMember)),
+                    addedMembers: packet.d.members.map((threadMember) => transformers_1.Channels.threadMemberFromRaw(threadMember)),
                     removedMemberIDs: packet.d.removed_member_ids,
                 });
                 break;
-            case "ENTITLEMENT_CREATE":
-                this.client.emit(constants_1.GatewayEvents.EntitlementCreate, this.client.util.entitlementFromRaw(packet.d));
+            case constants_1.GatewayEvents.EntitlementCreate:
+                this.client.emit("entitlementCreate", transformers_1.Entitlements.entitlementFromRaw(packet.d));
                 break;
-            case "ENTITLEMENT_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.EntitlementUpdate, this.client.util.entitlementFromRaw(packet.d));
+            case constants_1.GatewayEvents.EntitlementUpdate:
+                this.client.emit("entitlementUpdate", transformers_1.Entitlements.entitlementFromRaw(packet.d));
                 break;
-            case "ENTITLEMENT_DELETE":
-                this.client.emit(constants_1.GatewayEvents.EntitlementDelete, this.client.util.entitlementFromRaw(packet.d));
+            case constants_1.GatewayEvents.EntitlementDelete:
+                this.client.emit("entitlementDelete", transformers_1.Entitlements.entitlementFromRaw(packet.d));
                 break;
-            case "GUILD_CREATE":
+            case constants_1.GatewayEvents.GuildCreate:
                 {
                     this.client.guildShardMap[packet.d.id] = this.id;
-                    this.client.guilds.set(packet.d.id, this.client.util.guildFromRaw(packet.d));
-                    this.client.emit(constants_1.GatewayEvents.GuildCreate, this.client.util.guildFromRaw(packet.d));
+                    this.client.guilds.set(packet.d.id, transformers_1.Guilds.guildFromRaw(packet.d));
+                    this.client.emit("guildCreate", transformers_1.Guilds.guildFromRaw(packet.d));
                 }
                 break;
-            case "GUILD_UPDATE":
+            case constants_1.GatewayEvents.GuildUpdate:
                 {
-                    this.client.guilds.set(packet.d.id, this.client.util.guildFromRaw(packet.d));
-                    this.client.emit(constants_1.GatewayEvents.GuildUpdate, this.client.util.guildFromRaw(packet.d));
+                    this.client.guilds.set(packet.d.id, transformers_1.Guilds.guildFromRaw(packet.d));
+                    this.client.emit("guildUpdate", transformers_1.Guilds.guildFromRaw(packet.d));
                 }
                 break;
-            case "GUILD_DELETE":
+            case constants_1.GatewayEvents.GuildDelete:
                 {
                     delete this.client.guildShardMap[packet.d.id];
                     this.client.guilds.delete(packet.d.id);
-                    this.client.emit(constants_1.GatewayEvents.GuildDelete, {
+                    this.client.emit("guildDelete", {
                         id: packet.d.id,
                         unavailable: packet.d.unavailable,
                     });
                 }
                 break;
-            case "GUILD_AUDIT_LOG_ENTRY_CREATE":
-                this.client.emit(constants_1.GatewayEvents.GuildAuditLogEntryCreate, {
-                    ...this.client.util.auditLogEntryFromRaw(packet.d),
+            case constants_1.GatewayEvents.GuildAuditLogEntryCreate:
+                this.client.emit("guildAuditLogEntryCreate", {
+                    ...transformers_1.AuditLogs.auditLogEntryFromRaw(packet.d),
                     guildID: packet.d.guild_id,
                 });
                 break;
-            case "GUILD_BAN_ADD":
-                this.client.emit(constants_1.GatewayEvents.GuildBanAdd, {
+            case constants_1.GatewayEvents.GuildBanAdd:
+                this.client.emit("guildBanAdd", {
                     guildID: packet.d.guild_id,
-                    user: this.client.util.userFromRaw(packet.d.user),
+                    user: transformers_1.Users.userFromRaw(packet.d.user),
                 });
                 break;
-            case "GUILD_BAN_REMOVE":
-                this.client.emit(constants_1.GatewayEvents.GuildBanRemove, {
+            case constants_1.GatewayEvents.GuildBanRemove:
+                this.client.emit("guildBanRemove", {
                     guildID: packet.d.guild_id,
-                    user: this.client.util.userFromRaw(packet.d.user),
+                    user: transformers_1.Users.userFromRaw(packet.d.user),
                 });
                 break;
-            case "GUILD_EMOJIS_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.GuildEmojisUpdate, packet.d.emojis.map((emoji) => this.client.util.emojiFromRaw(emoji)), packet.d.guild_id);
+            case constants_1.GatewayEvents.GuildEmojisUpdate:
+                this.client.emit("guildEmojisUpdate", packet.d.emojis.map((emoji) => transformers_1.Emojis.emojiFromRaw(emoji)), packet.d.guild_id);
                 break;
-            case "GUILD_STICKERS_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.GuildStickersUpdate, packet.d.stickers.map((sticker) => this.client.util.stickerFromRaw(sticker)), packet.d.guild_id);
+            case constants_1.GatewayEvents.GuildStickersUpdate:
+                this.client.emit("guildStickersUpdate", packet.d.stickers.map((sticker) => transformers_1.Stickers.stickerFromRaw(sticker)), packet.d.guild_id);
                 break;
-            case "GUILD_INTEGRATIONS_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.GuildIntegrationsUpdate, packet.d.guild_id);
+            case constants_1.GatewayEvents.GuildIntegrationsUpdate:
+                this.client.emit("guildIntegrationsUpdate", packet.d.guild_id);
                 break;
-            case "GUILD_MEMBER_ADD":
-                this.client.emit(constants_1.GatewayEvents.GuildMemberAdd, {
-                    ...this.client.util.guildMemberFromRaw(packet.d),
+            case constants_1.GatewayEvents.GuildMemberAdd:
+                this.client.emit("guildMemberAdd", {
+                    ...transformers_1.Guilds.guildMemberFromRaw(packet.d),
                     guildID: packet.d.guild_id,
                 });
                 break;
-            case "GUILD_MEMBER_REMOVE":
-                this.client.emit(constants_1.GatewayEvents.GuildMemberRemove, {
+            case constants_1.GatewayEvents.GuildMemberRemove:
+                this.client.emit("guildMemberRemove", {
                     guildID: packet.d.guild_id,
-                    user: this.client.util.userFromRaw(packet.d.user),
+                    user: transformers_1.Users.userFromRaw(packet.d.user),
                 });
                 break;
-            case "GUILD_MEMBER_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.GuildMemberUpdate, {
+            case constants_1.GatewayEvents.GuildMemberUpdate:
+                this.client.emit("guildMemberUpdate", {
                     guildID: packet.d.guild_id,
                     roles: packet.d.roles,
-                    user: this.client.util.userFromRaw(packet.d.user),
+                    user: transformers_1.Users.userFromRaw(packet.d.user),
                     nick: packet.d.nick,
                     avatar: packet.d.avatar,
                     joinedAt: packet.d.joined_at,
@@ -279,204 +283,204 @@ class Shard {
                         : undefined,
                 });
                 break;
-            case "GUILD_MEMBERS_CHUNK":
-                this.client.emit(constants_1.GatewayEvents.GuildMembersChunk, {
+            case constants_1.GatewayEvents.GuildMembersChunk:
+                this.client.emit("guildMembersChunk", {
                     guildID: packet.d.guild_id,
-                    members: packet.d.members.map((guildMember) => this.client.util.guildMemberFromRaw(guildMember)),
+                    members: packet.d.members.map((guildMember) => transformers_1.Guilds.guildMemberFromRaw(guildMember)),
                     chunkIndex: packet.d.chunk_index,
                     chunkCount: packet.d.chunk_count,
                     notFound: packet.d.not_found,
-                    presences: packet.d.presences?.map((presence) => this.client.util.presenceFromRaw(presence)),
+                    presences: packet.d.presences?.map((presence) => transformers_1.Presences.presenceFromRaw(presence)),
                     nonce: packet.d.nonce,
                 });
                 break;
-            case "GUILD_ROLE_CREATE":
-                this.client.emit(constants_1.GatewayEvents.GuildRoleCreate, this.client.util.roleFromRaw(packet.d.role), packet.d.guild_id);
+            case constants_1.GatewayEvents.GuildRoleCreate:
+                this.client.emit("guildRoleCreate", transformers_1.Roles.roleFromRaw(packet.d.role), packet.d.guild_id);
                 break;
-            case "GUILD_ROLE_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.GuildRoleUpdate, this.client.util.roleFromRaw(packet.d.role), packet.d.guild_id);
+            case constants_1.GatewayEvents.GuildRoleUpdate:
+                this.client.emit("guildRoleUpdate", transformers_1.Roles.roleFromRaw(packet.d.role), packet.d.guild_id);
                 break;
-            case "GUILD_ROLE_DELETE":
-                this.client.emit(constants_1.GatewayEvents.GuildRoleDelete, packet.d.role_id, packet.d.guild_id);
+            case constants_1.GatewayEvents.GuildRoleDelete:
+                this.client.emit("guildRoleDelete", packet.d.role_id, packet.d.guild_id);
                 break;
-            case "GUILD_SCHEDULED_EVENT_CREATE":
-                this.client.emit(constants_1.GatewayEvents.GuildScheduledEventCreate, this.client.util.guildScheduledEventFromRaw(packet.d));
+            case constants_1.GatewayEvents.GuildScheduledEventCreate:
+                this.client.emit("guildScheduledEventCreate", transformers_1.GuildScheduledEvents.guildScheduledEventFromRaw(packet.d));
                 break;
-            case "GUILD_SCHEDULED_EVENT_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.GuildScheduledEventUpdate, this.client.util.guildScheduledEventFromRaw(packet.d));
+            case constants_1.GatewayEvents.GuildScheduledEventUpdate:
+                this.client.emit("guildScheduledEventUpdate", transformers_1.GuildScheduledEvents.guildScheduledEventFromRaw(packet.d));
                 break;
-            case "GUILD_SCHEDULED_EVENT_DELETE":
-                this.client.emit(constants_1.GatewayEvents.GuildScheduledEventDelete, this.client.util.guildScheduledEventFromRaw(packet.d));
+            case constants_1.GatewayEvents.GuildScheduledEventDelete:
+                this.client.emit("guildScheduledEventDelete", transformers_1.GuildScheduledEvents.guildScheduledEventFromRaw(packet.d));
                 break;
-            case "GUILD_SCHEDULED_EVENT_USER_ADD":
-                this.client.emit(constants_1.GatewayEvents.GuildScheduledEventUserAdd, packet.d.user_id, packet.d.guild_scheduled_event_id, packet.d.guild_id);
+            case constants_1.GatewayEvents.GuildScheduledEventUserAdd:
+                this.client.emit("guildScheduledEventUserAdd", packet.d.user_id, packet.d.guild_scheduled_event_id, packet.d.guild_id);
                 break;
-            case "GUILD_SCHEDULED_EVENT_USER_REMOVE":
-                this.client.emit(constants_1.GatewayEvents.GuildScheduledEventUserRemove, packet.d.user_id, packet.d.guild_scheduled_event_id, packet.d.guild_id);
+            case constants_1.GatewayEvents.GuildScheduledEventUserRemove:
+                this.client.emit("guildScheduledEventUserRemove", packet.d.user_id, packet.d.guild_scheduled_event_id, packet.d.guild_id);
                 break;
-            case "INTEGRATION_CREATE":
-                this.client.emit(constants_1.GatewayEvents.IntegrationCreate, {
-                    ...this.client.util.integrationFromRaw(packet.d),
+            case constants_1.GatewayEvents.IntegrationCreate:
+                this.client.emit("integrationCreate", {
+                    ...transformers_1.Guilds.integrationFromRaw(packet.d),
                     guildID: packet.d.guild_id,
                 });
                 break;
-            case "INTEGRATION_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.IntegrationUpdate, {
-                    ...this.client.util.integrationFromRaw(packet.d),
+            case constants_1.GatewayEvents.IntegrationUpdate:
+                this.client.emit("integrationUpdate", {
+                    ...transformers_1.Guilds.integrationFromRaw(packet.d),
                     guildID: packet.d.guild_id,
                 });
                 break;
-            case "INTEGRATION_DELETE":
-                this.client.emit(constants_1.GatewayEvents.IntegrationDelete, {
+            case constants_1.GatewayEvents.IntegrationDelete:
+                this.client.emit("integrationDelete", {
                     id: packet.d.id,
                     guildID: packet.d.guild_id,
                     applicationID: packet.d.application_id,
                 });
                 break;
-            case "INTERACTION_CREATE":
-                this.client.emit(constants_1.GatewayEvents.InteractionCreate, this.client.util.interactionFromRaw(packet.d));
+            case constants_1.GatewayEvents.InteractionCreate:
+                this.client.emit("interactionCreate", transformers_1.Interactions.interactionFromRaw(packet.d));
                 break;
-            case "INVITE_CREATE":
-                this.client.emit(constants_1.GatewayEvents.InviteCreate, {
+            case constants_1.GatewayEvents.InviteCreate:
+                this.client.emit("inviteCreate", {
                     channelID: packet.d.channel_id,
                     code: packet.d.code,
                     createdAt: packet.d.created_at,
                     guildID: packet.d.guild_id,
                     inviter: packet.d.inviter !== undefined
-                        ? this.client.util.userFromRaw(packet.d.inviter)
+                        ? transformers_1.Users.userFromRaw(packet.d.inviter)
                         : undefined,
                     maxAge: packet.d.max_age,
                     maxUses: packet.d.max_uses,
                     targetType: packet.d.target_type,
                     targetUser: packet.d.target_user !== undefined
-                        ? this.client.util.userFromRaw(packet.d.target_user)
+                        ? transformers_1.Users.userFromRaw(packet.d.target_user)
                         : undefined,
                     targetApplication: packet.d.target_application !== undefined
-                        ? this.client.util.applicationFromRaw(packet.d.target_application)
+                        ? transformers_1.Applications.applicationFromRaw(packet.d.target_application)
                         : undefined,
                     temporary: packet.d.temporary,
                     uses: packet.d.uses,
                 });
                 break;
-            case "INVITE_DELETE":
-                this.client.emit(constants_1.GatewayEvents.InviteDelete, {
+            case constants_1.GatewayEvents.InviteDelete:
+                this.client.emit("inviteDelete", {
                     channelID: packet.d.channel_id,
                     guildID: packet.d.guild_id,
                     code: packet.d.code,
                 });
                 break;
-            case "MESSAGE_CREATE":
-                this.client.emit(constants_1.GatewayEvents.MessageCreate, {
-                    ...this.client.util.messageFromRaw(packet.d),
+            case constants_1.GatewayEvents.MessageCreate:
+                this.client.emit("messageCreate", {
+                    ...transformers_1.Channels.messageFromRaw(packet.d),
                     guildID: packet.d.guild_id,
                     member: packet.d.member !== undefined
-                        ? this.client.util.guildMemberFromRaw(packet.d.member)
+                        ? transformers_1.Guilds.guildMemberFromRaw(packet.d.member)
                         : undefined,
-                    mentions: packet.d.mentions.map((mention) => this.client.util.userFromRaw(mention)),
+                    mentions: packet.d.mentions.map((mention) => transformers_1.Users.userFromRaw(mention)),
                 });
                 break;
-            case "MESSAGE_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.MessageUpdate, this.client.util.messageFromRaw(packet.d));
+            case constants_1.GatewayEvents.MessageUpdate:
+                this.client.emit("messageUpdate", transformers_1.Channels.messageFromRaw(packet.d));
                 break;
-            case "MESSAGE_DELETE":
-                this.client.emit(constants_1.GatewayEvents.MessageDelete, {
+            case constants_1.GatewayEvents.MessageDelete:
+                this.client.emit("messageDelete", {
                     id: packet.d.id,
                     channelID: packet.d.channel_id,
                     guildID: packet.d.guild_id,
                 });
                 break;
-            case "MESSAGE_DELETE_BULK":
-                this.client.emit(constants_1.GatewayEvents.MessageDeleteBulk, {
+            case constants_1.GatewayEvents.MessageDeleteBulk:
+                this.client.emit("messageDeleteBulk", {
                     ids: packet.d.ids,
                     channelID: packet.d.channel_id,
                     guildID: packet.d.guild_id,
                 });
                 break;
-            case "MESSAGE_REACTION_ADD":
-                this.client.emit(constants_1.GatewayEvents.MessageReactionAdd, {
+            case constants_1.GatewayEvents.MessageReactionAdd:
+                this.client.emit("messageReactionAdd", {
                     userID: packet.d.user_id,
                     channelID: packet.d.user_id,
                     messageID: packet.d.user_id,
                     guildID: packet.d.user_id,
                     member: packet.d.member !== undefined
-                        ? this.client.util.guildMemberFromRaw(packet.d.member)
+                        ? transformers_1.Guilds.guildMemberFromRaw(packet.d.member)
                         : undefined,
-                    emoji: this.client.util.emojiFromRaw(packet.d.emoji),
+                    emoji: transformers_1.Emojis.emojiFromRaw(packet.d.emoji),
                     messageAuthorID: packet.d.message_author_id,
                     burst: packet.d.burst,
                     burstColors: packet.d.burst_colors,
                     type: packet.d.type,
                 });
                 break;
-            case "MESSAGE_REACTION_REMOVE":
-                this.client.emit(constants_1.GatewayEvents.MessageReactionRemove, {
+            case constants_1.GatewayEvents.MessageReactionRemove:
+                this.client.emit("messageReactionRemove", {
                     userID: packet.d.user_id,
                     channelID: packet.d.user_id,
                     messageID: packet.d.user_id,
                     guildID: packet.d.user_id,
-                    emoji: this.client.util.emojiFromRaw(packet.d.emoji),
+                    emoji: transformers_1.Emojis.emojiFromRaw(packet.d.emoji),
                     burst: packet.d.burst,
                     type: packet.d.type,
                 });
                 break;
-            case "MESSAGE_REACTION_REMOVE_ALL":
-                this.client.emit(constants_1.GatewayEvents.MessageReactionRemoveAll, {
+            case constants_1.GatewayEvents.MessageReactionRemoveAll:
+                this.client.emit("messageReactionRemoveAll", {
                     channelID: packet.d.channel_id,
                     messageID: packet.d.message_id,
                     guildID: packet.d.guild_id,
                 });
                 break;
-            case "MESSAGE_REACTION_REMOVE_EMOJI":
-                this.client.emit(constants_1.GatewayEvents.MessageReactionRemoveEmoji, {
+            case constants_1.GatewayEvents.MessageReactionRemoveEmoji:
+                this.client.emit("messageReactionRemoveEmoji", {
                     channelID: packet.d.channel_id,
                     guildID: packet.d.guild_id,
                     messageID: packet.d.message_id,
-                    emoji: this.client.util.emojiFromRaw(packet.d.emoji),
+                    emoji: transformers_1.Emojis.emojiFromRaw(packet.d.emoji),
                 });
                 break;
-            case "PRESENCE_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.PresenceUpdate, this.client.util.presenceFromRaw(packet.d));
+            case constants_1.GatewayEvents.PresenceUpdate:
+                this.client.emit("presenceUpdate", transformers_1.Presences.presenceFromRaw(packet.d));
                 break;
-            case "STAGE_INSTANCE_CREATE":
-                this.client.emit(constants_1.GatewayEvents.StageInstanceCreate, this.client.util.stageInstanceFromRaw(packet.d));
+            case constants_1.GatewayEvents.StageInstanceCreate:
+                this.client.emit("stageInstanceCreate", transformers_1.StageInstances.stageInstanceFromRaw(packet.d));
                 break;
-            case "STAGE_INSTANCE_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.StageInstanceUpdate, this.client.util.stageInstanceFromRaw(packet.d));
+            case constants_1.GatewayEvents.StageInstanceUpdate:
+                this.client.emit("stageInstanceUpdate", transformers_1.StageInstances.stageInstanceFromRaw(packet.d));
                 break;
-            case "STAGE_INSTANCE_DELETE":
-                this.client.emit(constants_1.GatewayEvents.StageInstanceDelete, this.client.util.stageInstanceFromRaw(packet.d));
+            case constants_1.GatewayEvents.StageInstanceDelete:
+                this.client.emit("stageInstanceDelete", transformers_1.StageInstances.stageInstanceFromRaw(packet.d));
                 break;
-            case "TYPING_START":
-                this.client.emit(constants_1.GatewayEvents.TypingStart, {
+            case constants_1.GatewayEvents.TypingStart:
+                this.client.emit("typingStart", {
                     channelID: packet.d.channel_id,
                     guildID: packet.d.guild_id,
                     userID: packet.d.user_id,
                     timestamp: packet.d.timestamp,
                     member: packet.d.member !== undefined
-                        ? this.client.util.guildMemberFromRaw(packet.d.member)
+                        ? transformers_1.Guilds.guildMemberFromRaw(packet.d.member)
                         : undefined,
                 });
                 break;
-            case "USER_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.UserUpdate, this.client.util.userFromRaw(packet.d));
+            case constants_1.GatewayEvents.UserUpdate:
+                this.client.emit("userUpdate", transformers_1.Users.userFromRaw(packet.d));
                 break;
-            case "VOICE_STATE_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.VoiceStateUpdate, this.client.util.voiceStateFromRaw(packet.d));
+            case constants_1.GatewayEvents.VoiceStateUpdate:
+                this.client.emit("voiceStateUpdate", transformers_1.Voice.voiceStateFromRaw(packet.d));
                 break;
-            case "VOICE_SERVER_UPDATE":
+            case constants_1.GatewayEvents.VoiceServerUpdate:
                 {
-                    this.client.emit(constants_1.GatewayEvents.VoiceServerUpdate, {
+                    this.client.emit("voiceServerUpdate", {
                         token: packet.d.token,
                         guildID: packet.d.guild_id,
                         endpoint: packet.d.endpoint,
                     });
                 }
                 break;
-            case "WEBHOOKS_UPDATE":
-                this.client.emit(constants_1.GatewayEvents.WebhooksUpdate, packet.d.channel_id, packet.d.guild_id);
+            case constants_1.GatewayEvents.WebhooksUpdate:
+                this.client.emit("webhooksUpdate", packet.d.channel_id, packet.d.guild_id);
                 break;
-            case "MESSAGE_POLL_VOTE_ADD":
-                this.client.emit(constants_1.GatewayEvents.MessagePollVoteAdd, {
+            case constants_1.GatewayEvents.MessagePollVoteAdd:
+                this.client.emit("messagePollVoteAdd", {
                     userID: packet.d.user_id,
                     channelID: packet.d.channel_id,
                     messageID: packet.d.message_id,
@@ -484,8 +488,8 @@ class Shard {
                     answerID: packet.d.answer_id,
                 });
                 break;
-            case "MESSAGE_POLL_VOTE_REMOVE":
-                this.client.emit(constants_1.GatewayEvents.MessagePollVoteRemove, {
+            case constants_1.GatewayEvents.MessagePollVoteRemove:
+                this.client.emit("messagePollVoteRemove", {
                     userID: packet.d.user_id,
                     channelID: packet.d.channel_id,
                     messageID: packet.d.message_id,
@@ -499,16 +503,26 @@ class Shard {
         this.identify({
             token: this.client.token,
             properties: {
-                os: process.platform,
-                browser: pkg.name,
-                device: pkg.name,
+                os: this.client.properties?.os ?? process.platform,
+                browser: this.client.properties?.browser ?? pkg.name,
+                device: this.client.properties?.device ?? pkg.name,
             },
             compress: this.client.compress,
             largeThreshold: this.client.largeThreshold,
             shard: [this.id, this.client.shardsCount],
             presence: this.client.presence !== undefined
                 ? {
-                    activities: this.client.presence.activities,
+                    since: this.client.presence.status === constants_1.StatusTypes.Idle
+                        ? Date.now()
+                        : null,
+                    activities: this.client.presence.activities?.map((activity) => ({
+                        name: activity.type === constants_1.ActivityType.Custom
+                            ? "Custom Status"
+                            : activity.name,
+                        type: activity.type,
+                        url: activity.url,
+                        state: activity.state,
+                    })),
                     status: this.client.presence.status ?? constants_1.StatusTypes.Online,
                     afk: !!this.client.presence.afk,
                 }
@@ -523,17 +537,20 @@ class Shard {
                 this.onDispatch(packet);
                 break;
             case constants_1.GatewayOPCodes.Reconnect:
-                this.client.emit(constants_1.GatewayEvents.Reconnect);
+                this.client.emit("reconnect");
                 break;
             case constants_1.GatewayOPCodes.InvalidSession:
-                this.client.emit(constants_1.GatewayEvents.InvalidSession);
+                this.client.emit("invalidSession");
                 break;
             case constants_1.GatewayOPCodes.Hello:
                 {
                     this.heartbeatInterval = setInterval(() => this.heartbeat(null), packet.d.heartbeat_interval);
-                    this.client.emit(constants_1.GatewayEvents.Hello);
+                    this.client.emit("hello", packet.d.heartbeat_interval);
                 }
                 break;
+            case constants_1.GatewayOPCodes.HeartbeatACK:
+                this.client.emit("heartbeatACK");
+                break;
         }
     }
     onWebSocketError(err) {
@@ -542,7 +559,7 @@ class Shard {
     onWebSocketClose(code, reason) {
         if (code === 1000)
             return;
-        throw new utils_1.GatewayError(`[${code}] ${reason}`);
+        throw new utils_1.GatewayError(code, reason.toString());
     }
     /** https://discord.com/developers/docs/topics/gateway-events#request-guild-members */
     requestGuildMembers(options) {
@@ -575,7 +592,14 @@ class Shard {
             op: constants_1.GatewayOPCodes.PresenceUpdate,
             d: {
                 since: options.status === constants_1.StatusTypes.Idle ? Date.now() : null,
-                activities: options.activities,
+                activities: options.activities?.map((activity) => ({
+                    name: activity.type === constants_1.ActivityType.Custom
+                        ? "Custom Status"
+                        : activity.name,
+                    type: activity.type,
+                    url: activity.url,
+                    state: activity.state,
+                })),
                 status: options.status ?? constants_1.StatusTypes.Online,
                 afk: !!options.afk,
             },