seyfert 1.4.0 → 2.0.0

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) {
@@ -9,14 +10,15 @@ class InteractionShorter extends base_1.BaseShorter {
         const { files, ...rest } = body.data ?? {};
         //@ts-expect-error
         const data = body.data instanceof __1.Modal ? body.data : rest;
+        const parsedFiles = files ? await (0, __1.resolveFiles)(files) : undefined;
         return this.client.proxy
             .interactions(id)(token)
             .callback.post({
             body: __1.BaseInteraction.transformBodyRequest({
                 type: body.type,
                 data,
-            }, this.client),
-            files: files ? await (0, __1.resolveFiles)(files) : undefined,
+            }, parsedFiles, this.client),
+            files: parsedFiles,
         });
     }
     fetchResponse(token, messageId) {
@@ -27,14 +29,15 @@ class InteractionShorter extends base_1.BaseShorter {
     }
     async editMessage(token, messageId, body) {
         const { files, ...data } = body;
+        const parsedFiles = files ? await (0, __1.resolveFiles)(files) : undefined;
         const apiMessage = await this.client.proxy
             .webhooks(this.client.applicationId)(token)
             .messages(messageId)
             .patch({
-            body: __1.BaseInteraction.transformBody(data, this.client),
-            files: files ? await (0, __1.resolveFiles)(files) : undefined,
+            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);
@@ -50,14 +53,14 @@ class InteractionShorter extends base_1.BaseShorter {
         return this.deleteResponse(interactionId, token, '@original');
     }
     async followup(token, { files, ...body }) {
-        files = files ? await (0, __1.resolveFiles)(files) : undefined;
+        const parsedFiles = files ? await (0, __1.resolveFiles)(files) : undefined;
         const apiMessage = await this.client.proxy
             .webhooks(this.client.applicationId)(token)
             .post({
-            body: __1.BaseInteraction.transformBody(body, this.client),
-            files: files,
+            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[]>;
 }

package/lib/common/shorters/messages.js

@@ -4,10 +4,11 @@ exports.MessageShorter = void 0;
 const builders_1 = require("../../builders");
 const structures_1 = require("../../structures");
 const base_1 = require("./base");
+const transformers_1 = require("../../client/transformers");
 class MessageShorter extends base_1.BaseShorter {
     async write(channelId, { files, ...body }) {
         const parsedFiles = files ? await (0, builders_1.resolveFiles)(files) : [];
-        const transformedBody = structures_1.MessagesMethods.transformMessageBody(body, this.client);
+        const transformedBody = structures_1.MessagesMethods.transformMessageBody(body, parsedFiles, this.client);
         return this.client.proxy
             .channels(channelId)
             .messages.post({
@@ -16,7 +17,7 @@ class MessageShorter extends base_1.BaseShorter {
         })
             .then(async (message) => {
             await this.client.cache.messages?.setIfNI('GuildMessages', message.id, message.channel_id, message);
-            return new structures_1.Message(this.client, message);
+            return transformers_1.Transformers.Message(this.client, message);
         });
     }
     async edit(messageId, channelId, { files, ...body }) {
@@ -25,12 +26,12 @@ class MessageShorter extends base_1.BaseShorter {
             .channels(channelId)
             .messages(messageId)
             .patch({
-            body: structures_1.MessagesMethods.transformMessageBody(body, this.client),
+            body: structures_1.MessagesMethods.transformMessageBody(body, parsedFiles, this.client),
             files: parsedFiles,
         })
             .then(async (message) => {
             await this.client.cache.messages?.setIfNI('GuildMessages', message.id, message.channel_id, message);
-            return new structures_1.Message(this.client, message);
+            return transformers_1.Transformers.Message(this.client, message);
         });
     }
     crosspost(messageId, channelId, reason) {
@@ -40,7 +41,7 @@ class MessageShorter extends base_1.BaseShorter {
             .crosspost.post({ reason })
             .then(async (m) => {
             await this.client.cache.messages?.setIfNI('GuildMessages', m.id, m.channel_id, m);
-            return new structures_1.Message(this.client, m);
+            return transformers_1.Transformers.Message(this.client, m);
         });
     }
     delete(messageId, channelId, reason) {
@@ -50,7 +51,7 @@ class MessageShorter extends base_1.BaseShorter {
             .delete({ reason })
             .then(async () => {
             await this.client.cache.messages?.removeIfNI('GuildMessages', messageId, channelId);
-            void this.client.components?.onMessageDelete(messageId);
+            this.client.components?.onMessageDelete(messageId);
         });
     }
     fetch(messageId, channelId) {
@@ -60,7 +61,7 @@ class MessageShorter extends base_1.BaseShorter {
             .get()
             .then(async (x) => {
             await this.client.cache.messages?.set(x.id, x.channel_id, x);
-            return new structures_1.Message(this.client, x);
+            return transformers_1.Transformers.Message(this.client, x);
         });
     }
     purge(messages, channelId, reason) {
@@ -77,7 +78,7 @@ class MessageShorter extends base_1.BaseShorter {
             .channels(channelId)
             .polls(messageId)
             .expire.post()
-            .then(message => new structures_1.Message(this.client, message));
+            .then(message => transformers_1.Transformers.Message(this.client, message));
     }
     getAnswerVoters(channelId, messageId, answerId) {
         return this.client.proxy
@@ -85,7 +86,7 @@ class MessageShorter extends base_1.BaseShorter {
             .polls(messageId)
             .answers(answerId)
             .get()
-            .then(data => data.users.map(user => new structures_1.User(this.client, user)));
+            .then(data => data.users.map(user => transformers_1.Transformers.User(this.client, user)));
     }
 }
 exports.MessageShorter = MessageShorter;

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

@@ -1,10 +1,10 @@
-import type { RESTGetAPIChannelMessageReactionUsersQuery } from 'discord-api-types/v10';
-import { User } from '../../structures';
+import type { RESTGetAPIChannelMessageReactionUsersQuery } from '../../types';
 import type { EmojiResolvable } from '../types/resolvables';
 import { BaseShorter } from './base';
+import { type UserStructure } from '../../client/transformers';
 export declare class ReactionShorter extends BaseShorter {
     add(messageId: string, channelId: string, emoji: EmojiResolvable): Promise<void>;
     delete(messageId: string, channelId: string, emoji: EmojiResolvable, userId?: string): Promise<void>;
-    fetch(messageId: string, channelId: string, emoji: EmojiResolvable, query?: RESTGetAPIChannelMessageReactionUsersQuery): Promise<User[]>;
+    fetch(messageId: string, channelId: string, emoji: EmojiResolvable, query?: RESTGetAPIChannelMessageReactionUsersQuery): Promise<UserStructure[]>;
     purge(messageId: string, channelId: string, emoji?: EmojiResolvable): Promise<void>;
 }

package/lib/common/shorters/reactions.js

@@ -1,45 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReactionShorter = void 0;
-const structures_1 = require("../../structures");
-const functions_1 = require("../../structures/extra/functions");
+const utils_1 = require("../../common/it/utils");
 const base_1 = require("./base");
+const transformers_1 = require("../../client/transformers");
 class ReactionShorter extends base_1.BaseShorter {
     async add(messageId, channelId, emoji) {
-        const rawEmoji = await (0, functions_1.resolveEmoji)(emoji, this.client.cache);
+        const rawEmoji = await (0, utils_1.resolveEmoji)(emoji, this.client.cache);
         if (!rawEmoji) {
             throw new Error('Emoji no resolvable');
         }
-        return this.client.proxy.channels(channelId).messages(messageId).reactions((0, functions_1.encodeEmoji)(rawEmoji))('@me').put({});
+        return this.client.proxy.channels(channelId).messages(messageId).reactions((0, utils_1.encodeEmoji)(rawEmoji))('@me').put({});
     }
     async delete(messageId, channelId, emoji, userId = '@me') {
-        const rawEmoji = await (0, functions_1.resolveEmoji)(emoji, this.client.cache);
+        const rawEmoji = await (0, utils_1.resolveEmoji)(emoji, this.client.cache);
         if (!rawEmoji) {
             throw new Error('Emoji no resolvable');
         }
-        return this.client.proxy.channels(channelId).messages(messageId).reactions((0, functions_1.encodeEmoji)(rawEmoji))(userId).delete();
+        return this.client.proxy.channels(channelId).messages(messageId).reactions((0, utils_1.encodeEmoji)(rawEmoji))(userId).delete();
     }
     async fetch(messageId, channelId, emoji, query) {
-        const rawEmoji = await (0, functions_1.resolveEmoji)(emoji, this.client.cache);
+        const rawEmoji = await (0, utils_1.resolveEmoji)(emoji, this.client.cache);
         if (!rawEmoji) {
             throw new Error('Emoji no resolvable');
         }
         return this.client.proxy
             .channels(channelId)
             .messages(messageId)
-            .reactions((0, functions_1.encodeEmoji)(rawEmoji))
+            .reactions((0, utils_1.encodeEmoji)(rawEmoji))
             .get({ query })
-            .then(u => u.map(user => new structures_1.User(this.client, user)));
+            .then(u => u.map(user => transformers_1.Transformers.User(this.client, user)));
     }
     async purge(messageId, channelId, emoji) {
         if (!emoji) {
             return this.client.proxy.channels(channelId).messages(messageId).reactions.delete();
         }
-        const rawEmoji = await (0, functions_1.resolveEmoji)(emoji, this.client.cache);
+        const rawEmoji = await (0, utils_1.resolveEmoji)(emoji, this.client.cache);
         if (!rawEmoji) {
             throw new Error('Emoji no resolvable');
         }
-        return this.client.proxy.channels(channelId).messages(messageId).reactions((0, functions_1.encodeEmoji)(rawEmoji)).delete();
+        return this.client.proxy.channels(channelId).messages(messageId).reactions((0, utils_1.encodeEmoji)(rawEmoji)).delete();
     }
 }
 exports.ReactionShorter = ReactionShorter;

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

@@ -1,5 +1,4 @@
-import type { RESTPatchAPIGuildRoleJSONBody, RESTPatchAPIGuildRolePositionsJSONBody, RESTPostAPIGuildRoleJSONBody } from 'discord-api-types/v10';
-import { GuildRole } from '../../structures';
+import type { APIRole, RESTPatchAPIGuildRoleJSONBody, RESTPatchAPIGuildRolePositionsJSONBody, RESTPostAPIGuildRoleJSONBody } from '../../types';
 import { BaseShorter } from './base';
 export declare class RoleShorter extends BaseShorter {
     /**
@@ -9,14 +8,17 @@ export declare class RoleShorter extends BaseShorter {
      * @param reason The reason for creating the role.
      * @returns A Promise that resolves when the role is created.
      */
-    create(guildId: string, body: RESTPostAPIGuildRoleJSONBody, reason?: string): Promise<GuildRole>;
+    create(guildId: string, body: RESTPostAPIGuildRoleJSONBody, reason?: string): Promise<import("../..").GuildRole>;
+    fetch(guildId: string, roleId: string, force?: boolean): Promise<import("../..").GuildRole>;
+    raw(guildId: string, roleId: string, force?: boolean): Promise<APIRole>;
     /**
      * Retrieves a list of roles in the guild.
      * @param guildId The ID of the guild.
      * @param force Whether to force fetching roles from the API even if they exist in the cache.
      * @returns A Promise that resolves to an array of roles.
      */
-    list(guildId: string, force?: boolean): Promise<GuildRole[]>;
+    list(guildId: string, force?: boolean): Promise<import("../..").GuildRole[]>;
+    listRaw(guildId: string, force?: boolean): Promise<APIRole[]>;
     /**
      * Edits a role in the guild.
      * @param guildId The ID of the guild.
@@ -25,7 +27,7 @@ export declare class RoleShorter extends BaseShorter {
      * @param reason The reason for editing the role.
      * @returns A Promise that resolves when the role is edited.
      */
-    edit(guildId: string, roleId: string, body: RESTPatchAPIGuildRoleJSONBody, reason?: string): Promise<GuildRole>;
+    edit(guildId: string, roleId: string, body: RESTPatchAPIGuildRoleJSONBody, reason?: string): Promise<import("../..").GuildRole>;
     /**
      * Deletes a role from the guild.
      * @param guildId The ID of the guild.
@@ -33,12 +35,12 @@ export declare class RoleShorter extends BaseShorter {
      * @param reason The reason for deleting the role.
      * @returns A Promise that resolves when the role is deleted.
      */
-    delete(guildId: string, roleId: string, reason?: string): Promise<GuildRole>;
+    delete(guildId: string, roleId: string, reason?: string): Promise<import("../..").GuildRole>;
     /**
      * Edits the positions of roles in the guild.
      * @param guildId The ID of the guild.
      * @param body The data to update the positions of roles with.
      * @returns A Promise that resolves to an array of edited roles.
      */
-    editPositions(guildId: string, body: RESTPatchAPIGuildRolePositionsJSONBody): Promise<GuildRole[]>;
+    editPositions(guildId: string, body: RESTPatchAPIGuildRolePositionsJSONBody): Promise<import("../..").GuildRole[]>;
 }

package/lib/common/shorters/roles.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoleShorter = void 0;
-const structures_1 = require("../../structures");
 const base_1 = require("./base");
+const transformers_1 = require("../../client/transformers");
 class RoleShorter extends base_1.BaseShorter {
     /**
      * Creates a new role in the guild.
@@ -14,7 +14,22 @@ class RoleShorter extends base_1.BaseShorter {
     async create(guildId, body, reason) {
         const res = await this.client.proxy.guilds(guildId).roles.post({ body, reason });
         await this.client.cache.roles?.setIfNI('Guilds', res.id, guildId, res);
-        return new structures_1.GuildRole(this.client, res, guildId);
+        return transformers_1.Transformers.GuildRole(this.client, res, guildId);
+    }
+    async fetch(guildId, roleId, force = false) {
+        const role = await this.raw(guildId, roleId, force);
+        return transformers_1.Transformers.GuildRole(this.client, role, guildId);
+    }
+    async raw(guildId, roleId, force = false) {
+        let role;
+        if (!force) {
+            role = await this.client.cache.roles?.raw(roleId);
+            if (role)
+                return role;
+        }
+        role = await this.client.proxy.guilds(guildId).roles(roleId).get();
+        await this.client.cache.roles?.set(roleId, guildId, role);
+        return role;
     }
     /**
      * Retrieves a list of roles in the guild.
@@ -23,16 +38,20 @@ class RoleShorter extends base_1.BaseShorter {
      * @returns A Promise that resolves to an array of roles.
      */
     async list(guildId, force = false) {
+        const roles = await this.listRaw(guildId, force);
+        return roles.map(r => transformers_1.Transformers.GuildRole(this.client, r, guildId));
+    }
+    async listRaw(guildId, force = false) {
         let roles = [];
         if (!force) {
-            const cachedRoles = (await this.client.cache.roles?.values(guildId)) ?? [];
+            const cachedRoles = (await this.client.cache.roles?.valuesRaw(guildId)) ?? [];
             if (cachedRoles.length) {
                 return cachedRoles;
             }
         }
         roles = await this.client.proxy.guilds(guildId).roles.get();
         await this.client.cache.roles?.set(roles.map(r => [r.id, r]), guildId);
-        return roles.map(r => new structures_1.GuildRole(this.client, r, guildId));
+        return roles;
     }
     /**
      * Edits a role in the guild.
@@ -45,7 +64,7 @@ class RoleShorter extends base_1.BaseShorter {
     async edit(guildId, roleId, body, reason) {
         const res = await this.client.proxy.guilds(guildId).roles(roleId).patch({ body, reason });
         await this.client.cache.roles?.setIfNI('Guilds', roleId, guildId, res);
-        return new structures_1.GuildRole(this.client, res, guildId);
+        return transformers_1.Transformers.GuildRole(this.client, res, guildId);
     }
     /**
      * Deletes a role from the guild.
@@ -57,7 +76,7 @@ class RoleShorter extends base_1.BaseShorter {
     async delete(guildId, roleId, reason) {
         const res = await this.client.proxy.guilds(guildId).roles(roleId).delete({ reason });
         this.client.cache.roles?.removeIfNI('Guilds', roleId, guildId);
-        return new structures_1.GuildRole(this.client, res, guildId);
+        return transformers_1.Transformers.GuildRole(this.client, res, guildId);
     }
     /**
      * Edits the positions of roles in the guild.
@@ -72,7 +91,7 @@ class RoleShorter extends base_1.BaseShorter {
         if (!this.client.cache.hasRolesIntent) {
             await this.client.cache.roles?.set(roles.map(x => [x.id, x]), guildId);
         }
-        return roles.map(x => new structures_1.GuildRole(this.client, x, guildId));
+        return roles.map(x => transformers_1.Transformers.GuildRole(this.client, x, guildId));
     }
 }
 exports.RoleShorter = RoleShorter;

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

@@ -1,11 +1,10 @@
-import type { RESTPatchAPIGuildTemplateJSONBody, RESTPostAPIGuildTemplatesJSONBody } from 'discord-api-types/v10';
+import type { RESTPatchAPIGuildTemplateJSONBody, RESTPostAPIGuildTemplatesJSONBody } from '../../types';
 import { BaseShorter } from './base';
-import { GuildTemplate } from '../..';
 export declare class TemplateShorter extends BaseShorter {
-    fetch(code: string): Promise<GuildTemplate>;
-    list(guildId: string): Promise<GuildTemplate[]>;
-    create(guildId: string, body: RESTPostAPIGuildTemplatesJSONBody): Promise<GuildTemplate>;
-    sync(guildId: string, code: string): Promise<GuildTemplate>;
-    edit(guildId: string, code: string, body: RESTPatchAPIGuildTemplateJSONBody): Promise<GuildTemplate>;
-    delete(guildId: string, code: string): Promise<GuildTemplate>;
+    fetch(code: string): Promise<import("../..").GuildTemplate>;
+    list(guildId: string): Promise<import("../..").GuildTemplate[]>;
+    create(guildId: string, body: RESTPostAPIGuildTemplatesJSONBody): Promise<import("../..").GuildTemplate>;
+    sync(guildId: string, code: string): Promise<import("../..").GuildTemplate>;
+    edit(guildId: string, code: string, body: RESTPatchAPIGuildTemplateJSONBody): Promise<import("../..").GuildTemplate>;
+    delete(guildId: string, code: string): Promise<import("../..").GuildTemplate>;
 }