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

package/dist/lib/Client.js

@@ -5,12 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Client = void 0;
 const constants_1 = require("./constants");
-const utils_1 = require("./utils");
 const rest_1 = require("./rest");
 const node_events_1 = __importDefault(require("node:events"));
 const gateway_1 = require("./gateway");
+const transformers_1 = require("./transformers");
 class Client extends node_events_1.default {
     token;
+    properties;
     compress;
     largeThreshold;
     presence;
@@ -19,7 +20,6 @@ class Client extends node_events_1.default {
     auth;
     shards;
     rest;
-    util;
     guildShardMap;
     user;
     guilds;
@@ -28,24 +28,20 @@ class Client extends node_events_1.default {
     constructor(token, options) {
         super();
         this.token = token;
+        this.properties = options?.gateway?.properties;
         this.compress = options?.gateway?.compress;
         this.largeThreshold = options?.gateway?.largeThreshold;
-        this.presence = {
-            activities: options?.gateway?.presence?.activities,
-            status: options?.gateway?.presence?.status ?? constants_1.StatusTypes.Online,
-            afk: !!options?.gateway?.presence?.afk,
-        };
+        this.presence = options?.gateway?.presence;
         this.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;
+                : 0;
         this.shardsCount = options?.shardsCount ?? "auto";
         this.auth = options?.auth ?? "Bot";
         this.shards = new gateway_1.ShardManager();
         this.rest = new rest_1.RequestManager(token, this.auth);
-        this.util = new utils_1.Util();
         this.guildShardMap = {};
         this.user = null;
         this.guilds = new Map();
@@ -72,7 +68,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) {
@@ -97,7 +93,7 @@ class Client extends node_events_1.default {
     }
     /** 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,
@@ -121,16 +117,38 @@ class Client extends node_events_1.default {
     /** https://discord.com/developers/docs/interactions/application-commands#bulk-overwrite-global-application-commands */
     async bulkEditGlobalApplicationCommands(applicationID, commands) {
         const response = await this.rest.request(rest_1.RESTMethods.Put, rest_1.Endpoints.applicationCommands(applicationID), {
-            json: commands.map((command) => this.util.partialApplicationCommandToRaw(command)),
+            json: commands.map((command) => ({
+                id: command.id,
+                name: command.name,
+                name_localizations: command.nameLocalizations,
+                description: command.description,
+                description_localizations: command.descriptionLocalizations,
+                options: command.options?.map((option) => transformers_1.ApplicationCommands.optionToRaw(option)),
+                default_member_permissions: command.defaultMemberPermissions,
+                integration_types: command.integrationTypes,
+                contexts: command.contexts,
+                type: command.type,
+                nsfw: command.nsfw,
+            })),
         });
-        return response.map((c) => this.util.applicationCommandFromRaw(c));
+        return response.map((c) => transformers_1.ApplicationCommands.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)),
+            json: commands.map((command) => ({
+                id: command.id,
+                name: command.name,
+                name_localizations: command.nameLocalizations,
+                description: command.description,
+                description_localizations: command.descriptionLocalizations,
+                options: command.options?.map((option) => transformers_1.ApplicationCommands.optionToRaw(option)),
+                default_member_permissions: command.defaultMemberPermissions,
+                type: command.type,
+                nsfw: command.nsfw,
+            })),
         });
-        return response.map((c) => this.util.applicationCommandFromRaw(c));
+        return response.map((c) => transformers_1.ApplicationCommands.applicationCommandFromRaw(c));
     }
     /** https://discord.com/developers/docs/topics/gateway#connections */
     async connect() {
@@ -153,22 +171,17 @@ class Client extends node_events_1.default {
                 name: options.name,
                 event_type: options.eventType,
                 trigger_type: options.triggerType,
-                trigger_metadata: options.triggerMetadata,
-                actions: options.actions.map((action) => ({
-                    type: action.type,
-                    metadata: {
-                        channel_id: action.metadata.channelID,
-                        duration_seconds: action.metadata.durationSeconds,
-                        custom_message: action.metadata.customMessage,
-                    },
-                })),
+                trigger_metadata: options.triggerMetadata !== undefined
+                    ? transformers_1.AutoModeration.triggerMetadataToRaw(options.triggerMetadata)
+                    : undefined,
+                actions: options.actions.map((action) => transformers_1.AutoModeration.actionToRaw(action)),
                 enabled: options.enabled,
                 exempt_roles: options.exemptRoles,
                 exempt_channels: options.exemptChannels,
             },
             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) {
@@ -202,7 +215,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) {
@@ -218,7 +231,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) {
@@ -229,7 +242,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) {
@@ -238,31 +251,41 @@ 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),
+            json: {
+                name: options.name,
+                name_localizations: options.nameLocalizations,
+                description: options.description,
+                description_localizations: options.descriptionLocalizations,
+                options: options.options?.map((option) => transformers_1.ApplicationCommands.optionToRaw(option)),
+                default_member_permissions: options.defaultMemberPermissions,
+                integration_types: options.integrationTypes,
+                contexts: options.contexts,
+                type: options.type,
+                nsfw: options.nsfw,
+            },
         });
-        return this.util.applicationCommandFromRaw(response);
+        return transformers_1.ApplicationCommands.applicationCommandFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/user#create-group-dm */
-    async createGroupDM(options) {
+    async createGroup(options) {
         const response = await this.rest.request(rest_1.RESTMethods.Post, rest_1.Endpoints.userChannels(), {
             json: {
                 access_tokens: options.accessTokens,
                 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,
@@ -276,20 +299,35 @@ 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),
+            json: {
+                name: options.name,
+                name_localizations: options.nameLocalizations,
+                description: options.description,
+                description_localizations: options.descriptionLocalizations,
+                options: options.options?.map((option) => transformers_1.ApplicationCommands.optionToRaw(option)),
+                default_member_permissions: options.defaultMemberPermissions,
+                type: options.type,
+                nsfw: options.nsfw,
+            },
         });
-        return this.util.applicationCommandFromRaw(response);
+        return transformers_1.ApplicationCommands.applicationCommandFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#create-guild-ban */
     createGuildBan(guildID, userID, options, reason) {
@@ -311,7 +349,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) {
@@ -321,7 +359,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) {
@@ -337,7 +375,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) {
@@ -355,7 +393,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) {
@@ -368,7 +406,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) {
@@ -378,7 +416,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) {
@@ -386,9 +424,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
                         ? {
@@ -400,11 +436,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
@@ -422,7 +456,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) {
@@ -436,7 +470,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
                                     ? {
@@ -448,9 +482,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,
@@ -506,7 +540,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,
                             },
@@ -533,7 +567,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,
@@ -542,12 +576,19 @@ class Client extends node_events_1.default {
                         replied_user: options.allowedMentions.repliedUser,
                     }
                     : undefined,
-                message_reference: options.messageReference,
+                message_reference: options.messageReference !== undefined
+                    ? {
+                        message_id: options.messageReference.messageID,
+                        channel_id: options.messageReference.channelID,
+                        guild_id: options.messageReference.guildID,
+                        fail_if_not_exists: options.messageReference.failIfNotExists,
+                    }
+                    : undefined,
                 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
@@ -565,7 +606,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) {
@@ -583,7 +624,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) {
@@ -594,7 +635,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) {
@@ -605,24 +646,25 @@ 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
-                            ? {
-                                parse: options.message.allowedMentions.parse,
-                                roles: options.message.allowedMentions.roles,
-                                users: options.message.allowedMentions.users,
-                                replied_user: options.message.allowedMentions.repliedUser,
-                            }
-                            : null
+                        ? {
+                            parse: options.message.allowedMentions.parse,
+                            roles: options.message.allowedMentions.roles,
+                            users: options.message.allowedMentions.users,
+                            replied_user: options.message.allowedMentions.repliedUser,
+                        }
                         : undefined,
+                    sticker_ids: options.message.stickerIDs,
+                    attachments: options.message.attachments,
+                    flags: options.message.flags,
                 },
                 applied_tags: options.appliedTags,
             },
-            files: options.files,
+            files: options.message.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) {
@@ -634,7 +676,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) {
@@ -648,12 +690,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) {
@@ -670,7 +712,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) {
@@ -721,14 +763,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) {
@@ -789,43 +831,44 @@ class Client extends node_events_1.default {
                 name: options.name,
                 event_type: options.eventType,
                 trigger_type: options.triggerType,
-                trigger_metadata: options.triggerMetadata,
-                actions: options.actions?.map((action) => ({
-                    type: action.type,
-                    metadata: {
-                        channel_id: action.metadata.channelID,
-                        duration_seconds: action.metadata.durationSeconds,
-                        custom_message: action.metadata.customMessage,
-                    },
-                })),
+                trigger_metadata: options.triggerMetadata !== undefined
+                    ? transformers_1.AutoModeration.triggerMetadataToRaw(options.triggerMetadata)
+                    : undefined,
+                actions: options.actions?.map((action) => transformers_1.AutoModeration.actionToRaw(action)),
                 enabled: options.enabled,
                 exempt_roles: options.exemptRoles,
                 exempt_channels: options.exemptChannels,
             },
             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) => ({
+                    id: permission.type,
+                    type: permission.type,
+                    permission: permission.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) {
         const response = await this.rest.request(rest_1.RESTMethods.Patch, rest_1.Endpoints.channel(channelID), {
             json: {
                 name: options.name,
+                icon: options.icon,
                 type: options.type,
                 position: options.position,
                 topic: options.topic,
                 nsfw: options.nsfw,
                 rate_limit_per_user: options.rateLimitPerUser,
                 bitrate: options.bitrate,
+                user_limit: options.userLimit,
                 permission_overwrites: options.permissionOverwrites,
                 parent_id: options.parentID,
                 rtc_region: options.rtcRegion,
@@ -833,7 +876,14 @@ class Client extends node_events_1.default {
                 default_auto_archive_duration: options.defaultAutoArchiveDuration,
                 flags: options.flags,
                 available_tags: options.availableTags,
-                default_reaction_emoji: options.defaultReactionEmoji,
+                default_reaction_emoji: options.defaultReactionEmoji !== undefined
+                    ? options.defaultReactionEmoji !== null
+                        ? {
+                            emoji_id: options.defaultReactionEmoji.emojiID,
+                            emoji_name: options.defaultReactionEmoji.emojiName,
+                        }
+                        : null
+                    : undefined,
                 default_thread_rate_limit_per_user: options.defaultThreadRateLimitPerUser,
                 default_sort_order: options.defaultSortOrder,
                 default_forum_layout: options.defaultForumLayout,
@@ -845,7 +895,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) {
@@ -874,7 +924,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) {
@@ -884,7 +934,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) {
@@ -898,12 +948,22 @@ class Client extends node_events_1.default {
     }
     /** https://discord.com/developers/docs/resources/application#edit-current-application */
     async editCurrentApplication(options) {
-        const response = await this.rest.request(rest_1.RESTMethods.Patch, rest_1.Endpoints.applicationCurrentUser(), {
+        const response = await this.rest.request(rest_1.RESTMethods.Patch, rest_1.Endpoints.applicationUser(), {
             json: {
                 custom_install_url: options.customInstallURL,
                 description: options.description,
                 role_connections_verification_url: options.roleConnectionsVerificationURL,
                 install_params: options.installParams,
+                integration_types_config: options.integrationTypesConfig !== undefined
+                    ? {
+                        "0": {
+                            oauth2_install_params: options.integrationTypesConfig?.[0].oauth2InstallParams,
+                        },
+                        "1": {
+                            oauth2_install_params: options.integrationTypesConfig?.[1].oauth2InstallParams,
+                        },
+                    }
+                    : undefined,
                 flags: options.flags,
                 icon: options.icon,
                 cover_image: options.coverImage,
@@ -911,21 +971,30 @@ 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),
+            json: {
+                name: options.name,
+                name_localizations: options.nameLocalizations,
+                description: options.description,
+                description_localizations: options.descriptionLocalizations,
+                options: options.options?.map((option) => transformers_1.ApplicationCommands.optionToRaw(option)),
+                default_member_permissions: options.defaultMemberPermissions,
+                integration_types: options.integrationTypes,
+                contexts: options.contexts,
+                nsfw: options.nsfw,
+            },
         });
-        return this.util.applicationCommandFromRaw(response);
+        return transformers_1.ApplicationCommands.applicationCommandFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/guild#modify-guild */
     async editGuild(guildID, options, reason) {
         const response = await this.rest.request(rest_1.RESTMethods.Patch, rest_1.Endpoints.guild(guildID), {
             json: {
                 name: options.name,
-                region: options.region,
                 verification_level: options.verificationLevel,
                 default_message_notifications: options.defaultMessageNotifications,
                 explicit_content_filter: options.explicitContentFilter,
@@ -948,14 +1017,22 @@ 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),
+            json: {
+                name: options.name,
+                name_localizations: options.nameLocalizations,
+                description: options.description,
+                description_localizations: options.descriptionLocalizations,
+                options: options.options?.map((option) => transformers_1.ApplicationCommands.optionToRaw(option)),
+                default_member_permissions: options.defaultMemberPermissions,
+                nsfw: options.nsfw,
+            },
         });
-        return this.util.applicationCommandFromRaw(response);
+        return transformers_1.ApplicationCommands.applicationCommandFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/emoji#modify-guild-emoji */
     async editGuildEmoji(guildID, emojiID, options, reason) {
@@ -966,7 +1043,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) {
@@ -982,7 +1059,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) {
@@ -1005,7 +1082,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,
@@ -1036,14 +1113,15 @@ 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) {
+    async editGuildRolePositions(guildID, options, reason) {
         const response = await this.rest.request(rest_1.RESTMethods.Patch, rest_1.Endpoints.guildRoles(guildID), {
             json: options,
+            reason,
         });
-        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) {
@@ -1062,7 +1140,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) {
@@ -1074,7 +1152,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) {
@@ -1084,14 +1162,19 @@ 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) {
         const response = await this.rest.request(rest_1.RESTMethods.Patch, rest_1.Endpoints.guildWelcomeScreen(guildID), {
             json: {
                 enabled: options.enabled,
-                welcome_channels: options.welcomeChannels,
+                welcome_channels: options.welcomeChannels?.map((welcomeChannel) => ({
+                    channel_id: welcomeChannel.channelID,
+                    description: welcomeChannel.description,
+                    emoji_id: welcomeChannel.emojiID,
+                    emoji_name: welcomeChannel.emojiName,
+                })),
                 description: options.description,
             },
             reason,
@@ -1126,7 +1209,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
@@ -1140,15 +1223,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) {
@@ -1159,7 +1242,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) {
@@ -1167,7 +1250,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
@@ -1181,18 +1264,32 @@ 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)),
-                flags: options.flags,
+                attachments: options.attachments?.map((attachment) => ({
+                    id: attachment.id,
+                    filename: attachment.filename,
+                    title: attachment.title,
+                    description: attachment.description,
+                    content_type: attachment.contentType,
+                    size: attachment.size,
+                    url: attachment.url,
+                    proxy_url: attachment.proxyURL,
+                    height: attachment.height,
+                    width: attachment.width,
+                    ephemeral: attachment.ephemeral,
+                    duration_secs: attachment.durationSecs,
+                    waveform: attachment.waveform,
+                    flags: attachment.flags,
+                })),
             },
             files: options.files,
             query: {
                 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) {
@@ -1200,7 +1297,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
@@ -1214,18 +1311,32 @@ 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)),
-                flags: options.flags,
+                attachments: options.attachments?.map((attachment) => ({
+                    id: attachment.id,
+                    filename: attachment.filename,
+                    title: attachment.title,
+                    description: attachment.description,
+                    content_type: attachment.contentType,
+                    size: attachment.size,
+                    url: attachment.url,
+                    proxy_url: attachment.proxyURL,
+                    height: attachment.height,
+                    width: attachment.width,
+                    ephemeral: attachment.ephemeral,
+                    duration_secs: attachment.durationSecs,
+                    waveform: attachment.waveform,
+                    flags: attachment.flags,
+                })),
             },
             files: options.files,
             query: {
                 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) {
@@ -1233,7 +1344,6 @@ class Client extends node_events_1.default {
             json: {
                 channel_id: options.channelID,
                 suppress: options.suppress,
-                requestToSpeakTimestamp: options.requestToSpeakTimestamp,
             },
         });
     }
@@ -1247,7 +1357,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) {
@@ -1255,7 +1365,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
@@ -1269,18 +1379,32 @@ 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)),
-                flags: options.flags,
+                attachments: options.attachments?.map((attachment) => ({
+                    id: attachment.id,
+                    filename: attachment.filename,
+                    title: attachment.title,
+                    description: attachment.description,
+                    content_type: attachment.contentType,
+                    size: attachment.size,
+                    url: attachment.url,
+                    proxy_url: attachment.proxyURL,
+                    height: attachment.height,
+                    width: attachment.width,
+                    ephemeral: attachment.ephemeral,
+                    duration_secs: attachment.durationSecs,
+                    waveform: attachment.waveform,
+                    flags: attachment.flags,
+                })),
             },
             files: options.files,
             query: {
                 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) {
@@ -1292,12 +1416,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) {
@@ -1305,27 +1429,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,
@@ -1348,7 +1466,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
@@ -1363,7 +1481,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) {
@@ -1382,8 +1500,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 */
@@ -1395,8 +1513,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,
         };
     }
@@ -1411,59 +1529,52 @@ 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) {
         const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.applicationRoleConnectionMetadata(applicationID));
-        return response.map((applicationRoleConnectionMetadata) => ({
-            type: applicationRoleConnectionMetadata.type,
-            key: applicationRoleConnectionMetadata.key,
-            name: applicationRoleConnectionMetadata.name,
-            nameLocalizations: applicationRoleConnectionMetadata.name_localizations,
-            description: applicationRoleConnectionMetadata.description,
-            descriptionLocalizations: applicationRoleConnectionMetadata.description_localizations,
-        }));
+        return response.map((applicationRoleConnectionMetadata) => transformers_1.ApplicationRoleConnectionMetadatas.applicationRoleConnectionMetadataFromRaw(applicationRoleConnectionMetadata));
     }
     /** 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);
+        const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.applicationUser());
+        return transformers_1.Applications.applicationFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/user#get-current-user-application-role-connection */
     async getCurrentApplicationRoleConnection(applicationID) {
@@ -1471,20 +1582,13 @@ class Client extends node_events_1.default {
         return {
             platformName: response.platform_name,
             platformUsername: response.platform_username,
-            metadata: {
-                type: response.metadata.type,
-                key: response.metadata.key,
-                name: response.metadata.name,
-                nameLocalizations: response.metadata.name_localizations,
-                description: response.metadata.description,
-                descriptionLocalizations: response.metadata.description_localizations,
-            },
+            metadata: transformers_1.ApplicationRoleConnectionMetadatas.applicationRoleConnectionMetadataFromRaw(response.metadata),
         };
     }
     /** 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() {
@@ -1494,7 +1598,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,
@@ -1515,7 +1619,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() {
@@ -1538,7 +1642,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.ApplicationCommands.applicationCommandFromRaw(response);
     }
     /** https://discord.com/developers/docs/interactions/application-commands#get-global-application-commands */
     async getGlobalApplicationCommands(applicationID, options) {
@@ -1547,7 +1651,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.ApplicationCommands.applicationCommandFromRaw(applicationCommand));
     }
     /** https://discord.com/developers/docs/resources/guild#get-guild */
     async getGuild(guildID, options) {
@@ -1556,7 +1660,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) {
@@ -1568,12 +1672,21 @@ class Client extends node_events_1.default {
                 with_counts: options?.withCounts,
             },
         });
-        return response.map((guild) => this.util.guildFromRaw(guild));
+        return response.map((guild) => ({
+            id: guild.id,
+            name: guild.name,
+            icon: guild.icon,
+            owner: guild.owner,
+            permissions: guild.permissions,
+            features: guild.features,
+            approximate_member_count: guild.approximate_member_count,
+            approximate_presence_count: guild.approximate_presence_count,
+        }));
     }
     /** 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.ApplicationCommands.applicationCommandFromRaw(response);
     }
     /** https://discord.com/developers/docs/interactions/application-commands#get-guild-application-commands */
     async getGuildApplicationCommands(applicationID, guildID, options) {
@@ -1582,19 +1695,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.ApplicationCommands.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 */
@@ -1608,38 +1721,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) {
@@ -1654,7 +1767,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,
@@ -1681,12 +1794,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 */
@@ -1701,7 +1814,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) {
@@ -1710,7 +1823,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) {
@@ -1724,31 +1837,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) {
@@ -1785,8 +1898,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,
         };
     }
@@ -1813,7 +1926,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) {
@@ -1822,7 +1935,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) {
@@ -1833,7 +1946,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) {
@@ -1844,15 +1957,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) {
@@ -1863,7 +1976,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) {
@@ -1875,29 +1988,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);
+        const response = await this.rest.request(rest_1.RESTMethods.Get, rest_1.Endpoints.oauth2Application());
+        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) {
@@ -1908,18 +2021,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() {
@@ -1927,7 +2040,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,
@@ -1943,15 +2056,7 @@ class Client extends node_events_1.default {
                 with_member: options?.withMember,
             },
         });
-        return {
-            id: response.id,
-            userID: response.user_id,
-            joinTimestamp: response.join_timestamp,
-            flags: response.flags,
-            member: response.member !== undefined
-                ? this.util.guildMemberFromRaw(response.member)
-                : undefined,
-        };
+        return transformers_1.Channels.threadMemberFromRaw(response);
     }
     /** https://discord.com/developers/docs/resources/channel#list-thread-members */
     async getThreadMembers(channelID, options) {
@@ -1962,12 +2067,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() {
@@ -1987,16 +2092,16 @@ 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) {
-        this.rest.request(rest_1.RESTMethods.Put, rest_1.Endpoints.threadMembers(channelID, "@me"));
+        this.rest.request(rest_1.RESTMethods.Put, rest_1.Endpoints.threadMembers(channelID));
     }
     /** https://discord.com/developers/docs/topics/gateway-events#update-voice-state */
     joinVoiceChannel(guildID, channelID, options) {
@@ -2013,7 +2118,7 @@ class Client extends node_events_1.default {
     }
     /** https://discord.com/developers/docs/resources/channel#leave-thread */
     leaveThread(channelID) {
-        this.rest.request(rest_1.RESTMethods.Delete, rest_1.Endpoints.threadMembers(channelID, "@me"));
+        this.rest.request(rest_1.RESTMethods.Delete, rest_1.Endpoints.threadMembers(channelID));
     }
     /** https://discord.com/developers/docs/topics/gateway-events#update-voice-state */
     leaveVoiceChannel(guildID) {
@@ -2064,7 +2169,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) {
@@ -2073,7 +2178,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) {
@@ -2082,14 +2187,7 @@ class Client extends node_events_1.default {
     /** https://discord.com/developers/docs/resources/application-role-connection-metadata#update-application-role-connection-metadata-records */
     async updateApplicationRoleConnectionMetadataRecords(applicationID) {
         const response = await this.rest.request(rest_1.RESTMethods.Put, rest_1.Endpoints.applicationRoleConnectionMetadata(applicationID));
-        return response.map((applicationRoleConnectionMetadata) => ({
-            type: applicationRoleConnectionMetadata.type,
-            key: applicationRoleConnectionMetadata.key,
-            name: applicationRoleConnectionMetadata.name,
-            nameLocalizations: applicationRoleConnectionMetadata.name_localizations,
-            description: applicationRoleConnectionMetadata.description,
-            descriptionLocalizations: applicationRoleConnectionMetadata.description_localizations,
-        }));
+        return response.map((applicationRoleConnectionMetadata) => transformers_1.ApplicationRoleConnectionMetadatas.applicationRoleConnectionMetadataFromRaw(applicationRoleConnectionMetadata));
     }
     /** https://discord.com/developers/docs/resources/user#update-current-user-application-role-connection */
     async updateCurrentApplicationRoleConnection(applicationID, options) {
@@ -2097,20 +2195,15 @@ class Client extends node_events_1.default {
             json: {
                 platform_name: options.platformName,
                 platform_username: options.platformUsername,
-                metadata: options.metadata,
+                metadata: options.metadata !== undefined
+                    ? transformers_1.ApplicationRoleConnectionMetadatas.applicationRoleConnectionMetadataToRaw(options.metadata)
+                    : undefined,
             },
         });
         return {
             platformName: response.platform_name,
             platformUsername: response.platform_username,
-            metadata: {
-                type: response.metadata.type,
-                key: response.metadata.key,
-                name: response.metadata.name,
-                nameLocalizations: response.metadata.name_localizations,
-                description: response.metadata.description,
-                descriptionLocalizations: response.metadata.description_localizations,
-            },
+            metadata: transformers_1.ApplicationRoleConnectionMetadatas.applicationRoleConnectionMetadataFromRaw(response.metadata),
         };
     }
     /** https://discord.com/developers/docs/resources/channel#unpin-message */