seyfert 2.0.0 → 2.1.1-dev-11310514874.0

package/lib/structures/Interaction.d.ts

@@ -1,17 +1,19 @@
-import { type APIApplicationCommandAutocompleteInteraction, type APIApplicationCommandInteraction, type APIBaseInteraction, type APIChatInputApplicationCommandInteraction, type APIChatInputApplicationCommandInteractionData, type APICommandAutocompleteInteractionResponseCallbackData, type APIInteraction, type APIInteractionResponse, type APIInteractionResponseChannelMessageWithSource, type APIInteractionResponseDeferredChannelMessageWithSource, type APIInteractionResponseDeferredMessageUpdate, type APIInteractionResponsePong, type APIInteractionResponseUpdateMessage, type APIMessageApplicationCommandInteraction, type APIMessageApplicationCommandInteractionData, type APIMessageButtonInteractionData, type APIMessageComponentInteraction, type APIMessageComponentSelectMenuInteraction, type APIMessageStringSelectInteractionData, type APIModalSubmission, type APIModalSubmitInteraction, type APIUserApplicationCommandInteraction, type APIUserApplicationCommandInteractionData, ApplicationCommandType, ComponentType, type GatewayInteractionCreateDispatchData, InteractionResponseType, InteractionType, type MessageFlags, type RESTPostAPIInteractionCallbackJSONBody } from '../types';
+import { type APIApplicationCommandAutocompleteInteraction, type APIApplicationCommandInteraction, type APIBaseInteraction, type APIChatInputApplicationCommandInteraction, type APIChatInputApplicationCommandInteractionData, type APICommandAutocompleteInteractionResponseCallbackData, type APIEntryPointCommandInteraction, type APIInteraction, type APIInteractionResponse, type APIInteractionResponseChannelMessageWithSource, type APIInteractionResponseDeferredChannelMessageWithSource, type APIInteractionResponseDeferredMessageUpdate, type APIInteractionResponsePong, type APIInteractionResponseUpdateMessage, type APIMessageApplicationCommandInteraction, type APIMessageApplicationCommandInteractionData, type APIMessageButtonInteractionData, type APIMessageComponentInteraction, type APIMessageComponentSelectMenuInteraction, type APIMessageStringSelectInteractionData, type APIModalSubmission, type APIModalSubmitInteraction, type APIUserApplicationCommandInteraction, type APIUserApplicationCommandInteractionData, ApplicationCommandType, ComponentType, type GatewayInteractionCreateDispatchData, type InteractionCallbackData, type InteractionCallbackResourceActivity, InteractionResponseType, InteractionType, type MessageFlags, type RESTPostAPIInteractionCallbackJSONBody, type RESTPostAPIInteractionCallbackResult } from '../types';
 import type { RawFile } from '../api';
+import { type EntitlementStructure, type GuildRoleStructure, type InteractionGuildMemberStructure, type MessageStructure, type OptionResolverStructure, type UserStructure, type WebhookMessageStructure } from '../client/transformers';
 import type { UsingClient } from '../commands';
-import type { ObjectToLower, OmitInsert, ToClass, When, ComponentInteractionMessageUpdate, InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, MessageCreateBodyRequest, MessageUpdateBodyRequest, MessageWebhookCreateBodyRequest, ModalCreateBodyRequest } from '../common';
+import { type ComponentInteractionMessageUpdate, type InteractionCreateBodyRequest, type InteractionMessageUpdateBodyRequest, type MessageCreateBodyRequest, type MessageUpdateBodyRequest, type MessageWebhookCreateBodyRequest, type ModalCreateBodyRequest, type ObjectToLower, type OmitInsert, type ToClass, type When } from '../common';
 import { type AllChannels } from './';
 import { DiscordBase } from './extra/DiscordBase';
 import { PermissionsBitField } from './extra/Permissions';
-import { type GuildRoleStructure, type InteractionGuildMemberStructure, type MessageStructure, type UserStructure, type WebhookMessageStructure, type OptionResolverStructure } from '../client/transformers';
 export type ReplyInteractionBody = {
     type: InteractionResponseType.Modal;
     data: ModalCreateBodyRequest;
 } | {
     type: InteractionResponseType.ChannelMessageWithSource | InteractionResponseType.UpdateMessage;
     data: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest | ComponentInteractionMessageUpdate;
+} | {
+    type: InteractionResponseType.LaunchActivity;
 } | Exclude<RESTPostAPIInteractionCallbackJSONBody, APIInteractionResponsePong>;
 export type __InternalReplyFunction = (_: {
     body: APIInteractionResponse;
@@ -26,14 +28,15 @@ export declare class BaseInteraction<FromGuild extends boolean = boolean, Type e
     member: When<FromGuild, InteractionGuildMemberStructure, undefined>;
     channel?: AllChannels;
     message?: MessageStructure;
-    replied?: Promise<boolean> | boolean;
+    replied?: Promise<boolean | RESTPostAPIInteractionCallbackResult | undefined> | boolean;
     appPermissions?: PermissionsBitField;
+    entitlements: EntitlementStructure[];
     constructor(client: UsingClient, interaction: Type, __reply?: __InternalReplyFunction | undefined);
     static transformBodyRequest(body: ReplyInteractionBody, files: RawFile[] | undefined, self: UsingClient): APIInteractionResponse;
-    static transformBody<T>(body: InteractionMessageUpdateBodyRequest | MessageUpdateBodyRequest | MessageCreateBodyRequest | MessageWebhookCreateBodyRequest, files: RawFile[] | undefined, self: UsingClient): T;
+    static transformBody<T>(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest | MessageUpdateBodyRequest | MessageCreateBodyRequest | MessageWebhookCreateBodyRequest, files: RawFile[] | undefined, self: UsingClient): T;
     private matchReplied;
-    reply(body: ReplyInteractionBody): Promise<void>;
-    deferReply(flags?: MessageFlags): Promise<void>;
+    reply<WR extends boolean = false>(body: ReplyInteractionBody, withResponse?: WR): Promise<When<WR, WebhookMessageStructure, undefined>>;
+    deferReply<WR extends boolean = false>(flags?: MessageFlags, withResponse?: boolean): Promise<When<WR, WebhookMessageStructure, undefined>>;
     isButton(): this is ButtonInteraction;
     isChannelSelectMenu(): this is ChannelSelectMenuInteraction;
     isRoleSelectMenu(): this is RoleSelectMenuInteraction;
@@ -45,10 +48,11 @@ export declare class BaseInteraction<FromGuild extends boolean = boolean, Type e
     isMessage(): this is MessageCommandInteraction;
     isAutocomplete(): this is AutocompleteInteraction;
     isModal(): this is ModalSubmitInteraction;
-    static from(client: UsingClient, gateway: GatewayInteractionCreateDispatchData, __reply?: __InternalReplyFunction): RoleSelectMenuInteraction | UserSelectMenuInteraction | MentionableSelectMenuInteraction | ChannelSelectMenuInteraction | StringSelectMenuInteraction<string[]> | AutocompleteInteraction<boolean> | ChatInputCommandInteraction<boolean> | UserCommandInteraction<boolean> | MessageCommandInteraction<boolean> | ButtonInteraction | ModalSubmitInteraction<boolean> | BaseInteraction<boolean, import("../types").APIPingInteraction>;
+    isEntryPoint(): this is EntryPointInteraction;
+    static from(client: UsingClient, gateway: GatewayInteractionCreateDispatchData, __reply?: __InternalReplyFunction): RoleSelectMenuInteraction | UserSelectMenuInteraction | MentionableSelectMenuInteraction | ChannelSelectMenuInteraction | StringSelectMenuInteraction<string[]> | ChatInputCommandInteraction<boolean> | UserCommandInteraction<boolean> | MessageCommandInteraction<boolean> | ButtonInteraction | ModalSubmitInteraction<boolean> | AutocompleteInteraction<boolean> | BaseInteraction<boolean, import("../types").APIPingInteraction>;
     fetchGuild(force?: boolean): Promise<import("./Guild").Guild<"api">> | undefined;
 }
-export type AllInteractions = AutocompleteInteraction | ChatInputCommandInteraction | UserCommandInteraction | MessageCommandInteraction | ComponentInteraction | SelectMenuInteraction | ModalSubmitInteraction | BaseInteraction;
+export type AllInteractions = AutocompleteInteraction | ChatInputCommandInteraction | UserCommandInteraction | MessageCommandInteraction | ComponentInteraction | SelectMenuInteraction | ModalSubmitInteraction | EntryPointInteraction | BaseInteraction;
 export interface AutocompleteInteraction extends ObjectToLower<Omit<APIApplicationCommandAutocompleteInteraction, 'user' | 'member' | 'type' | 'data' | 'message' | 'channel' | 'app_permissions'>> {
 }
 export declare class AutocompleteInteraction<FromGuild extends boolean = boolean> extends BaseInteraction<FromGuild, APIApplicationCommandAutocompleteInteraction> {
@@ -56,18 +60,19 @@ export declare class AutocompleteInteraction<FromGuild extends boolean = boolean
     type: InteractionType.ApplicationCommandAutocomplete;
     data: ObjectToLower<APIApplicationCommandAutocompleteInteraction['data']>;
     options: OptionResolverStructure;
+    entitlements: EntitlementStructure[];
     constructor(client: UsingClient, interaction: APIApplicationCommandAutocompleteInteraction, resolver?: OptionResolverStructure, __reply?: __InternalReplyFunction | undefined);
     getInput(): string;
-    respond(choices: APICommandAutocompleteInteractionResponseCallbackData['choices']): Promise<void>;
+    respond(choices: APICommandAutocompleteInteractionResponseCallbackData['choices']): Promise<undefined>;
     isAutocomplete(): this is AutocompleteInteraction;
     /** @intenal */
-    reply(..._args: unknown[]): Promise<void>;
+    reply(..._args: unknown[]): Promise<any>;
 }
 export declare class Interaction<FromGuild extends boolean = boolean, Type extends APIInteraction = APIInteraction> extends BaseInteraction<FromGuild, Type> {
     fetchMessage(messageId: string): Promise<import("./Message").WebhookMessage | undefined>;
     fetchResponse(): Promise<import("./Message").WebhookMessage | undefined>;
-    write<FR extends boolean = false>(body: InteractionCreateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessageStructure, void>>;
-    modal(body: ModalCreateBodyRequest): Promise<void>;
+    write<FR extends boolean = false>(body: InteractionCreateBodyRequest, withResponse?: FR): Promise<When<FR, WebhookMessageStructure, void>>;
+    modal(body: ModalCreateBodyRequest): Promise<undefined>;
     editOrReply<FR extends boolean = false>(body: InteractionCreateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessageStructure, void>>;
     editMessage(messageId: string, body: InteractionMessageUpdateBodyRequest): Promise<import("./Message").WebhookMessage>;
     editResponse(body: InteractionMessageUpdateBodyRequest): Promise<import("./Message").WebhookMessage>;
@@ -77,7 +82,24 @@ export declare class Interaction<FromGuild extends boolean = boolean, Type exten
 }
 export declare class ApplicationCommandInteraction<FromGuild extends boolean = boolean, Type extends APIApplicationCommandInteraction = APIApplicationCommandInteraction> extends Interaction<FromGuild, Type> {
     type: ApplicationCommandType;
-    respond(data: APIInteractionResponseChannelMessageWithSource | APIInteractionResponseDeferredChannelMessageWithSource | APIInteractionResponseDeferredMessageUpdate | APIInteractionResponseUpdateMessage): Promise<void>;
+    respond(data: APIInteractionResponseChannelMessageWithSource | APIInteractionResponseDeferredChannelMessageWithSource | APIInteractionResponseDeferredMessageUpdate | APIInteractionResponseUpdateMessage): Promise<undefined>;
+}
+/**
+ * Seyfert don't support activities, so this interaction is blank
+ */
+export declare class EntryPointInteraction<FromGuild extends boolean = boolean> extends ApplicationCommandInteraction<FromGuild, APIEntryPointCommandInteraction> {
+    withReponse(data?: InteractionCreateBodyRequest): Promise<EntryPointWithResponseResult>;
+    isEntryPoint(): this is EntryPointInteraction;
+}
+export interface EntryPointWithResponseResult {
+    interaction: ObjectToLower<InteractionCallbackData>;
+    resource?: {
+        type: InteractionResponseType.LaunchActivity;
+        activityInstance: InteractionCallbackResourceActivity;
+    } | {
+        type: Exclude<InteractionResponseType, InteractionResponseType.LaunchActivity>;
+        message: WebhookMessageStructure;
+    };
 }
 export interface ComponentInteraction extends ObjectToLower<Omit<APIMessageComponentInteraction, 'user' | 'member' | 'type' | 'data' | 'message' | 'channel' | 'app_permissions'>> {
 }
@@ -87,8 +109,9 @@ export declare class ComponentInteraction<FromGuild extends boolean = boolean, T
     channel: AllChannels;
     type: InteractionType.MessageComponent;
     message: MessageStructure;
-    update(data: ComponentInteractionMessageUpdate): Promise<void>;
-    deferUpdate(): Promise<void>;
+    entitlements: EntitlementStructure[];
+    update(data: ComponentInteractionMessageUpdate): Promise<undefined>;
+    deferUpdate(): Promise<undefined>;
     get customId(): string;
     get componentType(): ComponentType.Button | ComponentType.StringSelect | ComponentType.UserSelect | ComponentType.RoleSelect | ComponentType.MentionableSelect | ComponentType.ChannelSelect;
 }

package/lib/structures/Interaction.js

@@ -6,15 +6,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 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;
+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.EntryPointInteraction = exports.ApplicationCommandInteraction = exports.Interaction = exports.AutocompleteInteraction = exports.BaseInteraction = void 0;
 const types_1 = require("../types");
 const builders_1 = require("../builders");
+const transformers_1 = require("../client/transformers");
+const common_1 = require("../common");
+const mixer_1 = require("../deps/mixer");
 const _1 = require("./");
 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;
@@ -24,6 +24,7 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
     message;
     replied;
     appPermissions;
+    entitlements;
     constructor(client, interaction, __reply) {
         super(client, interaction);
         this.client = client;
@@ -41,7 +42,7 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
             this.channel = (0, _1.channelFrom)(interaction.channel, client);
         }
         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));
+        this.entitlements = interaction.entitlements.map(e => transformers_1.Transformers.Entitlement(this.client, e));
     }
     static transformBodyRequest(body, files, self) {
         switch (body.type) {
@@ -51,9 +52,9 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
                 return body;
             case types_1.InteractionResponseType.ChannelMessageWithSource:
             case types_1.InteractionResponseType.UpdateMessage: {
+                //@ts-ignore
                 return {
                     type: body.type,
-                    //@ts-ignore
                     data: BaseInteraction.transformBody(body.data ?? {}, files, self),
                 };
             }
@@ -71,6 +72,8 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
                                 : [],
                         },
                 };
+            case types_1.InteractionResponseType.LaunchActivity:
+                return body;
             default:
                 return body;
         }
@@ -92,44 +95,54 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
                 })) ?? undefined;
         }
         else if (files?.length) {
-            payload.attachments = files?.map((x, id) => ({
+            payload.attachments = files?.map(({ filename }, id) => ({
                 id,
-                filename: x.name,
+                filename,
             }));
         }
         return payload;
     }
-    async matchReplied(body) {
+    async matchReplied(body, withResponse = false) {
         if (this.__reply) {
             //@ts-expect-error
             const { files, ...rest } = body.data ?? {};
             //@ts-expect-error
             const data = body.data instanceof builders_1.Modal ? body.data : rest;
             const parsedFiles = files ? await (0, builders_1.resolveFiles)(files) : undefined;
-            return (this.replied = this.__reply({
+            await (this.replied = this.__reply({
                 body: BaseInteraction.transformBodyRequest({ data, type: body.type }, parsedFiles, this.client),
                 files: parsedFiles,
             }).then(() => (this.replied = true)));
+            return;
         }
-        return (this.replied = this.client.interactions.reply(this.id, this.token, body).then(() => (this.replied = true)));
+        const result = await (this.replied = this.client.interactions.reply(this.id, this.token, body, withResponse));
+        this.replied = true;
+        return result?.resource?.message
+            ? transformers_1.Transformers.WebhookMessage(this.client, result.resource.message, this.id, this.token)
+            : undefined;
     }
-    async reply(body) {
+    async reply(body, withResponse) {
         if (this.replied) {
             throw new Error('Interaction already replied');
         }
-        await this.matchReplied(body);
+        const result = await this.matchReplied(body, withResponse);
         // @ts-expect-error
-        if (body.data instanceof builders_1.Modal && body.data.__exec)
+        if (body.data instanceof builders_1.Modal) {
             // @ts-expect-error
-            this.client.components.modals.set(this.user.id, body.data.__exec);
+            if (body.data.__exec)
+                this.client.components.modals.set(this.user.id, body.data.__exec);
+            else if (this.client.components?.modals.has(this.user.id))
+                this.client.components.modals.delete(this.user.id);
+        }
+        return result;
     }
-    deferReply(flags) {
+    deferReply(flags, withResponse = false) {
         return this.reply({
             type: types_1.InteractionResponseType.DeferredChannelMessageWithSource,
             data: {
                 flags,
             },
-        });
+        }, withResponse);
     }
     isButton() {
         return false;
@@ -164,6 +177,9 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
     isModal() {
         return false;
     }
+    isEntryPoint() {
+        return false;
+    }
     static from(client, gateway, __reply) {
         switch (gateway.type) {
             case types_1.InteractionType.ApplicationCommandAutocomplete:
@@ -177,6 +193,8 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
                         return new UserCommandInteraction(client, gateway, __reply);
                     case types_1.ApplicationCommandType.Message:
                         return new MessageCommandInteraction(client, gateway, __reply);
+                    case types_1.ApplicationCommandType.PrimaryEntryPoint:
+                        return new EntryPointInteraction(client, gateway, __reply);
                 }
             // biome-ignore lint/suspicious/noFallthroughSwitchClause: bad interaction  between biome and ts-server
             case types_1.InteractionType.MessageComponent:
@@ -237,14 +255,11 @@ class Interaction extends BaseInteraction {
     fetchResponse() {
         return this.fetchMessage('@original');
     }
-    async write(body, fetchReply) {
-        (await this.reply({
+    async write(body, withResponse) {
+        return this.reply({
             type: types_1.InteractionResponseType.ChannelMessageWithSource,
             data: body,
-        }));
-        if (fetchReply)
-            return this.fetchResponse();
-        return undefined;
+        }, withResponse);
     }
     modal(body) {
         return this.reply({
@@ -254,8 +269,8 @@ class Interaction extends BaseInteraction {
     }
     async editOrReply(body, fetchReply) {
         if (await this.replied) {
-            const { content, embeds, allowed_mentions, components, files, attachments } = body;
-            return this.editResponse({ content, embeds, allowed_mentions, components, files, attachments });
+            const { content, embeds, allowed_mentions, components, files, attachments, poll } = body;
+            return this.editResponse({ content, embeds, allowed_mentions, components, files, attachments, poll });
         }
         return this.write(body, fetchReply);
     }
@@ -269,7 +284,7 @@ class Interaction extends BaseInteraction {
         return this.deleteMessage('@original');
     }
     deleteMessage(messageId) {
-        return this.client.interactions.deleteResponse(this.id, this.token, messageId);
+        return this.client.interactions.deleteResponse(this.token, messageId);
     }
     followup(body) {
         return this.client.interactions.followup(this.token, body);
@@ -283,6 +298,47 @@ class ApplicationCommandInteraction extends Interaction {
     }
 }
 exports.ApplicationCommandInteraction = ApplicationCommandInteraction;
+/**
+ * Seyfert don't support activities, so this interaction is blank
+ */
+class EntryPointInteraction extends ApplicationCommandInteraction {
+    async withReponse(data) {
+        let body = { type: types_1.InteractionResponseType.LaunchActivity };
+        if (data) {
+            let { files, ...rest } = data;
+            files = files ? await (0, builders_1.resolveFiles)(files) : undefined;
+            body = BaseInteraction.transformBody(rest, files, this.client);
+        }
+        const response = await this.client.proxy
+            .interactions(this.id)(this.token)
+            .callback.post({
+            body,
+            query: { with_response: true },
+        });
+        const result = {
+            interaction: (0, common_1.toCamelCase)(response.interaction),
+        };
+        if (response.resource) {
+            if (response.resource.type !== types_1.InteractionResponseType.LaunchActivity) {
+                result.resource = {
+                    type: response.resource.type,
+                    message: transformers_1.Transformers.WebhookMessage(this.client, response.resource.message, this.id, this.token),
+                };
+            }
+            else {
+                result.resource = {
+                    type: response.resource.type,
+                    activityInstance: response.resource.activity_instance,
+                };
+            }
+        }
+        return result;
+    }
+    isEntryPoint() {
+        return true;
+    }
+}
+exports.EntryPointInteraction = EntryPointInteraction;
 class ComponentInteraction extends Interaction {
     update(data) {
         return this.reply({

package/lib/structures/Message.d.ts

@@ -1,15 +1,15 @@
-import type { APIChannelMention, APIEmbed, APIMessage, GatewayMessageCreateDispatchData } from '../types';
+import { Embed } from '..';
 import type { ListenerOptions } from '../builders';
+import { type GuildMemberStructure, type PollStructure, type UserStructure } from '../client/transformers';
 import type { UsingClient } from '../commands';
 import { type ObjectToLower } from '../common';
 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 type { APIChannelMention, APIEmbed, APIMessage, GatewayMessageCreateDispatchData } from '../types';
 import type { MessageWebhookMethodEditParams, MessageWebhookMethodWriteParams } from './Webhook';
 import { DiscordBase } from './extra/DiscordBase';
-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;
@@ -28,10 +28,7 @@ export declare class BaseMessage extends DiscordBase {
     embeds: InMessageEmbed[];
     constructor(client: UsingClient, data: MessageData);
     get user(): import("./User").User;
-    createComponentCollector(options?: ListenerOptions): {
-        run<T extends import("../components/handler").CollectorInteraction = import("../components/handler").CollectorInteraction>(customId: string | string[] | RegExp, callback: import("..").ComponentCallback<T>): any;
-        stop(reason?: string): any;
-    };
+    createComponentCollector(options?: ListenerOptions): import("../components/handler").CreateComponentCollectorResult;
     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>;
@@ -64,9 +61,6 @@ export declare class InMessageEmbed {
     data: APIEmbed;
     constructor(data: APIEmbed);
     get title(): string | undefined;
-    /**
-     * @deprecated
-     */
     get type(): import("../types").EmbedType | undefined;
     get description(): string | undefined;
     get url(): string | undefined;

package/lib/structures/Message.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InMessageEmbed = exports.WebhookMessage = exports.Message = exports.BaseMessage = void 0;
+const __1 = require("..");
+const transformers_1 = require("../client/transformers");
 const common_1 = require("../common");
+const common_2 = require("../common");
 const ActionRow_1 = require("../components/ActionRow");
 const DiscordBase_1 = require("./extra/DiscordBase");
-const common_2 = require("../common");
-const __1 = require("..");
-const transformers_1 = require("../client/transformers");
 class BaseMessage extends DiscordBase_1.DiscordBase {
     embeds;
     constructor(client, data) {
@@ -24,7 +24,7 @@ class BaseMessage extends DiscordBase_1.DiscordBase {
         return this.author;
     }
     createComponentCollector(options) {
-        return this.client.components.createComponentCollector(this.id, options);
+        return this.client.components.createComponentCollector(this.id, this.channelId, this.guildId, options);
     }
     get url() {
         return common_2.Formatter.messageLink(this.guildId, this.channelId, this.id);
@@ -105,7 +105,7 @@ class WebhookMessage extends BaseMessage {
         this.webhookToken = webhookToken;
     }
     fetch() {
-        return this.api.webhooks(this.webhookId)(this.webhookToken).get({ query: this.thread?.id });
+        return this.api.webhooks(this.webhookId)(this.webhookToken).get();
     }
     edit(body) {
         const { query, ...rest } = body;
@@ -135,9 +135,6 @@ class InMessageEmbed {
     get title() {
         return this.data.title;
     }
-    /**
-     * @deprecated
-     */
     get type() {
         return this.data.type;
     }

package/lib/structures/Poll.d.ts

@@ -1,8 +1,8 @@
-import type { APIPoll } from '../types';
+import type { ValidAnswerId } from '../api/Routes/channels';
+import type { UsingClient } from '../commands';
 import { type ObjectToLower } from '../common';
+import type { APIPoll } from '../types';
 import { Base } from './extra/Base';
-import type { UsingClient } from '../commands';
-import type { ValidAnswerId } from '../api/Routes/channels';
 export interface Poll extends ObjectToLower<APIPoll> {
 }
 export declare class Poll extends Base {

package/lib/structures/Sticker.d.ts

@@ -1,9 +1,9 @@
-import type { APISticker, RESTPatchAPIGuildStickerJSONBody, RESTPostAPIGuildStickerFormDataBody } from '../types';
 import type { RawFile, UsingClient } from '..';
 import type { Attachment, AttachmentBuilder } from '../builders';
+import { type UserStructure } from '../client/transformers';
 import type { MethodContext, ObjectToLower } from '../common';
+import type { APISticker, RESTPatchAPIGuildStickerJSONBody, RESTPostAPIGuildStickerFormDataBody } from '../types';
 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 {

package/lib/structures/Sticker.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Sticker = void 0;
-const DiscordBase_1 = require("./extra/DiscordBase");
 const transformers_1 = require("../client/transformers");
+const DiscordBase_1 = require("./extra/DiscordBase");
 class Sticker extends DiscordBase_1.DiscordBase {
     user;
     constructor(client, data) {

package/lib/structures/VoiceState.d.ts

@@ -3,6 +3,7 @@ import type { VoiceStateResource } from '../cache/resources/voice-states';
 import { type GuildMemberStructure } from '../client/transformers';
 import type { ObjectToLower } from '../common';
 import type { APIVoiceState } from '../types';
+import type { AllGuildVoiceChannels } from './channels';
 import { Base } from './extra/Base';
 export interface VoiceState extends Base, ObjectToLower<Omit<VoiceStateResource, 'member'>> {
 }
@@ -12,7 +13,7 @@ export declare class VoiceState extends Base {
     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("../types").ChannelType> | import("./channels").DMChannel | import("./channels").CategoryChannel | undefined>;
+    channel(force?: boolean): Promise<AllGuildVoiceChannels> | undefined;
     setMute(mute?: boolean, reason?: string): Promise<import("./GuildMember").GuildMember>;
     setDeaf(deaf?: boolean, reason?: string): Promise<import("./GuildMember").GuildMember>;
     setSuppress(suppress?: boolean): Promise<void>;

package/lib/structures/VoiceState.js

@@ -21,7 +21,7 @@ class VoiceState extends Base_1.Base {
     user(force) {
         return this.client.users.fetch(this.userId, force);
     }
-    async channel(force) {
+    channel(force) {
         if (!this.channelId)
             return;
         return this.client.channels.fetch(this.channelId, force);

package/lib/structures/Webhook.d.ts

@@ -1,11 +1,11 @@
+import { type AnonymousGuildStructure, type UserStructure } from '../client/transformers';
+import type { UsingClient } from '../commands';
+import type { ImageOptions, MessageWebhookCreateBodyRequest, MessageWebhookPayload, MessageWebhookUpdateBodyRequest, MethodContext, ObjectToLower } from '../common';
 /**
  * Represents a Discord webhook.
  */
 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 { DiscordBase } from './extra/DiscordBase';
-import { type AnonymousGuildStructure, type UserStructure } from '../client/transformers';
 export interface Webhook extends DiscordBase, ObjectToLower<Omit<APIWebhook, 'user' | 'source_guild'>> {
 }
 /**

package/lib/structures/Webhook.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Webhook = void 0;
-const DiscordBase_1 = require("./extra/DiscordBase");
 const transformers_1 = require("../client/transformers");
+const DiscordBase_1 = require("./extra/DiscordBase");
 /**
  * Represents a Discord webhook.
  */

package/lib/structures/channels.d.ts

@@ -1,11 +1,11 @@
-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 { 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';
 import type { UsingClient } from '../commands';
 import type { EmojiResolvable, MessageCreateBodyRequest, MessageUpdateBodyRequest, MethodContext, ObjectToLower, StringToNumber, ToClass } from '../common';
+import { 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, ChannelType, type RESTGetAPIChannelMessageReactionUsersQuery, type RESTPatchAPIChannelJSONBody, type RESTPatchAPIGuildChannelPositionsJSONBody, type RESTPostAPIChannelWebhookJSONBody, type RESTPostAPIGuildChannelJSONBody, type RESTPostAPIGuildForumThreadsJSONBody, type SortOrderType, type ThreadAutoArchiveDuration, VideoQualityMode } from '../types';
 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>);
@@ -35,7 +35,7 @@ export declare class BaseChannel<T extends ChannelType> extends DiscordBase<APIC
         guildId: string;
     }>): {
         list: (force?: boolean) => Promise<AllChannels[]>;
-        fetch: (id: string, force?: boolean) => Promise<AllChannels>;
+        fetch: (id: string, force?: boolean) => Promise<APIGuildCategoryChannel | APIGuildStageVoiceChannel | APIGuildVoiceChannel | APINewsChannel | APITextChannel | BaseChannel<ChannelType> | DMChannel | CategoryChannel>;
         create: (body: RESTPostAPIGuildChannelJSONBody) => Promise<AllChannels>;
         delete: (id: string, reason?: string) => Promise<AllChannels>;
         edit: (id: string, body: RESTPatchAPIChannelJSONBody, reason?: string) => Promise<AllChannels>;

package/lib/structures/channels.js

@@ -8,12 +8,12 @@ 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;
 exports.channelFrom = channelFrom;
-const types_1 = require("../types");
-const builders_1 = require("../builders");
-const DiscordBase_1 = require("./extra/DiscordBase");
 const __1 = require("..");
+const builders_1 = require("../builders");
 const transformers_1 = require("../client/transformers");
 const mixer_1 = require("../deps/mixer");
+const types_1 = require("../types");
+const DiscordBase_1 = require("./extra/DiscordBase");
 class BaseChannel extends DiscordBase_1.DiscordBase {
     constructor(client, data) {
         super(client, data);
@@ -101,7 +101,7 @@ class BaseGuildChannel extends BaseChannel {
     }
     permissionOverwrites = {
         fetch: () => this.client.cache.overwrites?.get(this.id),
-        values: () => (this.guildId ? this.client.cache.overwrites?.values(this.guildId) ?? [] : []),
+        values: () => (this.guildId ? (this.client.cache.overwrites?.values(this.guildId) ?? []) : []),
     };
     memberPermissions(member, checkAdmin = true) {
         return this.client.channels.memberPermissions(this.id, member, checkAdmin);
@@ -184,9 +184,9 @@ class MessagesMethods extends DiscordBase_1.DiscordBase {
                 })) ?? undefined;
         }
         else if (files?.length) {
-            payload.attachments = files?.map((x, id) => ({
+            payload.attachments = files?.map(({ filename }, id) => ({
                 id,
-                filename: x.name,
+                filename,
             }));
         }
         return payload;
@@ -223,11 +223,12 @@ function channelFrom(data, client) {
             return transformers_1.Transformers.CategoryChannel(client, data);
         case types_1.ChannelType.GuildAnnouncement:
             return transformers_1.Transformers.NewsChannel(client, data);
-        default:
+        default: {
             if ('guild_id' in data) {
                 return transformers_1.Transformers.BaseGuildChannel(client, data);
             }
             return transformers_1.Transformers.BaseChannel(client, data);
+        }
     }
 }
 class TopicableGuildChannel extends DiscordBase_1.DiscordBase {

package/lib/structures/extra/BaseGuild.d.ts

@@ -1,4 +1,4 @@
-import type { ObjectToLower } from '../../common';
+import { type ObjectToLower } from '../../common';
 import type { ImageOptions } from '../../common/types/options';
 import { type APIPartialGuild } from '../../types';
 import { DiscordBase } from './DiscordBase';
@@ -37,5 +37,15 @@ export declare class BaseGuild extends DiscordBase<APIPartialGuild> {
      * @returns Banner url or void
      */
     bannerURL(options?: ImageOptions): string | undefined;
+    /**
+     * Shard ID of the guild.
+     * @returns Shard ID or -1 if the client is not gateway based.
+     */
+    get shardId(): number;
+    /**
+     * Shard of the guild.
+     * @returns Shard or undefined, if the client is not gateway based always undefined.
+     */
+    get shard(): import("../../websocket").Shard | undefined;
     toString(): string;
 }