seyfert 1.5.0 → 2.0.0

package/lib/common/shorters/messages.js

@@ -4,6 +4,7 @@ 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) : [];
@@ -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 }) {
@@ -30,7 +31,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);
         });
     }
     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>;
 }

package/lib/common/shorters/templates.js

@@ -2,46 +2,46 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TemplateShorter = void 0;
 const base_1 = require("./base");
-const __1 = require("../..");
+const transformers_1 = require("../../client/transformers");
 class TemplateShorter extends base_1.BaseShorter {
     fetch(code) {
         return this.client.proxy.guilds
             .templates(code)
             .get()
-            .then(template => new __1.GuildTemplate(this.client, template));
+            .then(template => transformers_1.Transformers.GuildTemplate(this.client, template));
     }
     list(guildId) {
         return this.client.proxy
             .guilds(guildId)
             .templates.get()
-            .then(list => list.map(template => new __1.GuildTemplate(this.client, template)));
+            .then(list => list.map(template => transformers_1.Transformers.GuildTemplate(this.client, template)));
     }
     create(guildId, body) {
         return this.client.proxy
             .guilds(guildId)
             .templates.post({ body })
-            .then(template => new __1.GuildTemplate(this.client, template));
+            .then(template => transformers_1.Transformers.GuildTemplate(this.client, template));
     }
     sync(guildId, code) {
         return this.client.proxy
             .guilds(guildId)
             .templates(code)
             .put({})
-            .then(template => new __1.GuildTemplate(this.client, template));
+            .then(template => transformers_1.Transformers.GuildTemplate(this.client, template));
     }
     edit(guildId, code, body) {
         return this.client.proxy
             .guilds(guildId)
             .templates(code)
             .patch({ body })
-            .then(template => new __1.GuildTemplate(this.client, template));
+            .then(template => transformers_1.Transformers.GuildTemplate(this.client, template));
     }
     delete(guildId, code) {
         return this.client.proxy
             .guilds(guildId)
             .templates(code)
             .delete()
-            .then(template => new __1.GuildTemplate(this.client, template));
+            .then(template => transformers_1.Transformers.GuildTemplate(this.client, template));
     }
 }
 exports.TemplateShorter = TemplateShorter;

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

@@ -1,5 +1,4 @@
-import type { APIThreadMember, RESTGetAPIChannelThreadMembersQuery, RESTGetAPIChannelThreadsArchivedQuery, RESTPatchAPIChannelJSONBody, RESTPostAPIChannelMessagesThreadsJSONBody, RESTPostAPIChannelThreadsJSONBody, RESTPostAPIGuildForumThreadsJSONBody } from 'discord-api-types/v10';
-import type { ThreadChannel } from '../../structures';
+import type { APIThreadMember, RESTGetAPIChannelThreadMembersQuery, RESTGetAPIChannelThreadsArchivedQuery, RESTPatchAPIChannelJSONBody, RESTPostAPIChannelMessagesThreadsJSONBody, RESTPostAPIChannelThreadsJSONBody, RESTPostAPIGuildForumThreadsJSONBody } from '../../types';
 import { BaseShorter } from './base';
 import type { MakeRequired, When } from '../types/util';
 export declare class ThreadShorter extends BaseShorter {
@@ -9,25 +8,25 @@ export declare class ThreadShorter extends BaseShorter {
      * @param reason The reason for unpinning the message.
      * @returns A promise that resolves when the thread is succesfully created.
      */
-    create(channelId: string, body: RESTPostAPIChannelThreadsJSONBody | RESTPostAPIGuildForumThreadsJSONBody, reason?: string): Promise<ThreadChannel>;
+    create(channelId: string, body: RESTPostAPIChannelThreadsJSONBody | RESTPostAPIGuildForumThreadsJSONBody, reason?: string): Promise<import("../../structures").ThreadChannel>;
     fromMessage(channelId: string, messageId: string, options: RESTPostAPIChannelMessagesThreadsJSONBody & {
         reason?: string;
-    }): Promise<ThreadChannel>;
+    }): Promise<import("../../structures").ThreadChannel>;
     join(threadId: string): Promise<never>;
     leave(threadId: string): Promise<never>;
-    lock(threadId: string, locked?: boolean, reason?: string): Promise<ThreadChannel>;
+    lock(threadId: string, locked?: boolean, reason?: string): Promise<import("../../structures").ThreadChannel>;
     edit(threadId: string, body: RESTPatchAPIChannelJSONBody, reason?: string): Promise<import("../../structures").AllChannels>;
     removeMember(threadId: string, memberId: string): Promise<never>;
     fetchMember<WithMember extends boolean = false>(threadId: string, memberId: string, with_member: WithMember): Promise<When<WithMember, Required<APIThreadMember>, GetAPIChannelThreadMemberResult>>;
     addMember(threadId: string, memberId: string): Promise<never>;
     listMembers<T extends RESTGetAPIChannelThreadMembersQuery = RESTGetAPIChannelThreadMembersQuery>(threadId: string, query?: T): Promise<InferWithMemberOnList<T>>;
     listArchivedThreads(channelId: string, type: 'public' | 'private', query?: RESTGetAPIChannelThreadsArchivedQuery): Promise<{
-        threads: ThreadChannel[];
+        threads: import("../../structures").ThreadChannel[];
         members: GetAPIChannelThreadMemberResult[];
         hasMore: boolean;
     }>;
     listJoinedArchivedPrivate(channelId: string, query?: RESTGetAPIChannelThreadsArchivedQuery): Promise<{
-        threads: ThreadChannel[];
+        threads: import("../../structures").ThreadChannel[];
         members: GetAPIChannelThreadMemberResult[];
         hasMore: boolean;
     }>;

package/lib/common/shorters/threads.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ThreadShorter = void 0;
-const channels_1 = __importDefault(require("../../structures/channels"));
 const base_1 = require("./base");
+const structures_1 = require("../../structures");
 class ThreadShorter extends base_1.BaseShorter {
     /**
      * Creates a new thread in the channel (only guild based channels).
@@ -18,7 +15,7 @@ class ThreadShorter extends base_1.BaseShorter {
             .channels(channelId)
             .threads.post({ body, reason })
             // When testing this, discord returns the thread object, but in discord api types it does not.
-            .then(thread => (0, channels_1.default)(thread, this.client)));
+            .then(thread => (0, structures_1.channelFrom)(thread, this.client)));
     }
     async fromMessage(channelId, messageId, options) {
         const { reason, ...body } = options;
@@ -26,7 +23,7 @@ class ThreadShorter extends base_1.BaseShorter {
             .channels(channelId)
             .messages(messageId)
             .threads.post({ body, reason })
-            .then(thread => (0, channels_1.default)(thread, this.client));
+            .then(thread => (0, structures_1.channelFrom)(thread, this.client));
     }
     async join(threadId) {
         return this.client.proxy.channels(threadId)['thread-members']('@me').put();
@@ -35,7 +32,7 @@ class ThreadShorter extends base_1.BaseShorter {
         return this.client.proxy.channels(threadId)['thread-members']('@me').delete();
     }
     async lock(threadId, locked = true, reason) {
-        return this.edit(threadId, { locked }, reason).then(x => (0, channels_1.default)(x, this.client));
+        return this.edit(threadId, { locked }, reason).then(x => (0, structures_1.channelFrom)(x, this.client));
     }
     async edit(threadId, body, reason) {
         return this.client.channels.edit(threadId, body, { reason });
@@ -59,7 +56,7 @@ class ThreadShorter extends base_1.BaseShorter {
     async listArchivedThreads(channelId, type, query) {
         const data = await this.client.proxy.channels(channelId).threads.archived[type].get({ query });
         return {
-            threads: data.threads.map(thread => (0, channels_1.default)(thread, this.client)),
+            threads: data.threads.map(thread => (0, structures_1.channelFrom)(thread, this.client)),
             members: data.members,
             hasMore: data.has_more,
         };
@@ -67,7 +64,7 @@ class ThreadShorter extends base_1.BaseShorter {
     async listJoinedArchivedPrivate(channelId, query) {
         const data = await this.client.proxy.channels(channelId).users('@me').threads.archived.private.get({ query });
         return {
-            threads: data.threads.map(thread => (0, channels_1.default)(thread, this.client)),
+            threads: data.threads.map(thread => (0, structures_1.channelFrom)(thread, this.client)),
             members: data.members,
             hasMore: data.has_more,
         };

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

@@ -1,9 +1,9 @@
-import { DMChannel, User } from '../../structures';
 import type { MessageCreateBodyRequest } from '../types/write';
 import { BaseShorter } from './base';
 export declare class UsersShorter extends BaseShorter {
-    createDM(userId: string, force?: boolean): Promise<DMChannel>;
-    deleteDM(userId: string, reason?: string): Promise<DMChannel>;
-    fetch(userId: string, force?: boolean): Promise<User>;
+    createDM(userId: string, force?: boolean): Promise<import("../../structures").DMChannel>;
+    deleteDM(userId: string, reason?: string): Promise<import("../../structures").DMChannel>;
+    fetch(userId: string, force?: boolean): Promise<import("../../structures").User>;
+    raw(userId: string, force?: boolean): Promise<import("../../types").APIUser>;
     write(userId: string, body: MessageCreateBodyRequest): Promise<import("../../structures").Message>;
 }

package/lib/common/shorters/users.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UsersShorter = void 0;
+const transformers_1 = require("../../client/transformers");
 const structures_1 = require("../../structures");
 const base_1 = require("./base");
 class UsersShorter extends base_1.BaseShorter {
@@ -14,22 +15,25 @@ class UsersShorter extends base_1.BaseShorter {
             body: { recipient_id: userId },
         });
         await this.client.cache.channels?.set(userId, '@me', data);
-        return new structures_1.DMChannel(this.client, data);
+        return transformers_1.Transformers.DMChannel(this.client, data);
     }
     async deleteDM(userId, reason) {
         const res = await this.client.proxy.channels(userId).delete({ reason });
         await this.client.cache.channels?.removeIfNI(structures_1.BaseChannel.__intent__('@me'), res.id, '@me');
-        return new structures_1.DMChannel(this.client, res);
+        return transformers_1.Transformers.DMChannel(this.client, res);
     }
     async fetch(userId, force = false) {
+        return transformers_1.Transformers.User(this.client, await this.raw(userId, force));
+    }
+    async raw(userId, force = false) {
         if (!force) {
-            const user = await this.client.cache.users?.get(userId);
+            const user = await this.client.cache.users?.raw(userId);
             if (user)
                 return user;
         }
         const data = await this.client.proxy.users(userId).get();
         await this.client.cache.users?.patch(userId, data);
-        return new structures_1.User(this.client, data);
+        return data;
     }
     async write(userId, body) {
         return (await this.client.users.createDM(userId)).messages.write(body);

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

@@ -1,8 +1,8 @@
-import type { RESTPatchAPIWebhookJSONBody, RESTPatchAPIWebhookWithTokenJSONBody, RESTPostAPIChannelWebhookJSONBody } from 'discord-api-types/v10';
-import { Webhook, WebhookMessage, type MessageWebhookMethodEditParams, type MessageWebhookMethodWriteParams } from '../../structures';
+import type { RESTPatchAPIWebhookJSONBody, RESTPatchAPIWebhookWithTokenJSONBody, RESTPostAPIChannelWebhookJSONBody } from '../../types';
+import { type MessageWebhookMethodEditParams, type MessageWebhookMethodWriteParams } from '../../structures';
 import { BaseShorter } from './base';
 export declare class WebhookShorter extends BaseShorter {
-    create(channelId: string, body: RESTPostAPIChannelWebhookJSONBody): Promise<Webhook>;
+    create(channelId: string, body: RESTPostAPIChannelWebhookJSONBody): Promise<import("../../structures").Webhook>;
     /**
      * Deletes a webhook.
      * @param webhookId The ID of the webhook.
@@ -17,14 +17,14 @@ export declare class WebhookShorter extends BaseShorter {
      * @param options The optional parameters including token and reason.
      * @returns A Promise that resolves when the webhook is edited.
      */
-    edit(webhookId: string, body: RESTPatchAPIWebhookWithTokenJSONBody | RESTPatchAPIWebhookJSONBody, options: WebhookShorterOptionalParams): Promise<Webhook>;
+    edit(webhookId: string, body: RESTPatchAPIWebhookWithTokenJSONBody | RESTPatchAPIWebhookJSONBody, options: WebhookShorterOptionalParams): Promise<import("../../structures").Webhook>;
     /**
      * Fetches a webhook.
      * @param webhookId The ID of the webhook.
      * @param token The token of the webhook (optional).
      * @returns A Promise that resolves to the fetched webhook.
      */
-    fetch(webhookId: string, token?: string): Promise<Webhook>;
+    fetch(webhookId: string, token?: string): Promise<import("../../structures").Webhook>;
     /**
      * Writes a message using the webhook.
      * @param webhookId The ID of the webhook.
@@ -32,7 +32,7 @@ export declare class WebhookShorter extends BaseShorter {
      * @param data The data for writing the message.
      * @returns A Promise that resolves to the written message.
      */
-    writeMessage(webhookId: string, token: string, { body: data, ...payload }: MessageWebhookMethodWriteParams): Promise<WebhookMessage | null>;
+    writeMessage(webhookId: string, token: string, { body: data, ...payload }: MessageWebhookMethodWriteParams): Promise<import("../../structures").WebhookMessage | null>;
     /**
      * Edits a message sent by the webhook.
      * @param webhookId The ID of the webhook.
@@ -41,7 +41,7 @@ export declare class WebhookShorter extends BaseShorter {
      * @param data The data for editing the message.
      * @returns A Promise that resolves to the edited message.
      */
-    editMessage(webhookId: string, token: string, { messageId, body: data, ...json }: MessageWebhookMethodEditParams): Promise<WebhookMessage>;
+    editMessage(webhookId: string, token: string, { messageId, body: data, ...json }: MessageWebhookMethodEditParams): Promise<import("../../structures").WebhookMessage>;
     /**
      * Deletes a message sent by the webhook.
      * @param webhookId The ID of the webhook.
@@ -59,9 +59,9 @@ export declare class WebhookShorter extends BaseShorter {
      * @param threadId The ID of the thread the message belongs to.
      * @returns A Promise that resolves to the fetched message, or undefined if not found.
      */
-    fetchMessage(webhookId: string, token: string, messageId: string, threadId?: string): Promise<WebhookMessage | undefined>;
-    listFromGuild(guildId: string): Promise<Webhook[]>;
-    listFromChannel(channelId: string): Promise<Webhook[]>;
+    fetchMessage(webhookId: string, token: string, messageId: string, threadId?: string): Promise<import("../../structures").WebhookMessage | undefined>;
+    listFromGuild(guildId: string): Promise<import("../../structures").Webhook[]>;
+    listFromChannel(channelId: string): Promise<import("../../structures").Webhook[]>;
 }
 export type WebhookShorterOptionalParams = Partial<{
     token: string;

package/lib/common/shorters/webhook.js

@@ -4,12 +4,13 @@ exports.WebhookShorter = void 0;
 const builders_1 = require("../../builders");
 const structures_1 = require("../../structures");
 const base_1 = require("./base");
+const transformers_1 = require("../../client/transformers");
 class WebhookShorter extends base_1.BaseShorter {
     async create(channelId, body) {
         const webhook = await this.client.proxy.channels(channelId).webhooks.post({
             body,
         });
-        return new structures_1.Webhook(this.client, webhook);
+        return transformers_1.Transformers.Webhook(this.client, webhook);
     }
     /**
      * Deletes a webhook.
@@ -35,12 +36,12 @@ class WebhookShorter extends base_1.BaseShorter {
             return this.client.proxy
                 .webhooks(webhookId)(options.token)
                 .patch({ body, reason: options.reason, auth: false })
-                .then(webhook => new structures_1.Webhook(this.client, webhook));
+                .then(webhook => transformers_1.Transformers.Webhook(this.client, webhook));
         }
         return this.client.proxy
             .webhooks(webhookId)
             .patch({ body, reason: options.reason })
-            .then(webhook => new structures_1.Webhook(this.client, webhook));
+            .then(webhook => transformers_1.Transformers.Webhook(this.client, webhook));
     }
     /**
      * Fetches a webhook.
@@ -56,7 +57,7 @@ class WebhookShorter extends base_1.BaseShorter {
         else {
             webhook = await this.client.proxy.webhooks(webhookId).get();
         }
-        return new structures_1.Webhook(this.client, webhook);
+        return transformers_1.Transformers.Webhook(this.client, webhook);
     }
     /**
      * Writes a message using the webhook.
@@ -72,7 +73,7 @@ class WebhookShorter extends base_1.BaseShorter {
         return this.client.proxy
             .webhooks(webhookId)(token)
             .post({ ...payload, files: parsedFiles, body: transformedBody })
-            .then(m => (m?.id ? new structures_1.WebhookMessage(this.client, m, webhookId, token) : null));
+            .then(m => (m?.id ? transformers_1.Transformers.WebhookMessage(this.client, m, webhookId, token) : null));
     }
     /**
      * Edits a message sent by the webhook.
@@ -90,7 +91,7 @@ class WebhookShorter extends base_1.BaseShorter {
             .webhooks(webhookId)(token)
             .messages(messageId)
             .patch({ ...json, auth: false, files: parsedFiles, body: transformedBody })
-            .then(m => new structures_1.WebhookMessage(this.client, m, webhookId, token));
+            .then(m => transformers_1.Transformers.WebhookMessage(this.client, m, webhookId, token));
     }
     /**
      * Deletes a message sent by the webhook.
@@ -116,15 +117,15 @@ class WebhookShorter extends base_1.BaseShorter {
             .webhooks(webhookId)(token)
             .messages(messageId)
             .get({ auth: false, query: { threadId } });
-        return message ? new structures_1.WebhookMessage(this.client, message, webhookId, token) : undefined;
+        return message ? transformers_1.Transformers.WebhookMessage(this.client, message, webhookId, token) : undefined;
     }
     async listFromGuild(guildId) {
         const webhooks = await this.client.proxy.guilds(guildId).webhooks.get();
-        return webhooks.map(webhook => new structures_1.Webhook(this.client, webhook));
+        return webhooks.map(webhook => transformers_1.Transformers.Webhook(this.client, webhook));
     }
     async listFromChannel(channelId) {
         const webhooks = await this.client.proxy.channels(channelId).webhooks.get();
-        return webhooks.map(webhook => new structures_1.Webhook(this.client, webhook));
+        return webhooks.map(webhook => transformers_1.Transformers.Webhook(this.client, webhook));
     }
 }
 exports.WebhookShorter = WebhookShorter;