seyfert 1.5.0 → 2.1.0

package/lib/common/shorters/guilds.d.ts

@@ -1,29 +1,31 @@
-import type { GuildWidgetStyle, RESTGetAPICurrentUserGuildsQuery, RESTPatchAPIAutoModerationRuleJSONBody, RESTPatchAPIChannelJSONBody, RESTPatchAPIGuildChannelPositionsJSONBody, RESTPatchAPIGuildStickerJSONBody, RESTPostAPIAutoModerationRuleJSONBody, RESTPostAPIGuildChannelJSONBody, RESTPostAPIGuildsJSONBody } from 'discord-api-types/v10';
-import { type ObjectToLower } from '..';
-import { AnonymousGuild, AutoModerationRule, Guild, GuildMember, Sticker, type CreateStickerBodyRequest } from '../../structures';
+import type { GuildWidgetStyle, RESTGetAPICurrentUserGuildsQuery, RESTPatchAPIAutoModerationRuleJSONBody, RESTPatchAPIChannelJSONBody, RESTPatchAPIGuildChannelPositionsJSONBody, RESTPatchAPIGuildJSONBody, RESTPatchAPIGuildStickerJSONBody, RESTPostAPIAutoModerationRuleJSONBody, RESTPostAPIGuildChannelJSONBody, RESTPostAPIGuildsJSONBody } from '../../types';
+import { Guild, GuildMember, type CreateStickerBodyRequest } from '../../structures';
 import { BaseShorter } from './base';
+import { type GuildStructure } from '../../client/transformers';
 export declare class GuildShorter extends BaseShorter {
     /**
      * Creates a new guild.
      * @param body The data for creating the guild.
      * @returns A Promise that resolves to the created guild.
      */
-    create(body: RESTPostAPIGuildsJSONBody): Promise<Guild<'api'>>;
+    create(body: RESTPostAPIGuildsJSONBody): Promise<GuildStructure<'api'>>;
     /**
      * Fetches a guild by its ID.
      * @param id The ID of the guild to fetch.
      * @param force Whether to force fetching the guild from the API even if it exists in the cache.
      * @returns A Promise that resolves to the fetched guild.
      */
-    fetch(id: string, force?: boolean): Promise<Guild<"cached"> | Guild<"api">>;
+    fetch(id: string, force?: boolean): Promise<Guild<"api">>;
+    raw(id: string, force?: boolean): Promise<import("../../types").APIGuild>;
     /**
      * Generates the widget URL for the guild.
      * @param id The ID of the guild.
      * @param style The style of the widget.
      * @returns The generated widget URL.
      */
-    widgetURL(id: string, style?: GuildWidgetStyle): Promise<import("discord-api-types/v10").APIGuildWidgetSettings>;
-    list(query?: RESTGetAPICurrentUserGuildsQuery): Promise<AnonymousGuild[]>;
+    widgetURL(id: string, style?: GuildWidgetStyle): Promise<import("../../types").APIGuildWidgetSettings>;
+    edit(guildId: string, body: RESTPatchAPIGuildJSONBody, reason?: string): Promise<Guild<"api">>;
+    list(query?: RESTGetAPICurrentUserGuildsQuery): Promise<import("../../structures").AnonymousGuild[]>;
     fetchSelf(id: string, force?: boolean): Promise<GuildMember>;
     leave(id: string): Promise<void | undefined>;
     /**
@@ -75,7 +77,7 @@ export declare class GuildShorter extends BaseShorter {
          * @param body The data containing the new positions of channels.
          */
         editPositions: (guildId: string, body: RESTPatchAPIGuildChannelPositionsJSONBody) => Promise<never>;
-        addFollower: (channelId: string, webhook_channel_id: string, reason?: string) => Promise<import("discord-api-types/v10").APIFollowedChannel>;
+        addFollower: (channelId: string, webhook_channel_id: string, reason?: string) => Promise<import("../../types").APIFollowedChannel>;
     };
     /**
      * Provides access to auto-moderation rule-related functionality in a guild.
@@ -86,14 +88,14 @@ export declare class GuildShorter extends BaseShorter {
          * @param guildId The ID of the guild.
          * @returns A Promise that resolves to an array of auto-moderation rules.
          */
-        list: (guildId: string) => Promise<AutoModerationRule[]>;
+        list: (guildId: string) => Promise<import("../../structures").AutoModerationRule[]>;
         /**
          * Creates a new auto-moderation rule in the guild.
          * @param guildId The ID of the guild.
          * @param body The data for creating the auto-moderation rule.
          * @returns A Promise that resolves to the created auto-moderation rule.
          */
-        create: (guildId: string, body: RESTPostAPIAutoModerationRuleJSONBody) => Promise<AutoModerationRule>;
+        create: (guildId: string, body: RESTPostAPIAutoModerationRuleJSONBody) => Promise<import("../../structures").AutoModerationRule>;
         /**
          * Deletes an auto-moderation rule from the guild.
          * @param guildId The ID of the guild.
@@ -108,7 +110,7 @@ export declare class GuildShorter extends BaseShorter {
          * @param ruleId The ID of the rule to fetch.
          * @returns A Promise that resolves to the fetched auto-moderation rule.
          */
-        fetch: (guildId: string, ruleId: string) => Promise<AutoModerationRule>;
+        fetch: (guildId: string, ruleId: string) => Promise<import("../../structures").AutoModerationRule>;
         /**
          * Edits an auto-moderation rule in the guild.
          * @param guildId The ID of the guild.
@@ -117,7 +119,7 @@ export declare class GuildShorter extends BaseShorter {
          * @param reason The reason for editing the rule.
          * @returns A Promise that resolves to the edited auto-moderation rule.
          */
-        edit: (guildId: string, ruleId: string, body: ObjectToLower<RESTPatchAPIAutoModerationRuleJSONBody>, reason?: string) => Promise<AutoModerationRule>;
+        edit: (guildId: string, ruleId: string, body: RESTPatchAPIAutoModerationRuleJSONBody, reason?: string) => Promise<import("../../structures").AutoModerationRule>;
     };
     /**
      * Provides access to sticker-related functionality in a guild.
@@ -128,7 +130,7 @@ export declare class GuildShorter extends BaseShorter {
          * @param guildId The ID of the guild.
          * @returns A Promise that resolves to an array of stickers.
          */
-        list: (guildId: string) => Promise<Sticker[]>;
+        list: (guildId: string) => Promise<import("../../structures").Sticker[]>;
         /**
          * Creates a new sticker in the guild.
          * @param guildId The ID of the guild.
@@ -136,7 +138,7 @@ export declare class GuildShorter extends BaseShorter {
          * @param reason The reason for creating the sticker.
          * @returns A Promise that resolves to the created sticker.
          */
-        create: (guildId: string, { file, ...json }: CreateStickerBodyRequest, reason?: string) => Promise<Sticker>;
+        create: (guildId: string, { file, ...json }: CreateStickerBodyRequest, reason?: string) => Promise<import("../../structures").Sticker>;
         /**
          * Edits an existing sticker in the guild.
          * @param guildId The ID of the guild.
@@ -145,7 +147,7 @@ export declare class GuildShorter extends BaseShorter {
          * @param reason The reason for editing the sticker.
          * @returns A Promise that resolves to the edited sticker.
          */
-        edit: (guildId: string, stickerId: string, body: RESTPatchAPIGuildStickerJSONBody, reason?: string) => Promise<Sticker>;
+        edit: (guildId: string, stickerId: string, body: RESTPatchAPIGuildStickerJSONBody, reason?: string) => Promise<import("../../structures").Sticker>;
         /**
          * Fetches a sticker by its ID from the guild.
          * @param guildId The ID of the guild.
@@ -153,7 +155,7 @@ export declare class GuildShorter extends BaseShorter {
          * @param force Whether to force fetching the sticker from the API even if it exists in the cache.
          * @returns A Promise that resolves to the fetched sticker.
          */
-        fetch: (guildId: string, stickerId: string, force?: boolean) => Promise<Sticker>;
+        fetch: (guildId: string, stickerId: string, force?: boolean) => Promise<import("../../structures").Sticker>;
         /**
          * Deletes a sticker from the guild.
          * @param guildId The ID of the guild.

package/lib/common/shorters/guilds.js

@@ -1,14 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GuildShorter = void 0;
-const __1 = require("..");
 const builders_1 = require("../../builders");
 const structures_1 = require("../../structures");
-const channels_1 = __importDefault(require("../../structures/channels"));
 const base_1 = require("./base");
+const transformers_1 = require("../../client/transformers");
 class GuildShorter extends base_1.BaseShorter {
     /**
      * Creates a new guild.
@@ -18,7 +14,7 @@ class GuildShorter extends base_1.BaseShorter {
     async create(body) {
         const guild = await this.client.proxy.guilds.post({ body });
         await this.client.cache.guilds?.setIfNI('Guilds', guild.id, guild);
-        return new structures_1.Guild(this.client, guild);
+        return transformers_1.Transformers.Guild(this.client, guild);
     }
     /**
      * Fetches a guild by its ID.
@@ -27,14 +23,17 @@ class GuildShorter extends base_1.BaseShorter {
      * @returns A Promise that resolves to the fetched guild.
      */
     async fetch(id, force = false) {
+        return transformers_1.Transformers.Guild(this.client, await this.raw(id, force));
+    }
+    async raw(id, force = false) {
         if (!force) {
-            const guild = await this.client.cache.guilds?.get(id);
+            const guild = await this.client.cache.guilds?.raw(id);
             if (guild)
                 return guild;
         }
         const data = await this.client.proxy.guilds(id).get();
         await this.client.cache.guilds?.patch(id, data);
-        return (await this.client.cache.guilds?.get(id)) ?? new structures_1.Guild(this.client, data);
+        return (await this.client.cache.guilds?.raw(id)) ?? data;
     }
     /**
      * Generates the widget URL for the guild.
@@ -49,17 +48,23 @@ class GuildShorter extends base_1.BaseShorter {
         }
         return this.client.proxy.guilds(id).widget.get({ query });
     }
+    async edit(guildId, body, reason) {
+        const guild = await this.client.proxy.guilds(guildId).patch({ body, reason });
+        if (!this.client.cache.hasGuildsIntent)
+            await this.client.cache.guilds?.patch(guildId, guild);
+        return new structures_1.Guild(this.client, guild);
+    }
     list(query) {
         return this.client.proxy
             .users('@me')
             .guilds.get({ query })
-            .then(guilds => guilds.map(guild => new structures_1.AnonymousGuild(this.client, { ...guild, splash: null })));
+            .then(guilds => guilds.map(guild => transformers_1.Transformers.AnonymousGuild(this.client, { ...guild, splash: null })));
     }
     async fetchSelf(id, force = false) {
         if (!force) {
-            const self = await this.client.cache.members?.get(this.client.botId, id);
-            if (self)
-                return self;
+            const self = await this.client.cache.members?.raw(this.client.botId, id);
+            if (self?.user)
+                return new structures_1.GuildMember(this.client, self, self.user, id);
         }
         const self = await this.client.proxy.guilds(id).members(this.client.botId).get();
         await this.client.cache.members?.patch(self.user.id, id, self);
@@ -93,7 +98,7 @@ class GuildShorter extends base_1.BaseShorter {
                 }
                 channels = await this.client.proxy.guilds(guildId).channels.get();
                 await this.client.cache.channels?.set(channels.map(x => [x.id, x]), guildId);
-                return channels.map(m => (0, channels_1.default)(m, this.client));
+                return channels.map(m => (0, structures_1.channelFrom)(m, this.client));
             },
             /**
              * Fetches a channel by its ID.
@@ -111,7 +116,7 @@ class GuildShorter extends base_1.BaseShorter {
                 }
                 channel = await this.client.proxy.channels(channelId).get();
                 await this.client.cache.channels?.patch(channelId, guildId, channel);
-                return (0, channels_1.default)(channel, this.client);
+                return (0, structures_1.channelFrom)(channel, this.client);
             },
             /**
              * Creates a new channel in the guild.
@@ -122,7 +127,7 @@ class GuildShorter extends base_1.BaseShorter {
             create: async (guildId, body) => {
                 const res = await this.client.proxy.guilds(guildId).channels.post({ body });
                 await this.client.cache.channels?.setIfNI(structures_1.BaseChannel.__intent__(guildId), res.id, guildId, res);
-                return (0, channels_1.default)(res, this.client);
+                return (0, structures_1.channelFrom)(res, this.client);
             },
             /**
              * Deletes a channel from the guild.
@@ -134,7 +139,7 @@ class GuildShorter extends base_1.BaseShorter {
             delete: async (guildId, channelId, reason) => {
                 const res = await this.client.proxy.channels(channelId).delete({ reason });
                 await this.client.cache.channels?.removeIfNI(structures_1.BaseChannel.__intent__(guildId), res.id, guildId);
-                return (0, channels_1.default)(res, this.client);
+                return (0, structures_1.channelFrom)(res, this.client);
             },
             /**
              * Edits a channel in the guild.
@@ -147,7 +152,7 @@ class GuildShorter extends base_1.BaseShorter {
             edit: async (guildchannelId, channelId, body, reason) => {
                 const res = await this.client.proxy.channels(channelId).patch({ body, reason });
                 await this.client.cache.channels?.setIfNI(structures_1.BaseChannel.__intent__(guildchannelId), res.id, guildchannelId, res);
-                return (0, channels_1.default)(res, this.client);
+                return (0, structures_1.channelFrom)(res, this.client);
             },
             /**
              * Edits the positions of channels in the guild.
@@ -177,7 +182,7 @@ class GuildShorter extends base_1.BaseShorter {
              */
             list: (guildId) => this.client.proxy
                 .guilds(guildId)['auto-moderation'].rules.get()
-                .then(rules => rules.map(rule => new structures_1.AutoModerationRule(this.client, rule))),
+                .then(rules => rules.map(rule => transformers_1.Transformers.AutoModerationRule(this.client, rule))),
             /**
              * Creates a new auto-moderation rule in the guild.
              * @param guildId The ID of the guild.
@@ -186,7 +191,7 @@ class GuildShorter extends base_1.BaseShorter {
              */
             create: (guildId, body) => this.client.proxy
                 .guilds(guildId)['auto-moderation'].rules.post({ body })
-                .then(rule => new structures_1.AutoModerationRule(this.client, rule)),
+                .then(rule => transformers_1.Transformers.AutoModerationRule(this.client, rule)),
             /**
              * Deletes an auto-moderation rule from the guild.
              * @param guildId The ID of the guild.
@@ -207,7 +212,7 @@ class GuildShorter extends base_1.BaseShorter {
                 return this.client.proxy
                     .guilds(guildId)['auto-moderation'].rules(ruleId)
                     .get()
-                    .then(rule => new structures_1.AutoModerationRule(this.client, rule));
+                    .then(rule => transformers_1.Transformers.AutoModerationRule(this.client, rule));
             },
             /**
              * Edits an auto-moderation rule in the guild.
@@ -220,8 +225,8 @@ class GuildShorter extends base_1.BaseShorter {
             edit: (guildId, ruleId, body, reason) => {
                 return this.client.proxy
                     .guilds(guildId)['auto-moderation'].rules(ruleId)
-                    .patch({ body: (0, __1.toSnakeCase)(body), reason })
-                    .then(rule => new structures_1.AutoModerationRule(this.client, rule));
+                    .patch({ body, reason })
+                    .then(rule => transformers_1.Transformers.AutoModerationRule(this.client, rule));
             },
         };
     }
@@ -238,7 +243,7 @@ class GuildShorter extends base_1.BaseShorter {
             list: async (guildId) => {
                 const stickers = await this.client.proxy.guilds(guildId).stickers.get();
                 await this.client.cache.stickers?.set(stickers.map(st => [st.id, st]), guildId);
-                return stickers.map(st => new structures_1.Sticker(this.client, st));
+                return stickers.map(st => transformers_1.Transformers.Sticker(this.client, st));
             },
             /**
              * Creates a new sticker in the guild.
@@ -253,7 +258,7 @@ class GuildShorter extends base_1.BaseShorter {
                     .guilds(guildId)
                     .stickers.post({ reason, body: json, files: [{ ...fileResolve[0], key: 'file' }], appendToFormData: true });
                 await this.client.cache.stickers?.setIfNI('GuildEmojisAndStickers', sticker.id, guildId, sticker);
-                return new structures_1.Sticker(this.client, sticker);
+                return transformers_1.Transformers.Sticker(this.client, sticker);
             },
             /**
              * Edits an existing sticker in the guild.
@@ -266,7 +271,7 @@ class GuildShorter extends base_1.BaseShorter {
             edit: async (guildId, stickerId, body, reason) => {
                 const sticker = await this.client.proxy.guilds(guildId).stickers(stickerId).patch({ body, reason });
                 await this.client.cache.stickers?.setIfNI('GuildEmojisAndStickers', stickerId, guildId, sticker);
-                return new structures_1.Sticker(this.client, sticker);
+                return transformers_1.Transformers.Sticker(this.client, sticker);
             },
             /**
              * Fetches a sticker by its ID from the guild.
@@ -284,7 +289,7 @@ class GuildShorter extends base_1.BaseShorter {
                 }
                 sticker = await this.client.proxy.guilds(guildId).stickers(stickerId).get();
                 await this.client.cache.stickers?.patch(stickerId, guildId, sticker);
-                return new structures_1.Sticker(this.client, sticker);
+                return transformers_1.Transformers.Sticker(this.client, sticker);
             },
             /**
              * Deletes a sticker from the guild.

package/lib/common/shorters/interaction.d.ts

@@ -1,13 +1,13 @@
-import { WebhookMessage, type ReplyInteractionBody } from '../..';
+import { type ReplyInteractionBody } from '../..';
 import type { InteractionMessageUpdateBodyRequest, MessageWebhookCreateBodyRequest } from '../types/write';
 import { BaseShorter } from './base';
 export declare class InteractionShorter extends BaseShorter {
-    reply(id: string, token: string, body: ReplyInteractionBody): Promise<never>;
-    fetchResponse(token: string, messageId: string): Promise<WebhookMessage | undefined>;
-    fetchOriginal(token: string): Promise<WebhookMessage | undefined>;
-    editMessage(token: string, messageId: string, body: InteractionMessageUpdateBodyRequest): Promise<WebhookMessage>;
-    editOriginal(token: string, body: InteractionMessageUpdateBodyRequest): Promise<WebhookMessage>;
+    reply(id: string, token: string, body: ReplyInteractionBody): Promise<import("../../types").RESTPostAPIInteractionCallbackResult>;
+    fetchResponse(token: string, messageId: string): Promise<import("../..").WebhookMessage | undefined>;
+    fetchOriginal(token: string): Promise<import("../..").WebhookMessage | undefined>;
+    editMessage(token: string, messageId: string, body: InteractionMessageUpdateBodyRequest): Promise<import("../..").WebhookMessage>;
+    editOriginal(token: string, body: InteractionMessageUpdateBodyRequest): Promise<import("../..").WebhookMessage>;
     deleteResponse(interactionId: string, token: string, messageId: string): Promise<void | undefined>;
     deleteOriginal(interactionId: string, token: string): Promise<void | undefined>;
-    followup(token: string, { files, ...body }: MessageWebhookCreateBodyRequest): Promise<WebhookMessage>;
+    followup(token: string, { files, ...body }: MessageWebhookCreateBodyRequest): Promise<import("../..").WebhookMessage>;
 }

package/lib/common/shorters/interaction.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InteractionShorter = void 0;
 const __1 = require("../..");
+const transformers_1 = require("../../client/transformers");
 const base_1 = require("./base");
 class InteractionShorter extends base_1.BaseShorter {
     async reply(id, token, body) {
@@ -36,7 +37,7 @@ class InteractionShorter extends base_1.BaseShorter {
             body: __1.BaseInteraction.transformBody(data, parsedFiles, this.client),
             files: parsedFiles,
         });
-        return new __1.WebhookMessage(this.client, apiMessage, this.client.applicationId, token);
+        return transformers_1.Transformers.WebhookMessage(this.client, apiMessage, this.client.applicationId, token);
     }
     editOriginal(token, body) {
         return this.editMessage(token, '@original', body);
@@ -59,7 +60,7 @@ class InteractionShorter extends base_1.BaseShorter {
             body: __1.BaseInteraction.transformBody(body, parsedFiles, this.client),
             files: parsedFiles,
         });
-        return new __1.WebhookMessage(this.client, apiMessage, this.client.applicationId, token);
+        return transformers_1.Transformers.WebhookMessage(this.client, apiMessage, this.client.applicationId, token);
     }
 }
 exports.InteractionShorter = InteractionShorter;

package/lib/common/shorters/members.d.ts

@@ -1,8 +1,8 @@
-import type { RESTGetAPIGuildMembersQuery, RESTGetAPIGuildMembersSearchQuery, RESTPatchAPIGuildMemberJSONBody, RESTPutAPIGuildBanJSONBody, RESTPutAPIGuildMemberJSONBody } from 'discord-api-types/v10';
-import { GuildMember } from '../../structures';
+import { type APIGuildMember, type RESTGetAPIGuildMembersQuery, type RESTGetAPIGuildMembersSearchQuery, type RESTPatchAPIGuildMemberJSONBody, type RESTPutAPIGuildBanJSONBody, type RESTPutAPIGuildMemberJSONBody } from '../../types';
 import { PermissionsBitField } from '../../structures/extra/Permissions';
 import type { GuildMemberResolvable } from '../types/resolvables';
 import { BaseShorter } from './base';
+import { type VoiceStateStructure } from '../../client/transformers';
 export declare class MemberShorter extends BaseShorter {
     /**
      * Resolves a member in the guild based on the provided GuildMemberResolvable.
@@ -10,14 +10,14 @@ export declare class MemberShorter extends BaseShorter {
      * @param resolve The GuildMemberResolvable to resolve.
      * @returns A Promise that resolves to the resolved member.
      */
-    resolve(guildId: string, resolve: GuildMemberResolvable): Promise<GuildMember | undefined>;
+    resolve(guildId: string, resolve: GuildMemberResolvable): Promise<import("../..").GuildMember | undefined>;
     /**
      * Searches for members in the guild based on the provided query.
      * @param guildId The ID of the guild.
      * @param query The query parameters for searching members.
      * @returns A Promise that resolves to an array of matched members.
      */
-    search(guildId: string, query?: RESTGetAPIGuildMembersSearchQuery): Promise<GuildMember[]>;
+    search(guildId: string, query?: RESTGetAPIGuildMembersSearchQuery): Promise<import("../..").GuildMember[]>;
     /**
      * Unbans a member from the guild.
      * @param guildId The ID of the guild.
@@ -49,7 +49,7 @@ export declare class MemberShorter extends BaseShorter {
      * @param reason The reason for editing the member.
      * @returns A Promise that resolves to the edited member.
      */
-    edit(guildId: string, memberId: string, body: RESTPatchAPIGuildMemberJSONBody, reason?: string): Promise<GuildMember>;
+    edit(guildId: string, memberId: string, body: RESTPatchAPIGuildMemberJSONBody, reason?: string): Promise<import("../..").GuildMember>;
     /**
      * Adds a member to the guild.
      * @param guildId The ID of the guild.
@@ -57,7 +57,7 @@ export declare class MemberShorter extends BaseShorter {
      * @param body The request body for adding the member.
      * @returns A Promise that resolves to the added member.
      */
-    add(guildId: string, memberId: string, body: RESTPutAPIGuildMemberJSONBody): Promise<GuildMember | undefined>;
+    add(guildId: string, memberId: string, body: RESTPutAPIGuildMemberJSONBody): Promise<import("../..").GuildMember | undefined>;
     /**
      * Fetches a member from the guild.
      * @param guildId The ID of the guild.
@@ -65,7 +65,8 @@ export declare class MemberShorter extends BaseShorter {
      * @param force Whether to force fetching the member from the API even if it exists in the cache.
      * @returns A Promise that resolves to the fetched member.
      */
-    fetch(guildId: string, memberId: string, force?: boolean): Promise<GuildMember>;
+    fetch(guildId: string, memberId: string, force?: boolean): Promise<import("../..").GuildMember>;
+    raw(guildId: string, memberId: string, force?: boolean): Promise<APIGuildMember>;
     /**
      * Lists members in the guild based on the provided query.
      * @param guildId The ID of the guild.
@@ -73,7 +74,7 @@ export declare class MemberShorter extends BaseShorter {
      * @param force Whether to force listing members from the API even if they exist in the cache.
      * @returns A Promise that resolves to an array of listed members.
      */
-    list(guildId: string, query?: RESTGetAPIGuildMembersQuery, force?: boolean): Promise<GuildMember[]>;
+    list(guildId: string, query?: RESTGetAPIGuildMembersQuery, force?: boolean): Promise<import("../..").GuildMember[]>;
     /**
      * Adds a role to a guild member.
      * @param guildId The ID of the guild.
@@ -88,13 +89,29 @@ export declare class MemberShorter extends BaseShorter {
      * @param id The ID of the role to remove.
      */
     removeRole(guildId: string, memberId: string, id: string): Promise<never>;
-    listRoles(guildId: string, memberId: string, force?: boolean): Promise<import("../../structures").GuildRole[]>;
-    sortRoles(guildId: string, memberId: string, force?: boolean): Promise<import("../../structures").GuildRole[]>;
+    listRoles(guildId: string, memberId: string, force?: boolean): Promise<import("../..").GuildRole[]>;
+    sortRoles(guildId: string, memberId: string, force?: boolean): Promise<import("../..").GuildRole[]>;
     permissions(guildId: string, memberId: string, force?: boolean): Promise<PermissionsBitField>;
-    presence(memberId: string): import("../..").ReturnCache<(Omit<import("discord-api-types/v10").GatewayPresenceUpdate, "user"> & {
+    presence(memberId: string): import("../..").ReturnCache<(Omit<import("../../types").GatewayPresenceUpdate, "user"> & {
         id: string;
+        user_id: string;
     } & {
         guild_id: string;
     }) | undefined>;
-    voice(guildId: string, memberId: string): import("../..").ReturnCache<import("../../structures").VoiceState | undefined>;
+    voice(guildId: string, memberId: '@me', force?: boolean): Promise<VoiceStateStructure>;
+    voice(guildId: string, memberId: string, force?: boolean): Promise<VoiceStateStructure>;
+    /**
+     * Timeouts a member from the guild.
+     * @param guildId The ID of the guild.
+     * @param memberId The ID of the member to timeout.
+     * @param time The time in seconds to timeout the member for.
+     * @param reason The reason for the timeout.
+     */
+    timeout(guildId: string, memberId: string, time: number | null, reason?: string): Promise<import("../..").GuildMember>;
+    /**
+     * Checks if a member has a timeout.
+     * @param member The member to check.
+     * @returns The time left until the timeout expires, in milliseconds, or false if the member does not have a timeout.
+     */
+    hasTimeout(member: Exclude<GuildMemberResolvable, string>): false | number;
 }

package/lib/common/shorters/members.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemberShorter = void 0;
-const globals_1 = require("discord-api-types/globals");
-const structures_1 = require("../../structures");
+const types_1 = require("../../types");
 const Permissions_1 = require("../../structures/extra/Permissions");
 const base_1 = require("./base");
+const transformers_1 = require("../../client/transformers");
 class MemberShorter extends base_1.BaseShorter {
     /**
      * Resolves a member in the guild based on the provided GuildMemberResolvable.
@@ -14,7 +14,7 @@ class MemberShorter extends base_1.BaseShorter {
      */
     async resolve(guildId, resolve) {
         if (typeof resolve === 'string') {
-            const match = resolve.match(globals_1.FormattingPatterns.User)?.groups;
+            const match = resolve.match(types_1.FormattingPatterns.User)?.groups;
             if (match?.id) {
                 return this.fetch(guildId, match.id);
             }
@@ -23,12 +23,12 @@ class MemberShorter extends base_1.BaseShorter {
             }
             return this.search(guildId, { query: resolve, limit: 1 }).then(x => x[0]);
         }
-        if (resolve.id) {
-            return this.client.members.fetch(guildId, resolve.id);
+        const id = 'id' in resolve ? resolve.id : resolve.user?.id;
+        if (id) {
+            return this.client.members.fetch(guildId, id);
         }
-        return resolve.displayName
-            ? this.search(guildId, { query: resolve.displayName, limit: 1 }).then(x => x[0])
-            : undefined;
+        const displayName = 'displayName' in resolve ? resolve.displayName : resolve.nick ?? resolve.user?.username;
+        return displayName ? this.search(guildId, { query: displayName, limit: 1 }).then(x => x[0]) : undefined;
     }
     /**
      * Searches for members in the guild based on the provided query.
@@ -41,7 +41,7 @@ class MemberShorter extends base_1.BaseShorter {
             query,
         });
         await this.client.cache.members?.set(members.map(x => [x.user.id, x]), guildId);
-        return members.map(m => new structures_1.GuildMember(this.client, m, m.user, guildId));
+        return members.map(m => transformers_1.Transformers.GuildMember(this.client, m, m.user, guildId));
     }
     /**
      * Unbans a member from the guild.
@@ -85,7 +85,7 @@ class MemberShorter extends base_1.BaseShorter {
     async edit(guildId, memberId, body, reason) {
         const member = await this.client.proxy.guilds(guildId).members(memberId).patch({ body, reason });
         await this.client.cache.members?.setIfNI('GuildMembers', memberId, guildId, member);
-        return new structures_1.GuildMember(this.client, member, member.user, guildId);
+        return transformers_1.Transformers.GuildMember(this.client, member, member.user, guildId);
     }
     /**
      * Adds a member to the guild.
@@ -103,7 +103,7 @@ class MemberShorter extends base_1.BaseShorter {
             return;
         }
         await this.client.cache.members?.setIfNI('GuildMembers', member.user.id, guildId, member);
-        return new structures_1.GuildMember(this.client, member, member.user, guildId);
+        return transformers_1.Transformers.GuildMember(this.client, member, member.user, guildId);
     }
     /**
      * Fetches a member from the guild.
@@ -113,15 +113,19 @@ class MemberShorter extends base_1.BaseShorter {
      * @returns A Promise that resolves to the fetched member.
      */
     async fetch(guildId, memberId, force = false) {
+        const member = await this.raw(guildId, memberId, force);
+        return transformers_1.Transformers.GuildMember(this.client, member, member.user, guildId);
+    }
+    async raw(guildId, memberId, force = false) {
         let member;
         if (!force) {
-            member = await this.client.cache.members?.get(memberId, guildId);
+            member = await this.client.cache.members?.raw(memberId, guildId);
             if (member)
                 return member;
         }
         member = await this.client.proxy.guilds(guildId).members(memberId).get();
         await this.client.cache.members?.set(member.user.id, guildId, member);
-        return new structures_1.GuildMember(this.client, member, member.user, guildId);
+        return member;
     }
     /**
      * Lists members in the guild based on the provided query.
@@ -141,7 +145,7 @@ class MemberShorter extends base_1.BaseShorter {
             query,
         });
         await this.client.cache.members?.set(members.map(x => [x.user.id, x]), guildId);
-        return members.map(m => new structures_1.GuildMember(this.client, m, m.user, guildId));
+        return members.map(m => transformers_1.Transformers.GuildMember(this.client, m, m.user, guildId));
     }
     /**
      * Adds a role to a guild member.
@@ -186,8 +190,43 @@ class MemberShorter extends base_1.BaseShorter {
     presence(memberId) {
         return this.client.cache.presences?.get(memberId);
     }
-    voice(guildId, memberId) {
-        return this.client.cache.voiceStates?.get(memberId, guildId);
+    async voice(guildId, memberId, force = false) {
+        if (!force) {
+            const state = await this.client.cache.voiceStates?.get(memberId, guildId);
+            if (state)
+                return state;
+        }
+        const state = await this.client.proxy.guilds(guildId)['voice-states'](memberId).get();
+        await this.client.cache.voiceStates?.set(memberId, guildId, state);
+        return transformers_1.Transformers.VoiceState(this.client, state);
+    }
+    /**
+     * Timeouts a member from the guild.
+     * @param guildId The ID of the guild.
+     * @param memberId The ID of the member to timeout.
+     * @param time The time in seconds to timeout the member for.
+     * @param reason The reason for the timeout.
+     */
+    timeout(guildId, memberId, time, reason) {
+        return this.edit(guildId, memberId, {
+            communication_disabled_until: time ? new Date(Date.now() + time * 1000).toISOString() : null,
+        }, reason);
+    }
+    /**
+     * Checks if a member has a timeout.
+     * @param member The member to check.
+     * @returns The time left until the timeout expires, in milliseconds, or false if the member does not have a timeout.
+     */
+    hasTimeout(member) {
+        // @ts-expect-error
+        const timeout = member.communication_disabled_until ?? member.communicationDisabledUntil;
+        if (!timeout)
+            return false;
+        const parsed = Date.parse(timeout);
+        const now = Date.now();
+        if (parsed > now)
+            return parsed - now;
+        return false;
     }
 }
 exports.MemberShorter = MemberShorter;

package/lib/common/shorters/messages.d.ts

@@ -1,18 +1,17 @@
-import type { RESTPostAPIChannelMessagesThreadsJSONBody } from 'discord-api-types/v10';
-import { Message, User } from '../../structures';
+import type { RESTPostAPIChannelMessagesThreadsJSONBody } from '../../types';
 import type { MessageCreateBodyRequest, MessageUpdateBodyRequest } from '../types/write';
 import { BaseShorter } from './base';
 import type { ValidAnswerId } from '../../api/Routes/channels';
 export declare class MessageShorter extends BaseShorter {
-    write(channelId: string, { files, ...body }: MessageCreateBodyRequest): Promise<Message>;
-    edit(messageId: string, channelId: string, { files, ...body }: MessageUpdateBodyRequest): Promise<Message>;
-    crosspost(messageId: string, channelId: string, reason?: string): Promise<Message>;
+    write(channelId: string, { files, ...body }: MessageCreateBodyRequest): Promise<import("../../structures").Message>;
+    edit(messageId: string, channelId: string, { files, ...body }: MessageUpdateBodyRequest): Promise<import("../../structures").Message>;
+    crosspost(messageId: string, channelId: string, reason?: string): Promise<import("../../structures").Message>;
     delete(messageId: string, channelId: string, reason?: string): Promise<void>;
-    fetch(messageId: string, channelId: string): Promise<Message>;
+    fetch(messageId: string, channelId: string): Promise<import("../../structures").Message>;
     purge(messages: string[], channelId: string, reason?: string): Promise<void | undefined>;
     thread(channelId: string, messageId: string, options: RESTPostAPIChannelMessagesThreadsJSONBody & {
         reason?: string;
     }): Promise<import("../../structures").ThreadChannel>;
-    endPoll(channelId: string, messageId: string): Promise<Message>;
-    getAnswerVoters(channelId: string, messageId: string, answerId: ValidAnswerId): Promise<User[]>;
+    endPoll(channelId: string, messageId: string): Promise<import("../../structures").Message>;
+    getAnswerVoters(channelId: string, messageId: string, answerId: ValidAnswerId): Promise<import("../../structures").User[]>;
 }