seyfert 1.5.0 → 2.0.0

package/lib/structures/Interaction.js

@@ -5,22 +5,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModalSubmitInteraction = exports.MessageCommandInteraction = exports.UserCommandInteraction = exports.ChatInputCommandInteraction = exports.UserSelectMenuInteraction = exports.RoleSelectMenuInteraction = exports.MentionableSelectMenuInteraction = exports.ChannelSelectMenuInteraction = exports.StringSelectMenuInteraction = exports.SelectMenuInteraction = exports.ButtonInteraction = exports.ComponentInteraction = exports.ApplicationCommandInteraction = exports.Interaction = exports.AutocompleteInteraction = exports.BaseInteraction = void 0;
-const v10_1 = require("discord-api-types/v10");
-const ts_mixer_1 = require("ts-mixer");
+const types_1 = require("../types");
 const builders_1 = require("../builders");
-const commands_1 = require("../commands");
 const _1 = require("./");
-const GuildRole_1 = require("./GuildRole");
-const Message_1 = require("./Message");
-const User_1 = require("./User");
-const channels_1 = __importDefault(require("./channels"));
 const DiscordBase_1 = require("./extra/DiscordBase");
 const Permissions_1 = require("./extra/Permissions");
+const transformers_1 = require("../client/transformers");
+const mixer_1 = require("../deps/mixer");
+const Entitlement_1 = require("./Entitlement");
 class BaseInteraction extends DiscordBase_1.DiscordBase {
     client;
     __reply;
@@ -35,49 +29,35 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
         this.client = client;
         this.__reply = __reply;
         if (interaction.member) {
-            this.member = new _1.InteractionGuildMember(client, interaction.member, interaction.member.user, interaction.guild_id);
+            this.member = transformers_1.Transformers.InteractionGuildMember(client, interaction.member, interaction.member.user, interaction.guild_id);
         }
         if (interaction.message) {
-            this.message = new Message_1.Message(client, interaction.message);
+            this.message = transformers_1.Transformers.Message(client, interaction.message);
         }
         if (interaction.app_permissions) {
             this.appPermissions = new Permissions_1.PermissionsBitField(Number(interaction.app_permissions));
         }
         if (interaction.channel) {
-            this.channel = (0, channels_1.default)(interaction.channel, client);
+            this.channel = (0, _1.channelFrom)(interaction.channel, client);
         }
-        this.user = this.member?.user ?? new User_1.User(client, interaction.user);
+        this.user = this.member?.user ?? transformers_1.Transformers.User(client, interaction.user);
+        this.entitlements = interaction.entitlements.map(e => new Entitlement_1.Entitlement(this.client, e));
     }
     static transformBodyRequest(body, files, self) {
         switch (body.type) {
-            case v10_1.InteractionResponseType.ApplicationCommandAutocompleteResult:
-            case v10_1.InteractionResponseType.DeferredMessageUpdate:
-            case v10_1.InteractionResponseType.DeferredChannelMessageWithSource:
+            case types_1.InteractionResponseType.ApplicationCommandAutocompleteResult:
+            case types_1.InteractionResponseType.DeferredMessageUpdate:
+            case types_1.InteractionResponseType.DeferredChannelMessageWithSource:
                 return body;
-            case v10_1.InteractionResponseType.ChannelMessageWithSource:
-            case v10_1.InteractionResponseType.UpdateMessage: {
-                const poll = body.poll;
+            case types_1.InteractionResponseType.ChannelMessageWithSource:
+            case types_1.InteractionResponseType.UpdateMessage: {
                 return {
                     type: body.type,
                     //@ts-ignore
-                    data: {
-                        //@ts-ignore
-                        allowed_mentions: self.options?.allowedMentions,
-                        ...(body.data ?? {}),
-                        //@ts-ignore
-                        components: body.data?.components?.map(x => (x instanceof builders_1.ActionRow ? x.toJSON() : x)),
-                        embeds: body.data?.embeds?.map(x => (x instanceof builders_1.Embed ? x.toJSON() : x)),
-                        attachments: body.data && 'attachments' in body.data
-                            ? body.data.attachments?.map((x, i) => ({ id: i, ...(0, builders_1.resolveAttachment)(x) }))
-                            : files?.map((x, id) => ({
-                                id,
-                                filename: x.name,
-                            })),
-                        poll: poll ? (poll instanceof builders_1.PollBuilder ? poll.toJSON() : poll) : undefined,
-                    },
+                    data: BaseInteraction.transformBody(body.data ?? {}, files, self),
                 };
             }
-            case v10_1.InteractionResponseType.Modal:
+            case types_1.InteractionResponseType.Modal:
                 return {
                     type: body.type,
                     data: body.data instanceof builders_1.Modal
@@ -97,19 +77,27 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
     }
     static transformBody(body, files, self) {
         const poll = body.poll;
-        return {
+        const payload = {
             allowed_mentions: self.options?.allowedMentions,
-            attachments: 'attachments' in body
-                ? body.attachments?.map((x, i) => ({ id: i, ...(0, builders_1.resolveAttachment)(x) }))
-                : files?.map((x, id) => ({
-                    id,
-                    filename: x.name,
-                })),
             ...body,
             components: body.components?.map(x => (x instanceof builders_1.ActionRow ? x.toJSON() : x)),
             embeds: body?.embeds?.map(x => (x instanceof builders_1.Embed ? x.toJSON() : x)),
             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;
     }
     async matchReplied(body) {
         if (this.__reply) {
@@ -137,43 +125,76 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
     }
     deferReply(flags) {
         return this.reply({
-            type: v10_1.InteractionResponseType.DeferredChannelMessageWithSource,
+            type: types_1.InteractionResponseType.DeferredChannelMessageWithSource,
             data: {
                 flags,
             },
         });
     }
+    isButton() {
+        return false;
+    }
+    isChannelSelectMenu() {
+        return false;
+    }
+    isRoleSelectMenu() {
+        return false;
+    }
+    isMentionableSelectMenu() {
+        return false;
+    }
+    isUserSelectMenu() {
+        return false;
+    }
+    isStringSelectMenu() {
+        return false;
+    }
+    isChatInput() {
+        return false;
+    }
+    isUser() {
+        return false;
+    }
+    isMessage() {
+        return false;
+    }
+    isAutocomplete() {
+        return false;
+    }
+    isModal() {
+        return false;
+    }
     static from(client, gateway, __reply) {
         switch (gateway.type) {
-            case v10_1.InteractionType.ApplicationCommandAutocomplete:
+            case types_1.InteractionType.ApplicationCommandAutocomplete:
                 return new AutocompleteInteraction(client, gateway, undefined, __reply);
             // biome-ignore lint/suspicious/noFallthroughSwitchClause: bad interaction  between biome and ts-server
-            case v10_1.InteractionType.ApplicationCommand:
+            case types_1.InteractionType.ApplicationCommand:
                 switch (gateway.data.type) {
-                    case v10_1.ApplicationCommandType.ChatInput:
+                    case types_1.ApplicationCommandType.ChatInput:
                         return new ChatInputCommandInteraction(client, gateway, __reply);
-                    case v10_1.ApplicationCommandType.User:
+                    case types_1.ApplicationCommandType.User:
                         return new UserCommandInteraction(client, gateway, __reply);
-                    case v10_1.ApplicationCommandType.Message:
+                    case types_1.ApplicationCommandType.Message:
                         return new MessageCommandInteraction(client, gateway, __reply);
                 }
             // biome-ignore lint/suspicious/noFallthroughSwitchClause: bad interaction  between biome and ts-server
-            case v10_1.InteractionType.MessageComponent:
+            case types_1.InteractionType.MessageComponent:
                 switch (gateway.data.component_type) {
-                    case v10_1.ComponentType.Button:
+                    case types_1.ComponentType.Button:
                         return new ButtonInteraction(client, gateway, __reply);
-                    case v10_1.ComponentType.ChannelSelect:
+                    case types_1.ComponentType.ChannelSelect:
                         return new ChannelSelectMenuInteraction(client, gateway, __reply);
-                    case v10_1.ComponentType.RoleSelect:
+                    case types_1.ComponentType.RoleSelect:
                         return new RoleSelectMenuInteraction(client, gateway, __reply);
-                    case v10_1.ComponentType.MentionableSelect:
+                    case types_1.ComponentType.MentionableSelect:
                         return new MentionableSelectMenuInteraction(client, gateway, __reply);
-                    case v10_1.ComponentType.UserSelect:
+                    case types_1.ComponentType.UserSelect:
                         return new UserSelectMenuInteraction(client, gateway, __reply);
-                    case v10_1.ComponentType.StringSelect:
+                    case types_1.ComponentType.StringSelect:
                         return new StringSelectMenuInteraction(client, gateway, __reply);
                 }
-            case v10_1.InteractionType.ModalSubmit:
+            case types_1.InteractionType.ModalSubmit:
                 return new ModalSubmitInteraction(client, gateway);
             default:
                 return new BaseInteraction(client, gateway);
@@ -192,13 +213,16 @@ class AutocompleteInteraction extends BaseInteraction {
         this.__reply = __reply;
         this.options =
             resolver ??
-                new commands_1.OptionResolver(client, interaction.data.options, undefined, interaction.guild_id, interaction.data.resolved);
+                transformers_1.Transformers.OptionResolver(client, interaction.data.options, undefined, interaction.guild_id, interaction.data.resolved);
     }
     getInput() {
         return this.options.getAutocompleteValue() ?? '';
     }
     respond(choices) {
-        return super.reply({ data: { choices }, type: v10_1.InteractionResponseType.ApplicationCommandAutocompleteResult });
+        return super.reply({ data: { choices }, type: types_1.InteractionResponseType.ApplicationCommandAutocompleteResult });
+    }
+    isAutocomplete() {
+        return true;
     }
     /** @intenal */
     async reply(..._args) {
@@ -215,7 +239,7 @@ class Interaction extends BaseInteraction {
     }
     async write(body, fetchReply) {
         (await this.reply({
-            type: v10_1.InteractionResponseType.ChannelMessageWithSource,
+            type: types_1.InteractionResponseType.ChannelMessageWithSource,
             data: body,
         }));
         if (fetchReply)
@@ -224,7 +248,7 @@ class Interaction extends BaseInteraction {
     }
     modal(body) {
         return this.reply({
-            type: v10_1.InteractionResponseType.Modal,
+            type: types_1.InteractionResponseType.Modal,
             data: body,
         });
     }
@@ -247,13 +271,13 @@ class Interaction extends BaseInteraction {
     deleteMessage(messageId) {
         return this.client.interactions.deleteResponse(this.id, this.token, messageId);
     }
-    async followup(body) {
+    followup(body) {
         return this.client.interactions.followup(this.token, body);
     }
 }
 exports.Interaction = Interaction;
 class ApplicationCommandInteraction extends Interaction {
-    type = v10_1.ApplicationCommandType.ChatInput;
+    type;
     respond(data) {
         return this.reply(data);
     }
@@ -262,13 +286,13 @@ exports.ApplicationCommandInteraction = ApplicationCommandInteraction;
 class ComponentInteraction extends Interaction {
     update(data) {
         return this.reply({
-            type: v10_1.InteractionResponseType.UpdateMessage,
+            type: types_1.InteractionResponseType.UpdateMessage,
             data,
         });
     }
     deferUpdate() {
         return this.reply({
-            type: v10_1.InteractionResponseType.DeferredMessageUpdate,
+            type: types_1.InteractionResponseType.DeferredMessageUpdate,
         });
     }
     get customId() {
@@ -277,27 +301,12 @@ class ComponentInteraction extends Interaction {
     get componentType() {
         return this.data.componentType;
     }
-    isButton() {
-        return this.data.componentType === v10_1.ComponentType.Button;
-    }
-    isChannelSelectMenu() {
-        return this.componentType === v10_1.ComponentType.ChannelSelect;
-    }
-    isRoleSelectMenu() {
-        return this.componentType === v10_1.ComponentType.RoleSelect;
-    }
-    isMentionableSelectMenu() {
-        return this.componentType === v10_1.ComponentType.MentionableSelect;
-    }
-    isUserSelectMenu() {
-        return this.componentType === v10_1.ComponentType.UserSelect;
-    }
-    isStringSelectMenu() {
-        return this.componentType === v10_1.ComponentType.StringSelect;
-    }
 }
 exports.ComponentInteraction = ComponentInteraction;
 class ButtonInteraction extends ComponentInteraction {
+    isButton() {
+        return true;
+    }
 }
 exports.ButtonInteraction = ButtonInteraction;
 class SelectMenuInteraction extends ComponentInteraction {
@@ -312,6 +321,9 @@ class SelectMenuInteraction extends ComponentInteraction {
 }
 exports.SelectMenuInteraction = SelectMenuInteraction;
 class StringSelectMenuInteraction extends SelectMenuInteraction {
+    isStringSelectMenu() {
+        return true;
+    }
 }
 exports.StringSelectMenuInteraction = StringSelectMenuInteraction;
 class ChannelSelectMenuInteraction extends SelectMenuInteraction {
@@ -321,7 +333,10 @@ class ChannelSelectMenuInteraction extends SelectMenuInteraction {
         super(client, interaction);
         this.__reply = __reply;
         const resolved = interaction.data.resolved;
-        this.channels = this.values.map(x => (0, channels_1.default)(resolved.channels[x], this.client));
+        this.channels = this.values.map(x => (0, _1.channelFrom)(resolved.channels[x], this.client));
+    }
+    isChannelSelectMenu() {
+        return true;
     }
 }
 exports.ChannelSelectMenuInteraction = ChannelSelectMenuInteraction;
@@ -335,12 +350,15 @@ class MentionableSelectMenuInteraction extends SelectMenuInteraction {
         this.__reply = __reply;
         const resolved = interaction.data.resolved;
         this.roles = resolved.roles
-            ? this.values.map(x => new GuildRole_1.GuildRole(this.client, resolved.roles[x], this.guildId))
+            ? this.values.map(x => transformers_1.Transformers.GuildRole(this.client, resolved.roles[x], this.guildId))
             : [];
         this.members = resolved.members
-            ? this.values.map(x => new _1.InteractionGuildMember(this.client, resolved.members[x], this.users.find(u => u.id === x), this.guildId))
+            ? this.values.map(x => transformers_1.Transformers.InteractionGuildMember(this.client, resolved.members[x], resolved.users[this.values.find(u => u === x)], this.guildId))
             : [];
-        this.users = resolved.users ? this.values.map(x => new User_1.User(this.client, resolved.users[x])) : [];
+        this.users = resolved.users ? this.values.map(x => transformers_1.Transformers.User(this.client, resolved.users[x])) : [];
+    }
+    isMentionableSelectMenu() {
+        return true;
     }
 }
 exports.MentionableSelectMenuInteraction = MentionableSelectMenuInteraction;
@@ -351,7 +369,10 @@ class RoleSelectMenuInteraction extends SelectMenuInteraction {
         super(client, interaction);
         this.__reply = __reply;
         const resolved = interaction.data.resolved;
-        this.roles = this.values.map(x => new GuildRole_1.GuildRole(this.client, resolved.roles[x], this.guildId));
+        this.roles = this.values.map(x => transformers_1.Transformers.GuildRole(this.client, resolved.roles[x], this.guildId));
+    }
+    isRoleSelectMenu() {
+        return true;
     }
 }
 exports.RoleSelectMenuInteraction = RoleSelectMenuInteraction;
@@ -363,20 +384,32 @@ class UserSelectMenuInteraction extends SelectMenuInteraction {
         super(client, interaction);
         this.__reply = __reply;
         const resolved = interaction.data.resolved;
-        this.users = this.values.map(x => new User_1.User(this.client, resolved.users[x]));
+        this.users = this.values.map(x => transformers_1.Transformers.User(this.client, resolved.users[x]));
         this.members = resolved.members
-            ? this.values.map(x => new _1.InteractionGuildMember(this.client, resolved.members[x], this.users.find(u => u.id === x), this.guildId))
+            ? this.values.map(x => transformers_1.Transformers.InteractionGuildMember(this.client, resolved.members[x], resolved.users[this.values.find(u => u === x)], this.guildId))
             : [];
     }
+    isUserSelectMenu() {
+        return true;
+    }
 }
 exports.UserSelectMenuInteraction = UserSelectMenuInteraction;
 class ChatInputCommandInteraction extends ApplicationCommandInteraction {
+    isChatInput() {
+        return true;
+    }
 }
 exports.ChatInputCommandInteraction = ChatInputCommandInteraction;
 class UserCommandInteraction extends ApplicationCommandInteraction {
+    isUser() {
+        return true;
+    }
 }
 exports.UserCommandInteraction = UserCommandInteraction;
 class MessageCommandInteraction extends ApplicationCommandInteraction {
+    isMessage() {
+        return true;
+    }
 }
 exports.MessageCommandInteraction = MessageCommandInteraction;
 let ModalSubmitInteraction = class ModalSubmitInteraction extends BaseInteraction {
@@ -399,8 +432,11 @@ let ModalSubmitInteraction = class ModalSubmitInteraction extends BaseInteractio
             throw new Error(`${customId} component doesn't have a value`);
         return value;
     }
+    isModal() {
+        return true;
+    }
 };
 exports.ModalSubmitInteraction = ModalSubmitInteraction;
 exports.ModalSubmitInteraction = ModalSubmitInteraction = __decorate([
-    (0, ts_mixer_1.mix)(Interaction)
+    (0, mixer_1.mix)(Interaction)
 ], ModalSubmitInteraction);

package/lib/structures/Message.d.ts

@@ -1,4 +1,4 @@
-import type { APIChannelMention, APIEmbed, APIMessage, GatewayMessageCreateDispatchData } from 'discord-api-types/v10';
+import type { APIChannelMention, APIEmbed, APIMessage, GatewayMessageCreateDispatchData } from '../types';
 import type { ListenerOptions } from '../builders';
 import type { UsingClient } from '../commands';
 import { type ObjectToLower } from '../common';
@@ -6,35 +6,34 @@ import type { EmojiResolvable } from '../common/types/resolvables';
 import type { MessageCreateBodyRequest, MessageUpdateBodyRequest } from '../common/types/write';
 import type { ActionRowMessageComponents } from '../components';
 import { MessageActionRowComponent } from '../components/ActionRow';
-import { GuildMember } from './GuildMember';
-import { User } from './User';
 import type { MessageWebhookMethodEditParams, MessageWebhookMethodWriteParams } from './Webhook';
 import { DiscordBase } from './extra/DiscordBase';
-import { Embed, Poll } from '..';
+import { Embed } from '..';
+import { type PollStructure, type GuildMemberStructure, type UserStructure } from '../client/transformers';
 export type MessageData = APIMessage | GatewayMessageCreateDispatchData;
 export interface BaseMessage extends DiscordBase, ObjectToLower<Omit<MessageData, 'timestamp' | 'author' | 'mentions' | 'components' | 'poll' | 'embeds'>> {
     timestamp?: number;
     guildId?: string;
-    author: User;
-    member?: GuildMember;
+    author: UserStructure;
+    member?: GuildMemberStructure;
     components: MessageActionRowComponent<ActionRowMessageComponents>[];
-    poll?: Poll;
+    poll?: PollStructure;
     mentions: {
         roles: string[];
         channels: APIChannelMention[];
-        users: (GuildMember | User)[];
+        users: (GuildMemberStructure | UserStructure)[];
     };
 }
 export declare class BaseMessage extends DiscordBase {
     embeds: InMessageEmbed[];
     constructor(client: UsingClient, data: MessageData);
-    get user(): User;
+    get user(): import("./User").User;
     createComponentCollector(options?: ListenerOptions): {
-        run<T extends import("./Interaction").StringSelectMenuInteraction<string[]> | import("./Interaction").ComponentInteraction<boolean, import("discord-api-types/v10").APIMessageComponentInteraction> = import("./Interaction").StringSelectMenuInteraction<string[]> | import("./Interaction").ComponentInteraction<boolean, import("discord-api-types/v10").APIMessageComponentInteraction>>(customId: string | RegExp | string[], callback: import("..").ComponentCallback<T>): any;
-        stop(reason?: string | undefined): any;
+        run<T extends import("../components/handler").CollectorInteraction = import("../components/handler").CollectorInteraction>(customId: string | string[] | RegExp, callback: import("..").ComponentCallback<T>): any;
+        stop(reason?: string): any;
     };
-    get url(): string;
-    guild(force?: boolean): Promise<import("./Guild").Guild<"cached"> | import("./Guild").Guild<"api">> | undefined;
+    get url(): `https://discord.com/channels/${string}/${string}/${string}`;
+    guild(force?: boolean): Promise<import("./Guild").Guild<"api">> | undefined;
     channel(force?: boolean): Promise<import("./channels").AllChannels>;
     react(emoji: EmojiResolvable): Promise<void>;
     private patch;
@@ -56,7 +55,7 @@ export declare class WebhookMessage extends BaseMessage {
     readonly webhookId: string;
     readonly webhookToken: string;
     constructor(client: UsingClient, data: MessageData, webhookId: string, webhookToken: string);
-    fetch(): Promise<import("discord-api-types/v10").RESTGetAPIWebhookWithTokenResult>;
+    fetch(): Promise<import("../types").RESTGetAPIWebhookWithTokenResult>;
     edit(body: EditMessageWebhook): Promise<WebhookMessage>;
     write(body: WriteMessageWebhook): Promise<WebhookMessage | null>;
     delete(reason?: string): Promise<never>;
@@ -68,7 +67,7 @@ export declare class InMessageEmbed {
     /**
      * @deprecated
      */
-    get type(): import("discord-api-types/v10").EmbedType | undefined;
+    get type(): import("../types").EmbedType | undefined;
     get description(): string | undefined;
     get url(): string | undefined;
     get timestamp(): string | undefined;
@@ -96,28 +95,28 @@ export declare class InMessageEmbed {
         height?: number | undefined;
         width?: number | undefined;
     } | undefined;
-    get provider(): import("discord-api-types/v10").APIEmbedProvider | undefined;
+    get provider(): import("../types").APIEmbedProvider | undefined;
     get author(): {
         name: string;
         url?: string | undefined;
         iconUrl?: string | undefined;
         proxyIconUrl?: string | undefined;
     } | undefined;
-    get fields(): import("discord-api-types/v10").APIEmbedField[] | undefined;
+    get fields(): import("../types").APIEmbedField[] | undefined;
     toBuilder(): Embed;
     toJSON(): {
-        title?: string | undefined;
-        type?: import("discord-api-types/v10").EmbedType | undefined;
-        description?: string | undefined;
-        url?: string | undefined;
-        timestamp?: string | undefined;
-        color?: number | undefined;
-        footer?: import("discord-api-types/v10").APIEmbedFooter | undefined;
-        image?: import("discord-api-types/v10").APIEmbedImage | undefined;
-        thumbnail?: import("discord-api-types/v10").APIEmbedThumbnail | undefined;
-        video?: import("discord-api-types/v10").APIEmbedVideo | undefined;
-        provider?: import("discord-api-types/v10").APIEmbedProvider | undefined;
-        author?: import("discord-api-types/v10").APIEmbedAuthor | undefined;
-        fields?: import("discord-api-types/v10").APIEmbedField[] | undefined;
+        title?: string;
+        type?: import("../types").EmbedType;
+        description?: string;
+        url?: string;
+        timestamp?: string;
+        color?: number;
+        footer?: import("../types").APIEmbedFooter;
+        image?: import("../types").APIEmbedImage;
+        thumbnail?: import("../types").APIEmbedThumbnail;
+        video?: import("../types").APIEmbedVideo;
+        provider?: import("../types").APIEmbedProvider;
+        author?: import("../types").APIEmbedAuthor;
+        fields?: import("../types").APIEmbedField[];
     };
 }

package/lib/structures/Message.js

@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InMessageEmbed = exports.WebhookMessage = exports.Message = exports.BaseMessage = void 0;
 const common_1 = require("../common");
 const ActionRow_1 = require("../components/ActionRow");
-const GuildMember_1 = require("./GuildMember");
-const User_1 = require("./User");
 const DiscordBase_1 = require("./extra/DiscordBase");
-const functions_1 = require("./extra/functions");
+const common_2 = require("../common");
 const __1 = require("..");
+const transformers_1 = require("../client/transformers");
 class BaseMessage extends DiscordBase_1.DiscordBase {
     embeds;
     constructor(client, data) {
@@ -28,7 +27,7 @@ class BaseMessage extends DiscordBase_1.DiscordBase {
         return this.client.components.createComponentCollector(this.id, options);
     }
     get url() {
-        return (0, functions_1.messageLink)(this.channelId, this.id, this.guildId);
+        return common_2.Formatter.messageLink(this.guildId, this.channelId, this.id);
     }
     guild(force = false) {
         if (!this.guildId)
@@ -46,21 +45,21 @@ class BaseMessage extends DiscordBase_1.DiscordBase {
             this.timestamp = Date.parse(data.timestamp);
         }
         if ('author' in data && data.author) {
-            this.author = new User_1.User(this.client, data.author);
+            this.author = transformers_1.Transformers.User(this.client, data.author);
         }
         if ('member' in data && data.member) {
-            this.member = new GuildMember_1.GuildMember(this.client, data.member, this.author, this.guildId);
+            this.member = transformers_1.Transformers.GuildMember(this.client, data.member, data.author, this.guildId);
         }
         if (data.mentions?.length) {
             this.mentions.users = this.guildId
-                ? data.mentions.map(m => new GuildMember_1.GuildMember(this.client, {
+                ? data.mentions.map(m => transformers_1.Transformers.GuildMember(this.client, {
                     ...m.member,
                     user: m,
                 }, m, this.guildId))
-                : data.mentions.map(u => new User_1.User(this.client, u));
+                : data.mentions.map(u => transformers_1.Transformers.User(this.client, u));
         }
         if (data.poll) {
-            this.poll = new __1.Poll(this.client, data.poll, this.channelId, this.id);
+            this.poll = transformers_1.Transformers.Poll(this.client, data.poll, this.channelId, this.id);
         }
     }
 }

package/lib/structures/Poll.d.ts

@@ -1,15 +1,16 @@
-import type { APIPoll } from 'discord-api-types/v10';
+import type { APIPoll } from '../types';
 import { type ObjectToLower } from '../common';
 import { Base } from './extra/Base';
 import type { UsingClient } from '../commands';
 import type { ValidAnswerId } from '../api/Routes/channels';
-export interface Poll extends ObjectToLower<Omit<APIPoll, 'expiry'>> {
+export interface Poll extends ObjectToLower<APIPoll> {
 }
 export declare class Poll extends Base {
     readonly channelId: string;
     readonly messageId: string;
-    expiry: number;
     constructor(client: UsingClient, data: APIPoll, channelId: string, messageId: string);
+    get expiryTimestamp(): number;
+    get expiryAt(): Date;
     end(): Promise<import("./Message").Message>;
     getAnswerVoters(id: ValidAnswerId): Promise<import("./User").User[]>;
 }

package/lib/structures/Poll.js

@@ -6,14 +6,18 @@ const Base_1 = require("./extra/Base");
 class Poll extends Base_1.Base {
     channelId;
     messageId;
-    expiry;
     constructor(client, data, channelId, messageId) {
         super(client);
         this.channelId = channelId;
         this.messageId = messageId;
-        this.expiry = Date.parse(data.expiry);
         Object.assign(this, (0, common_1.toCamelCase)(data));
     }
+    get expiryTimestamp() {
+        return Date.parse(this.expiry);
+    }
+    get expiryAt() {
+        return new Date(this.expiry);
+    }
     end() {
         return this.client.messages.endPoll(this.channelId, this.messageId);
     }

package/lib/structures/Sticker.d.ts

@@ -1,18 +1,18 @@
-import type { APISticker, RESTPatchAPIGuildStickerJSONBody, RESTPostAPIGuildStickerFormDataBody } from 'discord-api-types/v10';
+import type { APISticker, RESTPatchAPIGuildStickerJSONBody, RESTPostAPIGuildStickerFormDataBody } from '../types';
 import type { RawFile, UsingClient } from '..';
 import type { Attachment, AttachmentBuilder } from '../builders';
 import type { MethodContext, ObjectToLower } from '../common';
-import { User } from './User';
 import { DiscordBase } from './extra/DiscordBase';
+import { type UserStructure } from '../client/transformers';
 export interface Sticker extends DiscordBase, ObjectToLower<Omit<APISticker, 'user'>> {
 }
 export declare class Sticker extends DiscordBase {
-    user?: User;
+    user?: UserStructure;
     constructor(client: UsingClient, data: APISticker);
-    guild(force?: boolean): Promise<import("./Guild").Guild<"cached"> | import("./Guild").Guild<"api">> | undefined;
-    edit(body: RESTPatchAPIGuildStickerJSONBody, reason?: string): Promise<Sticker> | undefined;
-    fetch(force?: boolean): Promise<Sticker> | undefined;
-    delete(reason?: string): Promise<void> | undefined;
+    guild(force?: boolean): Promise<import("./Guild").Guild<"api"> | undefined>;
+    edit(body: RESTPatchAPIGuildStickerJSONBody, reason?: string): Promise<Sticker | undefined>;
+    fetch(force?: boolean): Promise<Sticker | undefined>;
+    delete(reason?: string): Promise<void>;
     static methods({ client, guildId }: MethodContext<{
         guildId: string;
     }>): {