seyfert 1.5.0 → 2.0.0

package/lib/structures/Sticker.js

@@ -1,32 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Sticker = void 0;
-const User_1 = require("./User");
 const DiscordBase_1 = require("./extra/DiscordBase");
+const transformers_1 = require("../client/transformers");
 class Sticker extends DiscordBase_1.DiscordBase {
     user;
     constructor(client, data) {
         super(client, data);
         if (data.user) {
-            this.user = new User_1.User(this.client, data.user);
+            this.user = transformers_1.Transformers.User(this.client, data.user);
         }
     }
-    guild(force = false) {
+    async guild(force = false) {
         if (!this.guildId)
             return;
-        return this.client.guilds.fetch(this.id, force);
+        return this.client.guilds.fetch(this.guildId, force);
     }
-    edit(body, reason) {
+    async edit(body, reason) {
         if (!this.guildId)
             return;
         return this.client.guilds.stickers.edit(this.guildId, this.id, body, reason);
     }
-    fetch(force = false) {
+    async fetch(force = false) {
         if (!this.guildId)
             return;
         return this.client.guilds.stickers.fetch(this.guildId, this.id, force);
     }
-    delete(reason) {
+    async delete(reason) {
         if (!this.guildId)
             return;
         return this.client.guilds.stickers.delete(this.guildId, this.id, reason);

package/lib/structures/User.d.ts

@@ -1,6 +1,6 @@
-import type { APIUser } from 'discord-api-types/v10';
-import type { MessageCreateBodyRequest, ObjectToLower } from '../common';
+import { type MessageCreateBodyRequest, type ObjectToLower } from '../common';
 import type { ImageOptions } from '../common/types/options';
+import type { APIUser } from '../types';
 import { DiscordBase } from './extra/DiscordBase';
 export interface User extends ObjectToLower<APIUser> {
 }
@@ -20,10 +20,11 @@ export declare class User extends DiscordBase<APIUser> {
     avatarURL(options?: ImageOptions): string;
     avatarDecorationURL(options?: ImageOptions): string | undefined;
     bannerURL(options?: ImageOptions): string | undefined;
-    presence(): import("..").ReturnCache<(Omit<import("discord-api-types/v10").GatewayPresenceUpdate, "user"> & {
+    presence(): import("..").ReturnCache<(Omit<import("../types").GatewayPresenceUpdate, "user"> & {
         id: string;
+        user_id: string;
     } & {
         guild_id: string;
     }) | undefined>;
-    toString(): string;
+    toString(): `<@${string}>`;
 }

package/lib/structures/User.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.User = void 0;
 const api_1 = require("../api");
+const common_1 = require("../common");
 const DiscordBase_1 = require("./extra/DiscordBase");
 class User extends DiscordBase_1.DiscordBase {
     get tag() {
@@ -48,7 +49,7 @@ class User extends DiscordBase_1.DiscordBase {
         return this.client.members.presence(this.id);
     }
     toString() {
-        return `<@${this.id}>`;
+        return common_1.Formatter.userMention(this.id);
     }
 }
 exports.User = User;

package/lib/structures/VoiceState.d.ts

@@ -1,19 +1,23 @@
-import { GuildMember, type UsingClient } from '../';
+import type { UsingClient } from '../';
 import type { VoiceStateResource } from '../cache/resources/voice-states';
+import { type GuildMemberStructure } from '../client/transformers';
 import type { ObjectToLower } from '../common';
-import type { GatewayVoiceState } from '../types';
+import type { APIVoiceState } from '../types';
 import { Base } from './extra/Base';
 export interface VoiceState extends Base, ObjectToLower<Omit<VoiceStateResource, 'member'>> {
 }
 export declare class VoiceState extends Base {
-    protected withMember?: GuildMember;
-    constructor(client: UsingClient, data: GatewayVoiceState);
-    isMuted(): boolean;
-    member(force?: boolean): Promise<GuildMember>;
+    protected withMember?: GuildMemberStructure;
+    constructor(client: UsingClient, data: APIVoiceState);
+    get isMuted(): boolean;
+    member(force?: boolean): Promise<import("./GuildMember").GuildMember>;
     user(force?: boolean): Promise<import("./User").User>;
-    channel(force?: boolean): Promise<import("./channels").BaseChannel<import("discord-api-types/payloads/v10/channel").ChannelType> | import("./channels").DMChannel | import("./channels").CategoryChannel | undefined>;
-    setMute(mute?: boolean, reason?: string): Promise<GuildMember>;
-    setDeaf(deaf?: boolean, reason?: string): Promise<GuildMember>;
-    disconnect(reason?: string): Promise<GuildMember>;
-    setChannel(channel_id: null | string, reason?: string): Promise<GuildMember>;
+    channel(force?: boolean): Promise<import("./channels").BaseChannel<import("../types").ChannelType> | import("./channels").DMChannel | import("./channels").CategoryChannel | undefined>;
+    setMute(mute?: boolean, reason?: string): Promise<import("./GuildMember").GuildMember>;
+    setDeaf(deaf?: boolean, reason?: string): Promise<import("./GuildMember").GuildMember>;
+    setSuppress(suppress?: boolean): Promise<void>;
+    requestSpeak(date?: string | Date): Promise<undefined>;
+    disconnect(reason?: string): Promise<import("./GuildMember").GuildMember>;
+    fetch(force?: boolean): Promise<VoiceState>;
+    setChannel(channel_id: null | string, reason?: string): Promise<import("./GuildMember").GuildMember>;
 }

package/lib/structures/VoiceState.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VoiceState = void 0;
-const __1 = require("../");
+const transformers_1 = require("../client/transformers");
 const Base_1 = require("./extra/Base");
 class VoiceState extends Base_1.Base {
     withMember;
@@ -10,15 +10,15 @@ class VoiceState extends Base_1.Base {
         const { member, ...rest } = data;
         this.__patchThis(rest);
         if (member?.user && data.guild_id)
-            this.withMember = new __1.GuildMember(client, member, member.user, data.guild_id);
+            this.withMember = transformers_1.Transformers.GuildMember(client, member, member.user, data.guild_id);
     }
-    isMuted() {
+    get isMuted() {
         return this.mute || this.selfMute;
     }
     async member(force) {
-        return (this.withMember ??= await this.client.members.fetch(this.guildId, this.userId, force));
+        return (this.withMember = await this.client.members.fetch(this.guildId, this.userId, force));
     }
-    async user(force) {
+    user(force) {
         return this.client.users.fetch(this.userId, force);
     }
     async channel(force) {
@@ -27,25 +27,43 @@ class VoiceState extends Base_1.Base {
         return this.client.channels.fetch(this.channelId, force);
     }
     async setMute(mute = !this.mute, reason) {
-        return this.client.members.edit(this.guildId, this.userId, { mute }, reason).then(member => {
-            this.mute = mute;
-            return member;
-        });
+        const member = await this.client.members.edit(this.guildId, this.userId, { mute }, reason);
+        this.mute = mute;
+        return member;
     }
     async setDeaf(deaf = !this.deaf, reason) {
-        return this.client.members.edit(this.guildId, this.userId, { deaf }, reason).then(member => {
-            this.deaf = deaf;
-            return member;
+        const member = await this.client.members.edit(this.guildId, this.userId, { deaf }, reason);
+        this.deaf = deaf;
+        return member;
+    }
+    async setSuppress(suppress = !this.suppress) {
+        await this.client.proxy.guilds(this.guildId)['voice-states']['@me'].patch({
+            body: { suppress },
+        });
+        this.suppress = suppress;
+    }
+    async requestSpeak(date = new Date()) {
+        if (typeof date === 'string')
+            date = new Date(date);
+        if (Number.isNaN(date))
+            return Promise.reject('Invalid date');
+        date = date.toISOString();
+        await this.client.proxy.guilds(this.guildId)['voice-states']['@me'].patch({
+            body: { request_to_speak_timestamp: date },
         });
+        this.requestToSpeakTimestamp = date;
     }
-    async disconnect(reason) {
+    disconnect(reason) {
         return this.setChannel(null, reason);
     }
+    async fetch(force = false) {
+        const member = this.withMember ?? (await this.member(force));
+        return this.client.members.voice(this.guildId, member.id, force);
+    }
     async setChannel(channel_id, reason) {
-        return this.client.members.edit(this.guildId, this.userId, { channel_id }, reason).then(member => {
-            this.channelId = channel_id;
-            return member;
-        });
+        const member = await this.client.members.edit(this.guildId, this.userId, { channel_id }, reason);
+        this.channelId = channel_id;
+        return member;
     }
 }
 exports.VoiceState = VoiceState;

package/lib/structures/Webhook.d.ts

@@ -1,12 +1,11 @@
 /**
  * Represents a Discord webhook.
  */
-import type { APIWebhook, RESTGetAPIWebhookWithTokenMessageQuery, RESTPatchAPIWebhookJSONBody, RESTPatchAPIWebhookWithTokenJSONBody, RESTPostAPIWebhookWithTokenQuery } from 'discord-api-types/v10';
+import type { APIWebhook, RESTGetAPIWebhookWithTokenMessageQuery, RESTPatchAPIWebhookJSONBody, RESTPatchAPIWebhookWithTokenJSONBody, RESTPostAPIWebhookWithTokenQuery } from '../types';
 import type { UsingClient } from '../commands';
 import type { ImageOptions, MessageWebhookCreateBodyRequest, MessageWebhookPayload, MessageWebhookUpdateBodyRequest, MethodContext, ObjectToLower } from '../common';
-import { AnonymousGuild } from './AnonymousGuild';
-import { User } from './User';
 import { DiscordBase } from './extra/DiscordBase';
+import { type AnonymousGuildStructure, type UserStructure } from '../client/transformers';
 export interface Webhook extends DiscordBase, ObjectToLower<Omit<APIWebhook, 'user' | 'source_guild'>> {
 }
 /**
@@ -14,9 +13,9 @@ export interface Webhook extends DiscordBase, ObjectToLower<Omit<APIWebhook, 'us
  */
 export declare class Webhook extends DiscordBase {
     /** The user associated with the webhook, if applicable. */
-    user?: User;
+    user?: UserStructure;
     /** The source guild of the webhook, if applicable. */
-    sourceGuild?: Partial<AnonymousGuild>;
+    sourceGuild?: Partial<AnonymousGuildStructure>;
     /** Methods related to interacting with messages through the webhook. */
     messages: ReturnType<typeof Webhook.messages>;
     /**
@@ -30,13 +29,13 @@ export declare class Webhook extends DiscordBase {
      * @param force Whether to force fetching the guild even if it's already cached.
      * @returns A promise that resolves to the guild associated with the webhook, or undefined if not applicable.
      */
-    guild(force?: boolean): Promise<import("./Guild").Guild<"cached"> | import("./Guild").Guild<"api">> | undefined;
+    guild(force?: boolean): Promise<import("./Guild").Guild<"api"> | undefined>;
     /**
      * Fetches the channel associated with the webhook.
      * @param force Whether to force fetching the channel even if it's already cached.
      * @returns A promise that resolves to the channel associated with the webhook, or undefined if not applicable.
      */
-    channel(force?: boolean): Promise<import("./channels").BaseChannel<import("discord-api-types/v10").ChannelType> | import("./channels").DMChannel | import("./channels").CategoryChannel | undefined>;
+    channel(force?: boolean): Promise<import("./channels").BaseChannel<import("../types").ChannelType> | import("./channels").DMChannel | import("./channels").CategoryChannel | undefined>;
     /**
      * Retrieves the avatar URL of the webhook.
      * @param options The image options for the avatar.

package/lib/structures/Webhook.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Webhook = void 0;
-const AnonymousGuild_1 = require("./AnonymousGuild");
-const User_1 = require("./User");
 const DiscordBase_1 = require("./extra/DiscordBase");
+const transformers_1 = require("../client/transformers");
 /**
  * Represents a Discord webhook.
  */
@@ -22,10 +21,10 @@ class Webhook extends DiscordBase_1.DiscordBase {
     constructor(client, data) {
         super(client, data);
         if (data.user) {
-            this.user = new User_1.User(this.client, data.user);
+            this.user = transformers_1.Transformers.User(this.client, data.user);
         }
         if (data.source_guild) {
-            this.sourceGuild = new AnonymousGuild_1.AnonymousGuild(this.client, data.source_guild);
+            this.sourceGuild = transformers_1.Transformers.AnonymousGuild(this.client, data.source_guild);
         }
         Object.assign(this, {
             messages: Webhook.messages({ client, webhookId: this.id, webhookToken: this.token }),
@@ -36,7 +35,7 @@ class Webhook extends DiscordBase_1.DiscordBase {
      * @param force Whether to force fetching the guild even if it's already cached.
      * @returns A promise that resolves to the guild associated with the webhook, or undefined if not applicable.
      */
-    guild(force = false) {
+    async guild(force = false) {
         if (!this.sourceGuild?.id)
             return;
         return this.client.guilds.fetch(this.sourceGuild.id, force);
@@ -66,7 +65,7 @@ class Webhook extends DiscordBase_1.DiscordBase {
      * Fetches the webhook data from the Discord API.
      * @returns A promise that resolves to the fetched webhook data.
      */
-    async fetch() {
+    fetch() {
         return this.client.webhooks.fetch(this.id, this.token);
     }
     /**
@@ -75,7 +74,7 @@ class Webhook extends DiscordBase_1.DiscordBase {
      * @param reason The reason for editing the webhook.
      * @returns A promise that resolves when the webhook is successfully edited.
      */
-    async edit(body, reason) {
+    edit(body, reason) {
         return this.client.webhooks.edit(this.id, body, { reason, token: this.token });
     }
     /**

package/lib/structures/channels.d.ts

@@ -1,10 +1,11 @@
-import { ChannelType, VideoQualityMode, type APIChannelBase, type APIDMChannel, type APIGuildCategoryChannel, type APIGuildChannel, type APIGuildForumChannel, type APIGuildForumDefaultReactionEmoji, type APIGuildForumTag, type APIGuildMediaChannel, type APIGuildStageVoiceChannel, type APIGuildVoiceChannel, type APINewsChannel, type APITextChannel, type APIThreadChannel, type RESTGetAPIChannelMessageReactionUsersQuery, type RESTPatchAPIChannelJSONBody, type RESTPatchAPIGuildChannelPositionsJSONBody, type RESTPostAPIChannelWebhookJSONBody, type RESTPostAPIGuildChannelJSONBody, type RESTPostAPIGuildForumThreadsJSONBody, type SortOrderType, type ThreadAutoArchiveDuration } from 'discord-api-types/v10';
+import { type APIChannelBase, type RESTPatchAPIChannelJSONBody, type RESTPostAPIGuildChannelJSONBody, type RESTPatchAPIGuildChannelPositionsJSONBody, type APIGuildChannel, type RESTGetAPIChannelMessageReactionUsersQuery, type APITextChannel, type APIGuildForumTag, type ThreadAutoArchiveDuration, type APIGuildForumDefaultReactionEmoji, type SortOrderType, type RESTPostAPIGuildForumThreadsJSONBody, type RESTPostAPIChannelWebhookJSONBody, type APIDMChannel, type APIGuildVoiceChannel, type APIGuildStageVoiceChannel, type APIGuildMediaChannel, type APIGuildForumChannel, type APIThreadChannel, type APIGuildCategoryChannel, type APINewsChannel, ChannelType, VideoQualityMode } from '../types';
 import type { UsingClient } from '../commands';
 import type { EmojiResolvable, MessageCreateBodyRequest, MessageUpdateBodyRequest, MethodContext, ObjectToLower, StringToNumber, ToClass } from '../common';
 import type { GuildMember } from './GuildMember';
 import type { GuildRole } from './GuildRole';
 import { DiscordBase } from './extra/DiscordBase';
 import { Collection, type RawFile } from '..';
+import { type BaseChannelStructure, type BaseGuildChannelStructure, type CategoryChannelStructure, type DMChannelStructure, type DirectoryChannelStructure, type ForumChannelStructure, type MediaChannelStructure, type NewsChannelStructure, type StageChannelStructure, type TextGuildChannelStructure, type ThreadChannelStructure, type VoiceChannelStructure } from '../client/transformers';
 export declare class BaseChannel<T extends ChannelType> extends DiscordBase<APIChannelBase<ChannelType>> {
     type: T;
     constructor(client: UsingClient, data: APIChannelBase<ChannelType>);
@@ -15,7 +16,7 @@ export declare class BaseChannel<T extends ChannelType> extends DiscordBase<APIC
     fetch(force?: boolean): Promise<AllChannels>;
     delete(reason?: string): Promise<AllChannels>;
     edit(body: RESTPatchAPIChannelJSONBody, reason?: string): Promise<AllChannels>;
-    toString(): string;
+    toString(): `<#${string}>`;
     isStage(): this is StageChannel;
     isMedia(): this is MediaChannel;
     isDM(): this is DMChannel;
@@ -100,7 +101,7 @@ export declare class BaseGuildChannel extends BaseChannel<ChannelType> {
             guildId: string;
         } | undefined;
     }>;
-    guild(force?: boolean): Promise<import("./Guild").Guild<"cached"> | import("./Guild").Guild<"api">>;
+    guild(force?: boolean): Promise<import("./Guild").Guild<"api">>;
     get url(): string;
     setPosition(position: number, reason?: string): Promise<AllChannels>;
     setName(name: string, reason?: string): Promise<AllChannels>;
@@ -160,7 +161,7 @@ export interface TextBaseGuildChannel extends ObjectToLower<Omit<APITextChannel,
 }
 export declare class TextBaseGuildChannel extends BaseGuildChannel {
 }
-export default function channelFrom(data: APIChannelBase<ChannelType>, client: UsingClient): AllChannels;
+export declare function channelFrom(data: APIChannelBase<ChannelType>, client: UsingClient): AllChannels;
 export interface TopicableGuildChannel extends BaseChannel<ChannelType> {
 }
 export declare class TopicableGuildChannel extends DiscordBase {
@@ -272,13 +273,13 @@ export interface NewsChannel extends ObjectToLower<APINewsChannel>, WebhookChann
 }
 export declare class NewsChannel extends BaseChannel<ChannelType.GuildAnnouncement> {
     type: ChannelType.GuildAnnouncement;
-    addFollower(webhookChannelId: string, reason?: string): Promise<import("discord-api-types/v10").APIFollowedChannel>;
+    addFollower(webhookChannelId: string, reason?: string): Promise<import("../types").APIFollowedChannel>;
 }
 export declare class DirectoryChannel extends BaseChannel<ChannelType.GuildDirectory> {
 }
-export type AllGuildChannels = TextGuildChannel | VoiceChannel | MediaChannel | ForumChannel | ThreadChannel | CategoryChannel | NewsChannel | DirectoryChannel | StageChannel;
-export type AllTextableChannels = TextGuildChannel | VoiceChannel | DMChannel | NewsChannel | ThreadChannel;
-export type AllGuildTextableChannels = TextGuildChannel | VoiceChannel | NewsChannel | ThreadChannel;
-export type AllGuildVoiceChannels = VoiceChannel | StageChannel;
-export type AllChannels = BaseChannel<ChannelType> | BaseGuildChannel | TextGuildChannel | DMChannel | VoiceChannel | MediaChannel | ForumChannel | ThreadChannel | CategoryChannel | NewsChannel | DirectoryChannel | StageChannel;
+export type AllGuildChannels = TextGuildChannelStructure | VoiceChannelStructure | MediaChannelStructure | ForumChannelStructure | ThreadChannelStructure | CategoryChannelStructure | NewsChannelStructure | DirectoryChannelStructure | StageChannelStructure;
+export type AllTextableChannels = TextGuildChannelStructure | VoiceChannelStructure | DMChannelStructure | NewsChannelStructure | ThreadChannelStructure;
+export type AllGuildTextableChannels = TextGuildChannelStructure | VoiceChannelStructure | NewsChannelStructure | ThreadChannelStructure;
+export type AllGuildVoiceChannels = VoiceChannelStructure | StageChannelStructure;
+export type AllChannels = BaseChannelStructure | BaseGuildChannelStructure | TextGuildChannelStructure | DMChannelStructure | VoiceChannelStructure | MediaChannelStructure | ForumChannelStructure | ThreadChannelStructure | CategoryChannelStructure | NewsChannelStructure | DirectoryChannelStructure | StageChannelStructure;
 export {};

package/lib/structures/channels.js

@@ -7,12 +7,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DirectoryChannel = exports.NewsChannel = exports.CategoryChannel = exports.ThreadChannel = exports.ForumChannel = exports.MediaChannel = exports.StageChannel = exports.VoiceChannel = exports.DMChannel = exports.TextGuildChannel = exports.WebhookChannelMethods = exports.WebhookGuildMethods = exports.VoiceChannelMethods = exports.ThreadOnlyMethods = exports.TopicableGuildChannel = exports.TextBaseGuildChannel = exports.MessagesMethods = exports.BaseGuildChannel = exports.BaseChannel = void 0;
-const v10_1 = require("discord-api-types/v10");
-const ts_mixer_1 = require("ts-mixer");
+exports.channelFrom = channelFrom;
+const types_1 = require("../types");
 const builders_1 = require("../builders");
 const DiscordBase_1 = require("./extra/DiscordBase");
-const functions_1 = require("./extra/functions");
 const __1 = require("..");
+const transformers_1 = require("../client/transformers");
+const mixer_1 = require("../deps/mixer");
 class BaseChannel extends DiscordBase_1.DiscordBase {
     constructor(client, data) {
         super(client, data);
@@ -22,7 +23,7 @@ class BaseChannel extends DiscordBase_1.DiscordBase {
     }
     /** The URL to the channel */
     get url() {
-        return (0, functions_1.channelLink)(this.id);
+        return __1.Formatter.channelLink(this.id);
     }
     fetch(force = false) {
         return this.client.channels.fetch(this.id, force);
@@ -37,37 +38,37 @@ class BaseChannel extends DiscordBase_1.DiscordBase {
         });
     }
     toString() {
-        return `<#${this.id}>`;
+        return __1.Formatter.channelMention(this.id);
     }
     isStage() {
-        return this.type === v10_1.ChannelType.GuildStageVoice;
+        return this.type === types_1.ChannelType.GuildStageVoice;
     }
     isMedia() {
-        return this.type === v10_1.ChannelType.GuildMedia;
+        return this.type === types_1.ChannelType.GuildMedia;
     }
     isDM() {
-        return [v10_1.ChannelType.DM, v10_1.ChannelType.GroupDM].includes(this.type);
+        return [types_1.ChannelType.DM, types_1.ChannelType.GroupDM].includes(this.type);
     }
     isForum() {
-        return this.type === v10_1.ChannelType.GuildForum;
+        return this.type === types_1.ChannelType.GuildForum;
     }
     isThread() {
-        return [v10_1.ChannelType.PublicThread, v10_1.ChannelType.PrivateThread, v10_1.ChannelType.AnnouncementThread].includes(this.type);
+        return [types_1.ChannelType.PublicThread, types_1.ChannelType.PrivateThread, types_1.ChannelType.AnnouncementThread].includes(this.type);
     }
     isDirectory() {
-        return this.type === v10_1.ChannelType.GuildDirectory;
+        return this.type === types_1.ChannelType.GuildDirectory;
     }
     isVoice() {
-        return this.type === v10_1.ChannelType.GuildVoice;
+        return this.type === types_1.ChannelType.GuildVoice;
     }
     isTextGuild() {
-        return this.type === v10_1.ChannelType.GuildText;
+        return this.type === types_1.ChannelType.GuildText;
     }
     isCategory() {
-        return this.type === v10_1.ChannelType.GuildCategory;
+        return this.type === types_1.ChannelType.GuildCategory;
     }
     isNews() {
-        return this.type === v10_1.ChannelType.GuildAnnouncement;
+        return this.type === types_1.ChannelType.GuildAnnouncement;
     }
     isTextable() {
         return 'messages' in this;
@@ -79,7 +80,7 @@ class BaseChannel extends DiscordBase_1.DiscordBase {
         return this.isForum() || this.isMedia();
     }
     is(channelTypes) {
-        return channelTypes.some(x => v10_1.ChannelType[x] === this.type);
+        return channelTypes.some(x => types_1.ChannelType[x] === this.type);
     }
     static allMethods(ctx) {
         return {
@@ -115,7 +116,7 @@ class BaseGuildChannel extends BaseChannel {
         return this.client.guilds.fetch(this.guildId, force);
     }
     get url() {
-        return (0, functions_1.channelLink)(this.id, this.guildId);
+        return __1.Formatter.channelLink(this.id, this.guildId);
     }
     setPosition(position, reason) {
         return this.edit({ position }, reason);
@@ -168,22 +169,27 @@ class MessagesMethods extends DiscordBase_1.DiscordBase {
     }
     static transformMessageBody(body, files, self) {
         const poll = body.poll;
-        return {
+        const payload = {
             allowed_mentions: self.options?.allowedMentions,
             ...body,
             components: body.components?.map(x => (x instanceof builders_1.ActionRow ? x.toJSON() : x)) ?? undefined,
             embeds: body.embeds?.map(x => (x instanceof builders_1.Embed ? x.toJSON() : x)) ?? undefined,
-            attachments: 'attachments' in body
-                ? body.attachments?.map((x, i) => ({
-                    id: i,
-                    ...(0, builders_1.resolveAttachment)(x),
-                })) ?? undefined
-                : files?.map((x, id) => ({
-                    id,
-                    filename: x.name,
-                })),
             poll: poll ? (poll instanceof builders_1.PollBuilder ? poll.toJSON() : poll) : undefined,
         };
+        if ('attachments' in body) {
+            payload.attachments =
+                body.attachments?.map((x, i) => ({
+                    id: i,
+                    ...(0, builders_1.resolveAttachment)(x),
+                })) ?? undefined;
+        }
+        else if (files?.length) {
+            payload.attachments = files?.map((x, id) => ({
+                id,
+                filename: x.name,
+            }));
+        }
+        return payload;
     }
 }
 exports.MessagesMethods = MessagesMethods;
@@ -191,40 +197,39 @@ let TextBaseGuildChannel = class TextBaseGuildChannel extends BaseGuildChannel {
 };
 exports.TextBaseGuildChannel = TextBaseGuildChannel;
 exports.TextBaseGuildChannel = TextBaseGuildChannel = __decorate([
-    (0, ts_mixer_1.mix)(MessagesMethods)
+    (0, mixer_1.mix)(MessagesMethods)
 ], TextBaseGuildChannel);
 function channelFrom(data, client) {
     switch (data.type) {
-        case v10_1.ChannelType.GuildStageVoice:
-            return new StageChannel(client, data);
-        case v10_1.ChannelType.GuildMedia:
-            return new MediaChannel(client, data);
-        case v10_1.ChannelType.DM:
-            return new DMChannel(client, data);
-        case v10_1.ChannelType.GuildForum:
-            return new ForumChannel(client, data);
-        case v10_1.ChannelType.AnnouncementThread:
-        case v10_1.ChannelType.PrivateThread:
-        case v10_1.ChannelType.PublicThread:
-            return new ThreadChannel(client, data);
-        case v10_1.ChannelType.GuildDirectory:
-            return new DirectoryChannel(client, data);
-        case v10_1.ChannelType.GuildVoice:
-            return new VoiceChannel(client, data);
-        case v10_1.ChannelType.GuildText:
-            return new TextGuildChannel(client, data);
-        case v10_1.ChannelType.GuildCategory:
-            return new CategoryChannel(client, data);
-        case v10_1.ChannelType.GuildAnnouncement:
-            return new NewsChannel(client, data);
+        case types_1.ChannelType.GuildStageVoice:
+            return transformers_1.Transformers.StageChannel(client, data);
+        case types_1.ChannelType.GuildMedia:
+            return transformers_1.Transformers.MediaChannel(client, data);
+        case types_1.ChannelType.DM:
+            return transformers_1.Transformers.DMChannel(client, data);
+        case types_1.ChannelType.GuildForum:
+            return transformers_1.Transformers.ForumChannel(client, data);
+        case types_1.ChannelType.AnnouncementThread:
+        case types_1.ChannelType.PrivateThread:
+        case types_1.ChannelType.PublicThread:
+            return transformers_1.Transformers.ThreadChannel(client, data);
+        case types_1.ChannelType.GuildDirectory:
+            return transformers_1.Transformers.DirectoryChannel(client, data);
+        case types_1.ChannelType.GuildVoice:
+            return transformers_1.Transformers.VoiceChannel(client, data);
+        case types_1.ChannelType.GuildText:
+            return transformers_1.Transformers.TextGuildChannel(client, data);
+        case types_1.ChannelType.GuildCategory:
+            return transformers_1.Transformers.CategoryChannel(client, data);
+        case types_1.ChannelType.GuildAnnouncement:
+            return transformers_1.Transformers.NewsChannel(client, data);
         default:
             if ('guild_id' in data) {
-                return new BaseGuildChannel(client, data);
+                return transformers_1.Transformers.BaseGuildChannel(client, data);
             }
-            return new BaseChannel(client, data);
+            return transformers_1.Transformers.BaseChannel(client, data);
     }
 }
-exports.default = channelFrom;
 class TopicableGuildChannel extends DiscordBase_1.DiscordBase {
     setTopic(topic, reason) {
         return this.edit({ topic }, reason);
@@ -253,7 +258,7 @@ let ThreadOnlyMethods = class ThreadOnlyMethods extends DiscordBase_1.DiscordBas
 };
 exports.ThreadOnlyMethods = ThreadOnlyMethods;
 exports.ThreadOnlyMethods = ThreadOnlyMethods = __decorate([
-    (0, ts_mixer_1.mix)(TopicableGuildChannel)
+    (0, mixer_1.mix)(TopicableGuildChannel)
 ], ThreadOnlyMethods);
 class VoiceChannelMethods extends DiscordBase_1.DiscordBase {
     guildId;
@@ -267,7 +272,7 @@ class VoiceChannelMethods extends DiscordBase_1.DiscordBase {
         return this.edit({ rtc_region }, reason);
     }
     setVideoQuality(quality, reason) {
-        return this.edit({ video_quality_mode: v10_1.VideoQualityMode[quality] }, reason);
+        return this.edit({ video_quality_mode: types_1.VideoQualityMode[quality] }, reason);
     }
     setVoiceState(status = null) {
         return this.client.channels.setVoiceStatus(this.id, status);
@@ -327,37 +332,37 @@ let TextGuildChannel = class TextGuildChannel extends BaseGuildChannel {
 };
 exports.TextGuildChannel = TextGuildChannel;
 exports.TextGuildChannel = TextGuildChannel = __decorate([
-    (0, ts_mixer_1.mix)(TextBaseGuildChannel, WebhookChannelMethods)
+    (0, mixer_1.mix)(TextBaseGuildChannel, WebhookChannelMethods)
 ], TextGuildChannel);
 let DMChannel = class DMChannel extends BaseChannel {
 };
 exports.DMChannel = DMChannel;
 exports.DMChannel = DMChannel = __decorate([
-    (0, ts_mixer_1.mix)(MessagesMethods)
+    (0, mixer_1.mix)(MessagesMethods)
 ], DMChannel);
 let VoiceChannel = class VoiceChannel extends BaseChannel {
 };
 exports.VoiceChannel = VoiceChannel;
 exports.VoiceChannel = VoiceChannel = __decorate([
-    (0, ts_mixer_1.mix)(TextGuildChannel, WebhookChannelMethods, VoiceChannelMethods)
+    (0, mixer_1.mix)(TextGuildChannel, WebhookChannelMethods, VoiceChannelMethods)
 ], VoiceChannel);
 let StageChannel = class StageChannel extends BaseChannel {
 };
 exports.StageChannel = StageChannel;
 exports.StageChannel = StageChannel = __decorate([
-    (0, ts_mixer_1.mix)(TopicableGuildChannel, VoiceChannelMethods)
+    (0, mixer_1.mix)(TopicableGuildChannel, VoiceChannelMethods)
 ], StageChannel);
 let MediaChannel = class MediaChannel extends BaseChannel {
 };
 exports.MediaChannel = MediaChannel;
 exports.MediaChannel = MediaChannel = __decorate([
-    (0, ts_mixer_1.mix)(ThreadOnlyMethods)
+    (0, mixer_1.mix)(ThreadOnlyMethods)
 ], MediaChannel);
 let ForumChannel = class ForumChannel extends BaseChannel {
 };
 exports.ForumChannel = ForumChannel;
 exports.ForumChannel = ForumChannel = __decorate([
-    (0, ts_mixer_1.mix)(ThreadOnlyMethods, WebhookChannelMethods)
+    (0, mixer_1.mix)(ThreadOnlyMethods, WebhookChannelMethods)
 ], ForumChannel);
 let ThreadChannel = class ThreadChannel extends BaseChannel {
     webhooks = WebhookChannelMethods.channel({
@@ -376,10 +381,10 @@ let ThreadChannel = class ThreadChannel extends BaseChannel {
         return this.edit({ rate_limit_per_user });
     }
     pin(reason) {
-        return this.edit({ flags: (this.flags ?? 0) | v10_1.ChannelFlags.Pinned }, reason);
+        return this.edit({ flags: (this.flags ?? 0) | types_1.ChannelFlags.Pinned }, reason);
     }
     unpin(reason) {
-        return this.edit({ flags: (this.flags ?? 0) & ~v10_1.ChannelFlags.Pinned }, reason);
+        return this.edit({ flags: (this.flags ?? 0) & ~types_1.ChannelFlags.Pinned }, reason);
     }
     setTags(applied_tags, reason) {
         /**
@@ -403,7 +408,7 @@ let ThreadChannel = class ThreadChannel extends BaseChannel {
 };
 exports.ThreadChannel = ThreadChannel;
 exports.ThreadChannel = ThreadChannel = __decorate([
-    (0, ts_mixer_1.mix)(TextBaseGuildChannel)
+    (0, mixer_1.mix)(TextBaseGuildChannel)
 ], ThreadChannel);
 class CategoryChannel extends BaseGuildChannel {
 }
@@ -415,7 +420,7 @@ let NewsChannel = class NewsChannel extends BaseChannel {
 };
 exports.NewsChannel = NewsChannel;
 exports.NewsChannel = NewsChannel = __decorate([
-    (0, ts_mixer_1.mix)(WebhookChannelMethods)
+    (0, mixer_1.mix)(WebhookChannelMethods)
 ], NewsChannel);
 class DirectoryChannel extends BaseChannel {
 }