disgroove 2.2.2-dev.23938d8 → 2.2.2-dev.90b732e

package/dist/lib/Client.js

@@ -9,9 +9,12 @@ const utils_1 = require("./utils");
 const rest_1 = require("./rest");
 const node_events_1 = __importDefault(require("node:events"));
 const gateway_1 = require("./gateway");
-const voice_1 = require("./voice");
+const transformers_1 = require("./transformers");
 class Client extends node_events_1.default {
     token;
+    compress;
+    largeThreshold;
+    presence;
     intents;
     shardsCount;
     auth;
@@ -22,15 +25,18 @@ class Client extends node_events_1.default {
     user;
     guilds;
     application;
-    voiceConnections;
+    ws;
     constructor(token, options) {
         super();
         this.token = token;
+        this.compress = options?.gateway?.compress;
+        this.largeThreshold = options?.gateway?.largeThreshold;
+        this.presence = options?.gateway?.presence;
         this.intents =
-            options?.intents !== undefined
-                ? Array.isArray(options.intents)
-                    ? options.intents.reduce((sum, num) => sum + num, 0)
-                    : options.intents
+            options?.gateway?.intents !== undefined
+                ? Array.isArray(options.gateway.intents)
+                    ? options.gateway.intents.reduce((sum, num) => sum + num, 0)
+                    : options.gateway.intents
                 : constants_1.GatewayIntents.AllNonPrivileged;
         this.shardsCount = options?.shardsCount ?? "auto";
         this.auth = options?.auth ?? "Bot";
@@ -38,8 +44,10 @@ class Client extends node_events_1.default {
         this.rest = new rest_1.RequestManager(token, this.auth);
         this.util = new utils_1.Util();
         this.guildShardMap = {};
+        this.user = null;
         this.guilds = new Map();
-        this.voiceConnections = new voice_1.VoiceConnectionManager();
+        this.application = null;
+        this.ws = options?.ws;
     }
     /** https://discord.com/developers/docs/resources/channel#group-dm-add-recipient */
     addGroupRecipient(channelID, userID, options) {
@@ -61,7 +69,7 @@ class Client extends node_events_1.default {
                 deaf: options.deaf,
             },
         });
-        return response !== null ? this.util.guildMemberFromRaw(response) : null;
+        return response !== null ? transformers_1.Guilds.guildMemberFromRaw(response) : null;
     }
     /** https://discord.com/developers/docs/resources/guild#add-guild-member-role */
     addGuildMemberRole(guildID, userID, roleID, reason) {
@@ -80,14 +88,13 @@ class Client extends node_events_1.default {
                 days: options.days,
                 compute_prune_count: options.computePruneCount,
                 include_roles: options.includeRoles,
-                reason: options.reason,
             },
             reason,
         });
     }
     /** https://discord.com/developers/docs/resources/guild#bulk-guild-ban */
     async bulkGuildBan(guildID, options, reason) {
-        const response = await this.rest.request(rest_1.RESTMethods.Post, rest_1.Endpoints.bulkGuildBan(guildID), {
+        const response = await this.rest.request(rest_1.RESTMethods.Post, rest_1.Endpoints.guildBulkBan(guildID), {
             json: {
                 user_ids: options.userIDs,
                 delete_message_seconds: options.deleteMessageSeconds,
@@ -113,14 +120,14 @@ class Client extends node_events_1.default {
         const response = await this.rest.request(rest_1.RESTMethods.Put, rest_1.Endpoints.applicationCommands(applicationID), {
             json: commands.map((command) => this.util.partialApplicationCommandToRaw(command)),
         });
-        return response.map((c) => this.util.applicationCommandFromRaw(c));
+        return response.map((c) => transformers_1.Applications.applicationCommandFromRaw(c));
     }
     /** https://discord.com/developers/docs/interactions/application-commands#bulk-overwrite-guild-application-commands */
     async bulkEditGuildApplicationCommands(applicationID, guildID, commands) {
         const response = await this.rest.request(rest_1.RESTMethods.Put, rest_1.Endpoints.applicationGuildCommands(applicationID, guildID), {
             json: commands.map((command) => this.util.partialApplicationCommandToRaw(command)),
         });
-        return response.map((c) => this.util.applicationCommandFromRaw(c));
+        return response.map((c) => transformers_1.Applications.applicationCommandFromRaw(c));
     }
     /** https://discord.com/developers/docs/topics/gateway#connections */
     async connect() {
@@ -158,7 +165,7 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.autoModerationRuleFromRaw(response);
+        return transformers_1.AutoModeration.autoModerationRuleFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#create-guild-channel */
     async createChannel(guildID, options, reason) {
@@ -192,7 +199,7 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.channelFromRaw(response);
+        return transformers_1.Channels.channelFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/channel#create-channel-invite */
     async createChannelInvite(channelID, options, reason) {
@@ -208,7 +215,7 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.inviteFromRaw(response);
+        return transformers_1.Invites.inviteFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/webhook#create-webhook */
     async createChannelWebhook(channelID, options, reason) {
@@ -219,7 +226,7 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.webhookFromRaw(response);
+        return transformers_1.Webhooks.webhookFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/user#create-dm */
     async createDM(options) {
@@ -228,14 +235,14 @@ class Client extends node_events_1.default {
                 recipient_id: options.recipientID,
             },
         });
-        return this.util.channelFromRaw(response);
+        return transformers_1.Channels.channelFromRaw(response);
     }
     /** https://discord.com/developers/docs/interactions/application-commands#create-global-application-command */
     async createGlobalApplicationCommand(applicationID, options) {
         const response = await this.rest.request(rest_1.RESTMethods.Post, rest_1.Endpoints.applicationCommands(applicationID), {
             json: this.util.partialApplicationCommandToRaw(options),
         });
-        return this.util.applicationCommandFromRaw(response);
+        return transformers_1.Applications.applicationCommandFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/user#create-group-dm */
     async createGroupDM(options) {
@@ -245,14 +252,13 @@ class Client extends node_events_1.default {
                 nicks: options.nicks,
             },
         });
-        return this.util.channelFromRaw(response);
+        return transformers_1.Channels.channelFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#create-guild */
     async createGuild(options) {
         const response = await this.rest.request(rest_1.RESTMethods.Post, rest_1.Endpoints.guilds(), {
             json: {
                 name: options.name,
-                region: options.region,
                 icon: options.icon,
                 verification_level: options.verificationLevel,
                 default_message_notifications: options.defaultMessageNotifications,
@@ -266,20 +272,26 @@ class Client extends node_events_1.default {
                     permissions: role.permissions,
                     mentionable: role.mentionable,
                 })),
+                channels: options.channels?.map((channel) => ({
+                    name: channel.name,
+                    type: channel.type,
+                    id: channel.id,
+                    parent_id: channel.id,
+                })),
                 afk_channel_id: options.afkChannelID,
                 afk_timeout: options.afkTimeout,
                 system_channel_id: options.systemChannelID,
                 system_channel_flags: options.systemChannelFlags,
             },
         });
-        return this.util.guildFromRaw(response);
+        return transformers_1.Guilds.guildFromRaw(response);
     }
     /** https://discord.com/developers/docs/interactions/application-commands#create-guild-application-command */
     async createGuildApplicationCommand(applicationID, guildID, options) {
         const response = await this.rest.request(rest_1.RESTMethods.Post, rest_1.Endpoints.applicationGuildCommands(applicationID, guildID), {
             json: this.util.partialApplicationCommandToRaw(options),
         });
-        return this.util.applicationCommandFromRaw(response);
+        return transformers_1.Applications.applicationCommandFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#create-guild-ban */
     createGuildBan(guildID, userID, options, reason) {
@@ -301,7 +313,7 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.emojiFromRaw(response);
+        return transformers_1.Emojis.emojiFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild-template#create-guild-from-guild-template */
     async createGuildFromTemplate(code, options) {
@@ -311,7 +323,7 @@ class Client extends node_events_1.default {
                 icon: options.icon,
             },
         });
-        return this.util.guildFromRaw(response);
+        return transformers_1.Guilds.guildFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#create-guild-role */
     async createGuildRole(guildID, options, reason) {
@@ -327,7 +339,7 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.roleFromRaw(response);
+        return transformers_1.Roles.roleFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild-scheduled-event#create-guild-scheduled-event */
     async createGuildScheduledEvent(guildID, options, reason) {
@@ -345,7 +357,7 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.guildScheduledEventFromRaw(response);
+        return transformers_1.GuildScheduledEvents.guildScheduledEventFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/sticker#create-guild-sticker */
     async createGuildSticker(guildID, options, reason) {
@@ -358,7 +370,7 @@ class Client extends node_events_1.default {
             form: formData,
             reason,
         });
-        return this.util.stickerFromRaw(response);
+        return transformers_1.Stickers.stickerFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild-template#create-guild-template */
     async createGuildTemplate(guildID, options) {
@@ -368,7 +380,7 @@ class Client extends node_events_1.default {
                 description: options.description,
             },
         });
-        return this.util.guildTemplateFromRaw(response);
+        return transformers_1.GuildTemplates.guildTemplateFromRaw(response);
     }
     /** https://discord.com/developers/docs/interactions/receiving-and-responding#create-followup-message */
     async createInteractionFollowupMessage(applicationID, interactionToken, options) {
@@ -376,9 +388,7 @@ class Client extends node_events_1.default {
             json: {
                 content: options.content,
                 tts: options.tts,
-                embeds: options.embeds !== null
-                    ? options.embeds?.map((embed) => this.util.embedToRaw(embed))
-                    : null,
+                embeds: options.embeds?.map((embed) => transformers_1.Channels.embedToRaw(embed)),
                 allowed_mentions: options.allowedMentions !== undefined
                     ? options.allowedMentions !== null
                         ? {
@@ -390,11 +400,9 @@ class Client extends node_events_1.default {
                         : null
                     : undefined,
                 components: options.components !== undefined
-                    ? options.components !== null
-                        ? this.util.messageComponentsToRaw(options.components)
-                        : null
+                    ? transformers_1.Channels.componentsToRaw(options.components)
                     : undefined,
-                attachments: options.attachments?.map((attachment) => this.util.attachmentToRaw(attachment)),
+                attachments: options.attachments,
                 flags: options.flags,
                 thread_name: options.threadName,
                 poll: options.poll !== undefined
@@ -412,7 +420,7 @@ class Client extends node_events_1.default {
             },
             files: options.files,
         });
-        return this.util.messageFromRaw(response);
+        return transformers_1.Channels.messageFromRaw(response);
     }
     /** https://discord.com/developers/docs/interactions/receiving-and-responding#create-interaction-response */
     createInteractionResponse(interactionID, interactionToken, options) {
@@ -426,7 +434,7 @@ class Client extends node_events_1.default {
                             data: {
                                 content: options.data?.content,
                                 embeds: options.data?.embeds !== undefined
-                                    ? options.data.embeds.map((embed) => this.util.embedToRaw(embed))
+                                    ? options.data.embeds.map((embed) => transformers_1.Channels.embedToRaw(embed))
                                     : undefined,
                                 allowed_mentions: options.data?.allowedMentions !== undefined
                                     ? {
@@ -438,9 +446,9 @@ class Client extends node_events_1.default {
                                     : undefined,
                                 flags: options.data?.flags,
                                 components: options.data?.components !== undefined
-                                    ? this.util.messageComponentsToRaw(options.data.components)
+                                    ? transformers_1.Channels.componentsToRaw(options.data.components)
                                     : undefined,
-                                attachments: options.data?.attachments?.map((attachment) => this.util.attachmentToRaw(attachment)),
+                                attachments: options.data?.attachments,
                                 poll: options.data?.poll !== undefined
                                     ? {
                                         question: options.data.poll.question,
@@ -496,7 +504,7 @@ class Client extends node_events_1.default {
                             data: {
                                 custom_id: options.data?.customID,
                                 components: options.data?.components !== undefined
-                                    ? this.util.messageComponentsToRaw(options.data.components)
+                                    ? transformers_1.Channels.componentsToRaw(options.data.components)
                                     : undefined,
                                 title: options.data?.title,
                             },
@@ -523,7 +531,7 @@ class Client extends node_events_1.default {
                 content: options.content,
                 nonce: options.nonce,
                 tts: options.tts,
-                embeds: options.embeds?.map((embed) => this.util.embedToRaw(embed)),
+                embeds: options.embeds?.map((embed) => transformers_1.Channels.embedToRaw(embed)),
                 allowed_mentions: options.allowedMentions !== undefined
                     ? {
                         parse: options.allowedMentions.parse,
@@ -534,10 +542,10 @@ class Client extends node_events_1.default {
                     : undefined,
                 message_reference: options.messageReference,
                 components: options.components !== undefined
-                    ? this.util.messageComponentsToRaw(options.components)
+                    ? transformers_1.Channels.componentsToRaw(options.components)
                     : undefined,
                 stickers_ids: options.stickersIDs,
-                attachments: options.attachments?.map((attachment) => this.util.attachmentToRaw(attachment)),
+                attachments: options.attachments,
                 flags: options.flags,
                 enforce_nonce: options.enforceNonce,
                 poll: options.poll !== undefined
@@ -555,7 +563,7 @@ class Client extends node_events_1.default {
             },
             files: options.files,
         });
-        return this.util.messageFromRaw(response);
+        return transformers_1.Channels.messageFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/channel#create-reaction */
     createMessageReaction(channelID, messageID, emoji) {
@@ -573,7 +581,7 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.stageInstanceFromRaw(response);
+        return transformers_1.StageInstances.stageInstanceFromRaw(response);
     }
     /** https://discord.com/developers/docs/monetization/entitlements#create-test-entitlement */
     async createTestEntitlement(applicationID, options) {
@@ -584,7 +592,7 @@ class Client extends node_events_1.default {
                 owner_type: options.ownerType,
             },
         });
-        return this.util.testEntitlementFromRaw(response);
+        return transformers_1.Entitlements.testEntitlementFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/channel#start-thread-in-forum-or-media-channel */
     async createThread(channelID, options, reason) {
@@ -595,7 +603,7 @@ class Client extends node_events_1.default {
                 rate_limit_per_user: options.rateLimitPerUser,
                 message: {
                     content: options.message.content,
-                    embeds: options.message.embeds?.map((embed) => this.util.embedToRaw(embed)),
+                    embeds: options.message.embeds?.map((embed) => transformers_1.Channels.embedToRaw(embed)),
                     allowed_mentions: options.message.allowedMentions !== undefined
                         ? options.message.allowedMentions !== null
                             ? {
@@ -612,7 +620,7 @@ class Client extends node_events_1.default {
             files: options.files,
             reason,
         });
-        return this.util.channelFromRaw(response);
+        return transformers_1.Channels.channelFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/channel#start-thread-from-message */
     async createThreadFromMessage(channelID, messageID, options, reason) {
@@ -624,7 +632,7 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.channelFromRaw(response);
+        return transformers_1.Channels.channelFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/channel#start-thread-without-message */
     async createThreadWithoutMessage(channelID, options, reason) {
@@ -638,12 +646,12 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.channelFromRaw(response);
+        return transformers_1.Channels.channelFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/channel#crosspost-message */
     async crosspostMessage(channelID, messageID) {
         const response = await this.rest.request(rest_1.RESTMethods.Post, rest_1.Endpoints.channelMessage(channelID, messageID));
-        return this.util.messageFromRaw(response);
+        return transformers_1.Channels.messageFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/channel#delete-all-reactions */
     deleteAllMessageReactions(channelID, messageID, emoji) {
@@ -660,7 +668,7 @@ class Client extends node_events_1.default {
         const response = await this.rest.request(rest_1.RESTMethods.Delete, rest_1.Endpoints.channel(channelID), {
             reason,
         });
-        return this.util.channelFromRaw(response);
+        return transformers_1.Channels.channelFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/channel#delete-channel-permission */
     deleteChannelPermission(channelID, overwriteID, reason) {
@@ -711,14 +719,14 @@ class Client extends node_events_1.default {
     /** https://discord.com/developers/docs/resources/guild-template#delete-guild-template */
     async deleteGuildTemplate(guildID, code) {
         const response = await this.rest.request(rest_1.RESTMethods.Delete, rest_1.Endpoints.guildTemplate(guildID, code));
-        return this.util.guildTemplateFromRaw(response);
+        return transformers_1.GuildTemplates.guildTemplateFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/invite#delete-invite */
     async deleteInvite(code, reason) {
         const response = await this.rest.request(rest_1.RESTMethods.Delete, rest_1.Endpoints.invite(code), {
             reason,
         });
-        return this.util.inviteFromRaw(response);
+        return transformers_1.Invites.inviteFromRaw(response);
     }
     /** https://discord.com/developers/docs/interactions/receiving-and-responding#delete-followup-message */
     deleteInteractionFollowupMessage(applicationID, interactionToken, messageID) {
@@ -794,16 +802,16 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.autoModerationRuleFromRaw(response);
+        return transformers_1.AutoModeration.autoModerationRuleFromRaw(response);
     }
     /** https://discord.com/developers/docs/interactions/application-commands#edit-application-command-permissions */
     async editApplicationCommandPermissions(applicationID, guildID, commandID, options) {
         const response = await this.rest.request(rest_1.RESTMethods.Put, rest_1.Endpoints.applicationCommandPermissions(applicationID, guildID, commandID), {
             json: {
-                permissions: options.permissions.map((permission) => this.util.guildApplicationCommandPermissionsToRaw(permission)),
+                permissions: options.permissions.map((permission) => transformers_1.Guilds.guildApplicationCommandPermissionsToRaw(permission)),
             },
         });
-        return this.util.guildApplicationCommandPermissionsFromRaw(response);
+        return transformers_1.Guilds.guildApplicationCommandPermissionsFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/channel#modify-channel */
     async editChannel(channelID, options, reason) {
@@ -835,7 +843,7 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.channelFromRaw(response);
+        return transformers_1.Channels.channelFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/channel#edit-channel-permissions */
     editChannelPermissions(channelID, overwriteID, options, reason) {
@@ -864,7 +872,7 @@ class Client extends node_events_1.default {
                 banner: options.banner,
             },
         });
-        return this.util.userFromRaw(response);
+        return transformers_1.Users.userFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#modify-current-member */
     async editCurrentGuildMember(guildID, options, reason) {
@@ -874,7 +882,7 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.guildMemberFromRaw(response);
+        return transformers_1.Guilds.guildMemberFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#modify-current-user-voice-state */
     editCurrentUserVoiceState(guildID, options) {
@@ -901,14 +909,14 @@ class Client extends node_events_1.default {
                 tags: options.tags,
             },
         });
-        return this.util.applicationFromRaw(response);
+        return transformers_1.Applications.applicationFromRaw(response);
     }
     /** https://discord.com/developers/docs/interactions/application-commands#edit-global-application-command */
     async editGlobalApplicationCommand(applicationID, commandID, options) {
         const response = await this.rest.request(rest_1.RESTMethods.Patch, rest_1.Endpoints.applicationCommand(applicationID, commandID), {
             json: this.util.partialApplicationCommandToRaw(options),
         });
-        return this.util.applicationCommandFromRaw(response);
+        return transformers_1.Applications.applicationCommandFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#modify-guild */
     async editGuild(guildID, options, reason) {
@@ -938,14 +946,14 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.guildFromRaw(response);
+        return transformers_1.Guilds.guildFromRaw(response);
     }
     /** https://discord.com/developers/docs/interactions/application-commands#edit-guild-application-command */
     async editGuildApplicationCommand(applicationID, guildID, commandID, options) {
         const response = await this.rest.request(rest_1.RESTMethods.Patch, rest_1.Endpoints.applicationGuildCommand(applicationID, guildID, commandID), {
             json: this.util.partialApplicationCommandToRaw(options),
         });
-        return this.util.applicationCommandFromRaw(response);
+        return transformers_1.Applications.applicationCommandFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/emoji#modify-guild-emoji */
     async editGuildEmoji(guildID, emojiID, options, reason) {
@@ -956,7 +964,7 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.emojiFromRaw(response);
+        return transformers_1.Emojis.emojiFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#modify-guild-member */
     async editGuildMember(guildID, userID, options, reason) {
@@ -972,7 +980,7 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.guildMemberFromRaw(response);
+        return transformers_1.Guilds.guildMemberFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#modify-guild-mfa-level */
     editGuildMFALevel(guildID, options, reason) {
@@ -995,7 +1003,7 @@ class Client extends node_events_1.default {
                         channel_ids: promptOption.channelIDs,
                         role_ids: promptOption.roleIDs,
                         emoji: promptOption.emoji !== undefined
-                            ? this.util.emojiToRaw(promptOption.emoji)
+                            ? transformers_1.Emojis.emojiToRaw(promptOption.emoji)
                             : undefined,
                         emoji_id: promptOption.emojiID,
                         emoji_name: promptOption.emojiName,
@@ -1026,14 +1034,14 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.roleFromRaw(response);
+        return transformers_1.Roles.roleFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#modify-guild-role-positions */
     async editGuildRolePositions(guildID, options) {
         const response = await this.rest.request(rest_1.RESTMethods.Patch, rest_1.Endpoints.guildRoles(guildID), {
             json: options,
         });
-        return response.map((role) => this.util.roleFromRaw(role));
+        return response.map((role) => transformers_1.Roles.roleFromRaw(role));
     }
     /** https://discord.com/developers/docs/resources/guild-scheduled-event#modify-guild-scheduled-event */
     async editGuildScheduledEvent(guildID, guildScheduledEventID, options, reason) {
@@ -1052,7 +1060,7 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.guildScheduledEventFromRaw(response);
+        return transformers_1.GuildScheduledEvents.guildScheduledEventFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/sticker#modify-guild-sticker */
     async editGuildSticker(guildID, stickerID, options, reason) {
@@ -1064,7 +1072,7 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.stickerFromRaw(response);
+        return transformers_1.Stickers.stickerFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild-template#modify-guild-template */
     async editGuildTemplate(guildID, code, options) {
@@ -1074,7 +1082,7 @@ class Client extends node_events_1.default {
                 description: options.description,
             },
         });
-        return this.util.guildTemplateFromRaw(response);
+        return transformers_1.GuildTemplates.guildTemplateFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#modify-guild-welcome-screen */
     async editGuildWelcomeScreen(guildID, options, reason) {
@@ -1116,7 +1124,7 @@ class Client extends node_events_1.default {
             json: {
                 content: options.content,
                 embeds: options.embeds !== null
-                    ? options.embeds?.map((embed) => this.util.embedToRaw(embed))
+                    ? options.embeds?.map((embed) => transformers_1.Channels.embedToRaw(embed))
                     : null,
                 allowed_mentions: options.allowedMentions !== undefined
                     ? options.allowedMentions !== null
@@ -1130,15 +1138,15 @@ class Client extends node_events_1.default {
                     : undefined,
                 components: options.components !== undefined
                     ? options.components !== null
-                        ? this.util.messageComponentsToRaw(options.components)
+                        ? transformers_1.Channels.componentsToRaw(options.components)
                         : null
                     : undefined,
-                attachments: options.attachments?.map((attachment) => this.util.attachmentToRaw(attachment)),
+                attachments: options.attachments?.map((attachment) => transformers_1.Channels.attachmentToRaw(attachment)),
                 flags: options.flags,
             },
             files: options.files,
         });
-        return this.util.messageFromRaw(response);
+        return transformers_1.Channels.messageFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/stage-instance#modify-stage-instance */
     async editStageInstance(channelID, options, reason) {
@@ -1149,7 +1157,7 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.stageInstanceFromRaw(response);
+        return transformers_1.StageInstances.stageInstanceFromRaw(response);
     }
     /** https://discord.com/developers/docs/interactions/receiving-and-responding#edit-followup-message */
     async editInteractionFollowupMessage(applicationID, interactionToken, messageID, options) {
@@ -1157,7 +1165,7 @@ class Client extends node_events_1.default {
             json: {
                 content: options.content,
                 embeds: options.embeds !== null
-                    ? options.embeds?.map((embed) => this.util.embedToRaw(embed))
+                    ? options.embeds?.map((embed) => transformers_1.Channels.embedToRaw(embed))
                     : null,
                 allowed_mentions: options.allowedMentions !== undefined
                     ? options.allowedMentions !== null
@@ -1171,10 +1179,10 @@ class Client extends node_events_1.default {
                     : undefined,
                 components: options.components !== undefined
                     ? options.components !== null
-                        ? this.util.messageComponentsToRaw(options.components)
+                        ? transformers_1.Channels.componentsToRaw(options.components)
                         : null
                     : undefined,
-                attachments: options.attachments?.map((attachment) => this.util.attachmentToRaw(attachment)),
+                attachments: options.attachments?.map((attachment) => transformers_1.Channels.attachmentToRaw(attachment)),
                 flags: options.flags,
             },
             files: options.files,
@@ -1182,7 +1190,7 @@ class Client extends node_events_1.default {
                 thread_id: options.threadID,
             },
         });
-        return this.util.messageFromRaw(response);
+        return transformers_1.Channels.messageFromRaw(response);
     }
     /** https://discord.com/developers/docs/interactions/receiving-and-responding#edit-original-interaction-response */
     async editInteractionResponse(applicationID, interactionToken, options) {
@@ -1190,7 +1198,7 @@ class Client extends node_events_1.default {
             json: {
                 content: options.content,
                 embeds: options.embeds !== null
-                    ? options.embeds?.map((embed) => this.util.embedToRaw(embed))
+                    ? options.embeds?.map((embed) => transformers_1.Channels.embedToRaw(embed))
                     : null,
                 allowed_mentions: options.allowedMentions !== undefined
                     ? options.allowedMentions !== null
@@ -1204,10 +1212,10 @@ class Client extends node_events_1.default {
                     : undefined,
                 components: options.components !== undefined
                     ? options.components !== null
-                        ? this.util.messageComponentsToRaw(options.components)
+                        ? transformers_1.Channels.componentsToRaw(options.components)
                         : null
                     : undefined,
-                attachments: options.attachments?.map((attachment) => this.util.attachmentToRaw(attachment)),
+                attachments: options.attachments?.map((attachment) => transformers_1.Channels.attachmentToRaw(attachment)),
                 flags: options.flags,
             },
             files: options.files,
@@ -1215,7 +1223,7 @@ class Client extends node_events_1.default {
                 thread_id: options.threadID,
             },
         });
-        return this.util.messageFromRaw(response);
+        return transformers_1.Channels.messageFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#modify-user-voice-state */
     editUserVoiceState(guildID, userID, options) {
@@ -1237,7 +1245,7 @@ class Client extends node_events_1.default {
             },
             reason,
         });
-        return this.util.webhookFromRaw(response);
+        return transformers_1.Webhooks.webhookFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/webhook#edit-webhook-message */
     async editWebhookMessage(webhookID, webhookToken, messageID, options) {
@@ -1245,7 +1253,7 @@ class Client extends node_events_1.default {
             json: {
                 content: options.content,
                 embeds: options.embeds !== null
-                    ? options.embeds?.map((embed) => this.util.embedToRaw(embed))
+                    ? options.embeds?.map((embed) => transformers_1.Channels.embedToRaw(embed))
                     : null,
                 allowed_mentions: options.allowedMentions !== undefined
                     ? options.allowedMentions !== null
@@ -1259,10 +1267,10 @@ class Client extends node_events_1.default {
                     : undefined,
                 components: options.components !== undefined
                     ? options.components !== null
-                        ? this.util.messageComponentsToRaw(options.components)
+                        ? transformers_1.Channels.componentsToRaw(options.components)
                         : null
                     : undefined,
-                attachments: options.attachments?.map((attachment) => this.util.attachmentToRaw(attachment)),
+                attachments: options.attachments?.map((attachment) => transformers_1.Channels.attachmentToRaw(attachment)),
                 flags: options.flags,
             },
             files: options.files,
@@ -1270,7 +1278,7 @@ class Client extends node_events_1.default {
                 thread_id: options.threadID,
             },
         });
-        return this.util.messageFromRaw(response);
+        return transformers_1.Channels.messageFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/webhook#modify-webhook-with-token */
     async editWebhookWithToken(webhookID, webhookToken, options, reason) {
@@ -1282,12 +1290,12 @@ class Client extends node_events_1.default {
             reason,
             authorization: false,
         });
-        return this.util.webhookFromRaw(response);
+        return transformers_1.Webhooks.webhookFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/poll#end-poll */
     async endPoll(channelID, messageID) {
         const response = await this.rest.request(rest_1.RESTMethods.Post, rest_1.Endpoints.pollExpire(channelID, messageID));
-        return this.util.messageFromRaw(response);
+        return transformers_1.Channels.messageFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/webhook#execute-webhook */
     async executeWebhook(webhookID, webhookToken, options) {
@@ -1295,27 +1303,21 @@ class Client extends node_events_1.default {
             json: {
                 content: options.content,
                 username: options.username,
-                avatarURL: options.avatarURL,
+                avatar_url: options.avatarURL,
                 tts: options.tts,
-                embeds: options.embeds !== null
-                    ? options.embeds?.map((embed) => this.util.embedToRaw(embed))
-                    : null,
+                embeds: options.embeds?.map((embed) => transformers_1.Channels.embedToRaw(embed)),
                 allowed_mentions: options.allowedMentions !== undefined
-                    ? options.allowedMentions !== null
-                        ? {
-                            parse: options.allowedMentions.parse,
-                            roles: options.allowedMentions.roles,
-                            users: options.allowedMentions.users,
-                            replied_user: options.allowedMentions.repliedUser,
-                        }
-                        : null
+                    ? {
+                        parse: options.allowedMentions.parse,
+                        roles: options.allowedMentions.roles,
+                        users: options.allowedMentions.users,
+                        replied_user: options.allowedMentions.repliedUser,
+                    }
                     : undefined,
                 components: options.components !== undefined
-                    ? options.components !== null
-                        ? this.util.messageComponentsToRaw(options.components)
-                        : null
+                    ? transformers_1.Channels.componentsToRaw(options.components)
                     : undefined,
-                attachments: options.attachments?.map((attachment) => this.util.attachmentToRaw(attachment)),
+                attachments: options.attachments,
                 flags: options.flags,
                 thread_name: options.threadName,
                 applied_tags: options.appliedTags,
@@ -1338,7 +1340,7 @@ class Client extends node_events_1.default {
                 thread_id: options.threadID,
             },
         });
-        return response !== null ? this.util.messageFromRaw(response) : response;
+        return response !== null ? transformers_1.Channels.messageFromRaw(response) : response;
     }
     /**
      * https://discord.com/developers/docs/resources/webhook#execute-githubcompatible-webhook
@@ -1353,7 +1355,7 @@ class Client extends node_events_1.default {
             },
             json: options,
         });
-        return response !== null ? this.util.messageFromRaw(response) : null;
+        return response !== null ? transformers_1.Channels.messageFromRaw(response) : null;
     }
     /** https://discord.com/developers/docs/resources/channel#follow-announcement-channel */
     async followChannel(channelID, options, reason) {
@@ -1372,8 +1374,8 @@ class Client extends node_events_1.default {
     async getActiveGuildThreads(guildID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildActiveThreads(guildID));
         return {
-            threads: response.threads.map((thread) => this.util.channelFromRaw(thread)),
-            members: response.members.map((threadMember) => this.util.threadMemberFromRaw(threadMember)),
+            threads: response.threads.map((thread) => transformers_1.Channels.channelFromRaw(thread)),
+            members: response.members.map((threadMember) => transformers_1.Channels.threadMemberFromRaw(threadMember)),
         };
     }
     /** https://discord.com/developers/docs/resources/channel#list-public-archived-threads */
@@ -1385,8 +1387,8 @@ class Client extends node_events_1.default {
             },
         });
         return {
-            threads: response.threads.map((thread) => this.util.channelFromRaw(thread)),
-            members: response.members.map((threadMember) => this.util.threadMemberFromRaw(threadMember)),
+            threads: response.threads.map((thread) => transformers_1.Channels.channelFromRaw(thread)),
+            members: response.members.map((threadMember) => transformers_1.Channels.threadMemberFromRaw(threadMember)),
             hasMore: response.has_more,
         };
     }
@@ -1401,22 +1403,22 @@ class Client extends node_events_1.default {
                 limit: options?.limit,
             },
         });
-        return this.util.auditLogFromRaw(response);
+        return transformers_1.AuditLogs.auditLogFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/auto-moderation#get-auto-moderation-rule */
     async getAutoModerationRule(guildID, ruleID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildAutoModerationRule(guildID, ruleID));
-        return this.util.autoModerationRuleFromRaw(response);
+        return transformers_1.AutoModeration.autoModerationRuleFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/auto-moderation#list-auto-moderation-rules-for-guild */
     async getAutoModerationRules(guildID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildAutoModerationRules(guildID));
-        return response.map((autoModerationRule) => this.util.autoModerationRuleFromRaw(autoModerationRule));
+        return response.map((autoModerationRule) => transformers_1.AutoModeration.autoModerationRuleFromRaw(autoModerationRule));
     }
     /** https://discord.com/developers/docs/interactions/application-commands#get-application-command-permissions */
     async getApplicationCommandPermissions(applicationID, guildID, commandID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.applicationCommandPermissions(applicationID, guildID, commandID));
-        return this.util.guildApplicationCommandPermissionsFromRaw(response);
+        return transformers_1.Guilds.guildApplicationCommandPermissionsFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/application-role-connection-metadata#get-application-role-connection-metadata-records */
     async getApplicationRoleConnectionMetadataRecords(applicationID) {
@@ -1433,27 +1435,27 @@ class Client extends node_events_1.default {
     /** https://discord.com/developers/docs/resources/channel#get-channel */
     async getChannel(channelID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.channel(channelID));
-        return this.util.channelFromRaw(response);
+        return transformers_1.Channels.channelFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#get-guild-channels */
     async getChannels(guildID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildChannels(guildID));
-        return response.map((channel) => this.util.channelFromRaw(channel));
+        return response.map((channel) => transformers_1.Channels.channelFromRaw(channel));
     }
     /** https://discord.com/developers/docs/resources/channel#get-channel-invites */
     async getChannelInvites(channelID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.channelInvites(channelID));
-        return response.map((invite) => this.util.inviteFromRaw(invite));
+        return response.map((invite) => transformers_1.Invites.inviteFromRaw(invite));
     }
     /** https://discord.com/developers/docs/resources/webhook#get-channel-webhooks */
     async getChannelWebhooks(channelID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.channelWebhooks(channelID));
-        return response.map((webhook) => this.util.webhookFromRaw(webhook));
+        return response.map((webhook) => transformers_1.Webhooks.webhookFromRaw(webhook));
     }
     /** https://discord.com/developers/docs/resources/application#get-current-application */
     async getCurrentApplication() {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.applicationCurrentUser());
-        return this.util.applicationFromRaw(response);
+        return transformers_1.Applications.applicationFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/user#get-current-user-application-role-connection */
     async getCurrentApplicationRoleConnection(applicationID) {
@@ -1474,7 +1476,7 @@ class Client extends node_events_1.default {
     /** https://discord.com/developers/docs/resources/user#get-current-user-guild-member */
     async getCurrentGuildMember(guildID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildMember(guildID));
-        return this.util.guildMemberFromRaw(response);
+        return transformers_1.Guilds.guildMemberFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/user#get-current-user-connections */
     async getCurrentUserConnections() {
@@ -1484,7 +1486,7 @@ class Client extends node_events_1.default {
             name: connection.name,
             type: connection.type,
             revoked: connection.revoked,
-            integrations: connection.integrations?.map((integration) => this.util.integrationFromRaw(integration)),
+            integrations: connection.integrations?.map((integration) => transformers_1.Guilds.integrationFromRaw(integration)),
             verified: connection.verified,
             friendSync: connection.friend_sync,
             showActivity: connection.show_activity,
@@ -1505,7 +1507,7 @@ class Client extends node_events_1.default {
                 exclude_ended: options?.excludeEnded,
             },
         });
-        return response.map((entitlement) => this.util.entitlementFromRaw(entitlement));
+        return response.map((entitlement) => transformers_1.Entitlements.entitlementFromRaw(entitlement));
     }
     /** https://discord.com/developers/docs/topics/gateway#get-gateway */
     getGateway() {
@@ -1528,7 +1530,7 @@ class Client extends node_events_1.default {
     /** https://discord.com/developers/docs/interactions/application-commands#get-global-application-command */
     async getGlobalApplicationCommand(applicationID, commandID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.applicationCommand(applicationID, commandID));
-        return this.util.applicationCommandFromRaw(response);
+        return transformers_1.Applications.applicationCommandFromRaw(response);
     }
     /** https://discord.com/developers/docs/interactions/application-commands#get-global-application-commands */
     async getGlobalApplicationCommands(applicationID, options) {
@@ -1537,7 +1539,7 @@ class Client extends node_events_1.default {
                 with_localizations: options.withLocalizations,
             },
         });
-        return response.map((applicationCommand) => this.util.applicationCommandFromRaw(applicationCommand));
+        return response.map((applicationCommand) => transformers_1.Applications.applicationCommandFromRaw(applicationCommand));
     }
     /** https://discord.com/developers/docs/resources/guild#get-guild */
     async getGuild(guildID, options) {
@@ -1546,7 +1548,7 @@ class Client extends node_events_1.default {
                 with_counts: options?.withCounts,
             },
         });
-        return this.util.guildFromRaw(response);
+        return transformers_1.Guilds.guildFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/user#get-current-user-guilds */
     async getGuilds(options) {
@@ -1558,12 +1560,12 @@ class Client extends node_events_1.default {
                 with_counts: options?.withCounts,
             },
         });
-        return response.map((guild) => this.util.guildFromRaw(guild));
+        return response.map((guild) => transformers_1.Guilds.guildFromRaw(guild));
     }
     /** https://discord.com/developers/docs/interactions/application-commands#get-guild-application-command */
     async getGuildApplicationCommand(applicationID, guildID, commandID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.applicationGuildCommand(applicationID, guildID, commandID));
-        return this.util.applicationCommandFromRaw(response);
+        return transformers_1.Applications.applicationCommandFromRaw(response);
     }
     /** https://discord.com/developers/docs/interactions/application-commands#get-guild-application-commands */
     async getGuildApplicationCommands(applicationID, guildID, options) {
@@ -1572,19 +1574,19 @@ class Client extends node_events_1.default {
                 with_localizations: options?.withLocalizations,
             },
         });
-        return response.map((applicationCommand) => this.util.applicationCommandFromRaw(applicationCommand));
+        return response.map((applicationCommand) => transformers_1.Applications.applicationCommandFromRaw(applicationCommand));
     }
     /** https://discord.com/developers/docs/interactions/application-commands#get-guild-application-command-permissions */
     async getGuildApplicationCommandPermissions(applicationID, guildID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildApplicationCommandsPermissions(applicationID, guildID));
-        return this.util.guildApplicationCommandPermissionsFromRaw(response);
+        return transformers_1.Guilds.guildApplicationCommandPermissionsFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#get-guild-ban */
     async getGuildBan(guildID, userID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildBan(guildID, userID));
         return {
             reason: response.reason,
-            user: this.util.userFromRaw(response.user),
+            user: transformers_1.Users.userFromRaw(response.user),
         };
     }
     /** https://discord.com/developers/docs/resources/guild#get-guild-bans */
@@ -1598,38 +1600,38 @@ class Client extends node_events_1.default {
         });
         return response.map((ban) => ({
             reason: ban.reason,
-            user: this.util.userFromRaw(ban.user),
+            user: transformers_1.Users.userFromRaw(ban.user),
         }));
     }
     /** https://discord.com/developers/docs/resources/emoji#get-guild-emoji */
     async getGuildEmoji(guildID, emojiID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildEmoji(guildID, emojiID));
-        return this.util.emojiFromRaw(response);
+        return transformers_1.Emojis.emojiFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/emoji#list-guild-emojis */
     async getGuildEmojis(guildID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildEmojis(guildID));
-        return response.map((emoji) => this.util.emojiFromRaw(emoji));
+        return response.map((emoji) => transformers_1.Emojis.emojiFromRaw(emoji));
     }
     /** https://discord.com/developers/docs/resources/guild#get-guild-integrations */
     async getGuildIntegrations(guildID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildIntegrations(guildID));
-        return response.map((integration) => this.util.integrationFromRaw(integration));
+        return response.map((integration) => transformers_1.Guilds.integrationFromRaw(integration));
     }
     /** https://discord.com/developers/docs/resources/guild#get-guild-invites */
     async getGuildInvites(guildID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildInvites(guildID));
-        return response.map((invite) => this.util.inviteFromRaw(invite));
+        return response.map((invite) => transformers_1.Invites.inviteFromRaw(invite));
     }
     /** https://discord.com/developers/docs/resources/guild#get-guild-member */
     async getGuildMember(guildID, userID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildMember(guildID, userID));
-        return this.util.guildMemberFromRaw(response);
+        return transformers_1.Guilds.guildMemberFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#list-guild-members */
     async getGuildMembers(guildID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildMembers(guildID));
-        return response.map((guildMember) => this.util.guildMemberFromRaw(guildMember));
+        return response.map((guildMember) => transformers_1.Guilds.guildMemberFromRaw(guildMember));
     }
     /** https://discord.com/developers/docs/resources/guild#get-guild-onboarding */
     async getGuildOnboarding(guildID) {
@@ -1644,7 +1646,7 @@ class Client extends node_events_1.default {
                     channelIDs: promptOption.channel_ids,
                     roleIDs: promptOption.role_ids,
                     emoji: promptOption.emoji !== undefined
-                        ? this.util.emojiFromRaw(promptOption.emoji)
+                        ? transformers_1.Emojis.emojiFromRaw(promptOption.emoji)
                         : undefined,
                     emojiID: promptOption.emoji_id,
                     emojiName: promptOption.emoji_name,
@@ -1671,12 +1673,12 @@ class Client extends node_events_1.default {
             icon: response.icon,
             splash: response.splash,
             discoverySplash: response.discovery_splash,
-            emojis: response.emojis.map((emoji) => this.util.emojiFromRaw(emoji)),
+            emojis: response.emojis.map((emoji) => transformers_1.Emojis.emojiFromRaw(emoji)),
             features: response.features,
             approximateMemberCount: response.approximate_member_count,
             approximatePresenceCount: response.approximate_presence_count,
             description: response.description,
-            stickers: response.stickers?.map((sticker) => this.util.stickerFromRaw(sticker)),
+            stickers: response.stickers?.map((sticker) => transformers_1.Stickers.stickerFromRaw(sticker)),
         };
     }
     /** https://discord.com/developers/docs/resources/guild#get-guild-prune-count */
@@ -1691,7 +1693,7 @@ class Client extends node_events_1.default {
     /** https://discord.com/developers/docs/resources/guild#get-guild-roles */
     async getGuildRoles(guildID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildRoles(guildID));
-        return response.map((role) => this.util.roleFromRaw(role));
+        return response.map((role) => transformers_1.Roles.roleFromRaw(role));
     }
     /** https://discord.com/developers/docs/resources/guild-scheduled-event#list-scheduled-events-for-guild */
     async getGuildScheduledEvents(guildID, options) {
@@ -1700,7 +1702,7 @@ class Client extends node_events_1.default {
                 with_user_count: options?.withUserCount,
             },
         });
-        return response.map((guildScheduledEvent) => this.util.guildScheduledEventFromRaw(guildScheduledEvent));
+        return response.map((guildScheduledEvent) => transformers_1.GuildScheduledEvents.guildScheduledEventFromRaw(guildScheduledEvent));
     }
     /** https://discord.com/developers/docs/resources/guild-scheduled-event#get-guild-scheduled-event-users */
     async getGuildScheduledEventUsers(guildID, guildScheduledEventID, options) {
@@ -1714,31 +1716,31 @@ class Client extends node_events_1.default {
         });
         return response.map((guildScheduledEventUser) => ({
             guildScheduledEventID: guildScheduledEventUser.guild_scheduled_event_id,
-            user: this.util.userFromRaw(guildScheduledEventUser.user),
+            user: transformers_1.Users.userFromRaw(guildScheduledEventUser.user),
             member: guildScheduledEventUser.member !== undefined
-                ? this.util.guildMemberFromRaw(guildScheduledEventUser.member)
+                ? transformers_1.Guilds.guildMemberFromRaw(guildScheduledEventUser.member)
                 : undefined,
         }));
     }
     /** https://discord.com/developers/docs/resources/sticker#get-guild-sticker */
     async getGuildSticker(guildID, stickerID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildSticker(guildID, stickerID));
-        return this.util.stickerFromRaw(response);
+        return transformers_1.Stickers.stickerFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/sticker#list-guild-stickers */
     async getGuildStickers(guildID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildStickers(guildID));
-        return response.map((sticker) => this.util.stickerFromRaw(sticker));
+        return response.map((sticker) => transformers_1.Stickers.stickerFromRaw(sticker));
     }
     /** https://discord.com/developers/docs/resources/guild-template#get-guild-template */
     async getGuildTemplate(guildID, code) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildTemplate(guildID, code));
-        return this.util.guildTemplateFromRaw(response);
+        return transformers_1.GuildTemplates.guildTemplateFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild-template#get-guild-templates */
     async getGuildTemplates(guildID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildTemplates(guildID));
-        return response.map((guildTemplate) => this.util.guildTemplateFromRaw(guildTemplate));
+        return response.map((guildTemplate) => transformers_1.GuildTemplates.guildTemplateFromRaw(guildTemplate));
     }
     /** https://discord.com/developers/docs/resources/guild#get-guild-vanity-url */
     getGuildVanityURL(guildID) {
@@ -1775,8 +1777,8 @@ class Client extends node_events_1.default {
             id: response.id,
             name: response.name,
             instantInvite: response.instant_invite,
-            channels: response.channels.map((channel) => this.util.channelFromRaw(channel)),
-            members: response.members.map((member) => this.util.userFromRaw(member)),
+            channels: response.channels.map((channel) => transformers_1.Channels.channelFromRaw(channel)),
+            members: response.members.map((member) => transformers_1.Users.userFromRaw(member)),
             presenceCount: response.presence_count,
         };
     }
@@ -1803,7 +1805,7 @@ class Client extends node_events_1.default {
                 thread_id: options?.threadID,
             },
         });
-        return this.util.messageFromRaw(response);
+        return transformers_1.Channels.messageFromRaw(response);
     }
     /** https://discord.com/developers/docs/interactions/receiving-and-responding#get-original-interaction-response */
     async getInteractionResponse(applicationID, interactionToken, options) {
@@ -1812,7 +1814,7 @@ class Client extends node_events_1.default {
                 thread_id: options?.threadID,
             },
         });
-        return this.util.messageFromRaw(response);
+        return transformers_1.Channels.messageFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/invite#get-invite */
     async getInvite(code, options) {
@@ -1823,7 +1825,7 @@ class Client extends node_events_1.default {
                 guild_scheduled_event_id: options?.guildScheduledEventID,
             },
         });
-        return this.util.inviteFromRaw(response);
+        return transformers_1.Invites.inviteFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/channel#list-joined-private-archived-threads */
     async getJoinedPrivateArchivedThreads(channelID, options) {
@@ -1834,15 +1836,15 @@ class Client extends node_events_1.default {
             },
         });
         return {
-            threads: response.threads.map((thread) => this.util.channelFromRaw(thread)),
-            members: response.members.map((threadMember) => this.util.threadMemberFromRaw(threadMember)),
+            threads: response.threads.map((thread) => transformers_1.Channels.channelFromRaw(thread)),
+            members: response.members.map((threadMember) => transformers_1.Channels.threadMemberFromRaw(threadMember)),
             hasMore: response.has_more,
         };
     }
     /** https://discord.com/developers/docs/resources/channel#get-channel-message */
     async getMessage(channelID, messageID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.channelMessage(channelID, messageID));
-        return this.util.messageFromRaw(response);
+        return transformers_1.Channels.messageFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/channel#get-reactions */
     async getMessageReactions(channelID, messageID, emoji, options) {
@@ -1853,7 +1855,7 @@ class Client extends node_events_1.default {
                 limit: options?.limit,
             },
         });
-        return response.map((user) => this.util.userFromRaw(user));
+        return response.map((user) => transformers_1.Users.userFromRaw(user));
     }
     /** https://discord.com/developers/docs/resources/channel#get-channel-messages */
     async getMessages(channelID, options) {
@@ -1865,29 +1867,29 @@ class Client extends node_events_1.default {
                 limit: options.limit,
             },
         });
-        return response.map((message) => this.util.messageFromRaw(message));
+        return response.map((message) => transformers_1.Channels.messageFromRaw(message));
     }
     /** https://discord.com/developers/docs/topics/oauth2#get-current-bot-application-information */
     async getOAuth2Application() {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.oauth2CurrentApplication());
-        return this.util.applicationFromRaw(response);
+        return transformers_1.Applications.applicationFromRaw(response);
     }
     /** https://discord.com/developers/docs/topics/oauth2#get-current-authorization-information */
     async getOAuth2Authorization() {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.oauth2Authorization());
         return {
-            application: this.util.applicationFromRaw(response.application),
+            application: transformers_1.Applications.applicationFromRaw(response.application),
             scopes: response.scopes,
             expires: response.expires,
             user: response.user !== undefined
-                ? this.util.userFromRaw(response.user)
+                ? transformers_1.Users.userFromRaw(response.user)
                 : undefined,
         };
     }
     /** https://discord.com/developers/docs/resources/channel#get-pinned-messages */
     async getPinnedMessages(channelID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.channelPins(channelID));
-        return response.map((message) => this.util.messageFromRaw(message));
+        return response.map((message) => transformers_1.Channels.messageFromRaw(message));
     }
     /** https://discord.com/developers/docs/resources/poll#get-answer-voters */
     async getPollAnswerVoters(channelID, messageID, answerID, options) {
@@ -1898,18 +1900,18 @@ class Client extends node_events_1.default {
             },
         });
         return {
-            users: response.users.map((user) => this.util.userFromRaw(user)),
+            users: response.users.map((user) => transformers_1.Users.userFromRaw(user)),
         };
     }
     /** https://discord.com/developers/docs/monetization/skus#list-skus */
     async getSKUs(applicationID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.applicationSKUs(applicationID));
-        return response.map((sku) => this.util.skuFromRaw(sku));
+        return response.map((sku) => transformers_1.SKUs.skuFromRaw(sku));
     }
     /** https://discord.com/developers/docs/resources/stage-instance#get-stage-instance */
     async getStageInstance(channelID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.stageInstance(channelID));
-        return this.util.stageInstanceFromRaw(response);
+        return transformers_1.StageInstances.stageInstanceFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/sticker#list-sticker-packs */
     async getStickerPacks() {
@@ -1917,7 +1919,7 @@ class Client extends node_events_1.default {
         return {
             stickerPacks: response.sticker_packs.map((stickerPack) => ({
                 id: stickerPack.id,
-                stickers: stickerPack.stickers.map((sticker) => this.util.stickerFromRaw(sticker)),
+                stickers: stickerPack.stickers.map((sticker) => transformers_1.Stickers.stickerFromRaw(sticker)),
                 name: stickerPack.name,
                 skuID: stickerPack.sku_id,
                 coverStickerID: stickerPack.cover_sticker_id,
@@ -1939,7 +1941,7 @@ class Client extends node_events_1.default {
             joinTimestamp: response.join_timestamp,
             flags: response.flags,
             member: response.member !== undefined
-                ? this.util.guildMemberFromRaw(response.member)
+                ? transformers_1.Guilds.guildMemberFromRaw(response.member)
                 : undefined,
         };
     }
@@ -1952,12 +1954,12 @@ class Client extends node_events_1.default {
                 limit: options?.limit,
             },
         });
-        return response.map((threadMember) => this.util.threadMemberFromRaw(threadMember));
+        return response.map((threadMember) => transformers_1.Channels.threadMemberFromRaw(threadMember));
     }
     /** https://discord.com/developers/docs/resources/user#get-user */
     async getUser(userID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.user(userID));
-        return this.util.userFromRaw(response);
+        return transformers_1.Users.userFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/voice#list-voice-regions */
     async getVoiceRegions() {
@@ -1977,12 +1979,12 @@ class Client extends node_events_1.default {
                 thread_id: options?.threadID,
             },
         });
-        return this.util.messageFromRaw(response);
+        return transformers_1.Channels.messageFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/webhook#get-guild-webhooks */
     async getWebhooks(guildID) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.guildWebhooks(guildID));
-        return response.map((webhook) => this.util.webhookFromRaw(webhook));
+        return response.map((webhook) => transformers_1.Webhooks.webhookFromRaw(webhook));
     }
     /** https://discord.com/developers/docs/resources/channel#join-thread */
     joinThread(channelID) {
@@ -1990,9 +1992,9 @@ class Client extends node_events_1.default {
     }
     /** https://discord.com/developers/docs/topics/gateway-events#update-voice-state */
     joinVoiceChannel(guildID, channelID, options) {
-        this.shards.get(this.guildShardMap[guildID])?.updateVoiceState({
-            guildID: guildID,
-            channelID: channelID,
+        this.shards.get(this.guildShardMap[guildID]).updateVoiceState({
+            guildID,
+            channelID,
             selfMute: !!options?.selfMute,
             selfDeaf: !!options?.selfDeaf,
         });
@@ -2007,9 +2009,8 @@ class Client extends node_events_1.default {
     }
     /** https://discord.com/developers/docs/topics/gateway-events#update-voice-state */
     leaveVoiceChannel(guildID) {
-        this.voiceConnections.disconnect(guildID);
-        this.shards.get(this.guildShardMap[guildID])?.updateVoiceState({
-            guildID: guildID,
+        this.shards.get(this.guildShardMap[guildID]).updateVoiceState({
+            guildID,
             channelID: null,
             selfMute: false,
             selfDeaf: false,
@@ -2055,7 +2056,7 @@ class Client extends node_events_1.default {
                 limit: options.limit,
             },
         });
-        return response.map((guildMember) => this.util.guildMemberFromRaw(guildMember));
+        return response.map((guildMember) => transformers_1.Guilds.guildMemberFromRaw(guildMember));
     }
     /** https://discord.com/developers/docs/topics/gateway-events#update-presence */
     setPresence(options) {
@@ -2064,7 +2065,7 @@ class Client extends node_events_1.default {
     /** https://discord.com/developers/docs/resources/guild-template#sync-guild-template */
     async syncGuildTemplate(guildID, code) {
         const response = await this.rest.request(rest_1.RESTMethods.Put, rest_1.Endpoints.guildTemplate(guildID, code));
-        return this.util.guildTemplateFromRaw(response);
+        return transformers_1.GuildTemplates.guildTemplateFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/channel#trigger-typing-indicator */
     triggerTypingIndicator(channelID) {
@@ -2083,8 +2084,8 @@ class Client extends node_events_1.default {
         }));
     }
     /** https://discord.com/developers/docs/resources/user#update-current-user-application-role-connection */
-    async updateCurrentApplicationRoleConnection(options) {
-        const response = await this.rest.request(rest_1.RESTMethods.Put, rest_1.Endpoints.userApplicationRoleConnection(this.application.id), {
+    async updateCurrentApplicationRoleConnection(applicationID, options) {
+        const response = await this.rest.request(rest_1.RESTMethods.Put, rest_1.Endpoints.userApplicationRoleConnection(applicationID), {
             json: {
                 platform_name: options.platformName,
                 platform_username: options.platformUsername,