seyfert 3.2.2 → 3.2.3-dev-15770378141.0

package/lib/commands/applications/entrycontext.d.ts

@@ -1,7 +1,7 @@
 import type { ReturnCache } from '../../cache';
 import type { GuildMemberStructure, GuildStructure, InteractionGuildMemberStructure, UserStructure, WebhookMessageStructure } from '../../client/transformers';
-import type { InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, MakeRequired, MessageWebhookCreateBodyRequest, ModalCreateBodyRequest, UnionToTuple, When } from '../../common';
-import type { AllChannels, EntryPointInteraction } from '../../structures';
+import type { InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, MakeRequired, MessageWebhookCreateBodyRequest, ModalCreateBodyRequest, ModalCreateOptions, UnionToTuple, When } from '../../common';
+import type { AllChannels, EntryPointInteraction, ModalSubmitInteraction } from '../../structures';
 import { type RESTGetAPIGuildQuery } from '../../types';
 import { BaseContext } from '../basecontext';
 import type { RegisteredMiddlewares } from '../decorators';
@@ -22,7 +22,8 @@ export declare class EntryPointContext<M extends keyof RegisteredMiddlewares = n
     };
     get fullCommandName(): string;
     write<WR extends boolean = false>(body: InteractionCreateBodyRequest, withResponse?: WR): Promise<When<WR, WebhookMessageStructure, void>>;
-    modal(body: ModalCreateBodyRequest): Promise<undefined>;
+    modal(body: ModalCreateBodyRequest, options?: undefined): Promise<undefined>;
+    modal(body: ModalCreateBodyRequest, options: ModalCreateOptions): Promise<ModalSubmitInteraction | null>;
     deferReply<WR extends boolean = false>(ephemeral?: boolean, withResponse?: WR): Promise<When<WR, WebhookMessageStructure, undefined>>;
     editResponse(body: InteractionMessageUpdateBodyRequest): Promise<WebhookMessageStructure>;
     deleteResponse(): Promise<void>;

package/lib/commands/applications/entrycontext.js

@@ -26,8 +26,10 @@ class EntryPointContext extends basecontext_1.BaseContext {
     write(body, withResponse) {
         return this.interaction.write(body, withResponse);
     }
-    modal(body) {
-        return this.interaction.modal(body);
+    modal(body, options) {
+        if (options === undefined)
+            return this.interaction.modal(body);
+        return this.interaction.modal(body, options);
     }
     deferReply(ephemeral = false, withResponse) {
         return this.interaction.deferReply(ephemeral ? types_1.MessageFlags.Ephemeral : undefined, withResponse);

package/lib/commands/applications/menucontext.d.ts

@@ -1,7 +1,7 @@
 import type { ContextMenuCommand, InteractionGuildMemberStructure, ReturnCache } from '../..';
 import { type GuildMemberStructure, type GuildStructure, type MessageStructure, type UserStructure, type WebhookMessageStructure } from '../../client/transformers';
-import { type InteractionCreateBodyRequest, type InteractionMessageUpdateBodyRequest, type MakeRequired, type MessageWebhookCreateBodyRequest, type ModalCreateBodyRequest, type UnionToTuple, type When } from '../../common';
-import type { AllChannels, MessageCommandInteraction, UserCommandInteraction } from '../../structures';
+import { InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, MakeRequired, MessageWebhookCreateBodyRequest, ModalCreateBodyRequest, ModalCreateOptions, UnionToTuple, When } from '../../common';
+import { AllChannels, MessageCommandInteraction, ModalSubmitInteraction, UserCommandInteraction } from '../../structures';
 import { type RESTGetAPIGuildQuery } from '../../types';
 import { BaseContext } from '../basecontext';
 import type { RegisteredMiddlewares } from '../decorators';
@@ -23,7 +23,8 @@ export declare class MenuCommandContext<T extends MessageCommandInteraction | Us
     };
     get fullCommandName(): string;
     write<WR extends boolean = false>(body: InteractionCreateBodyRequest, withResponse?: WR): Promise<When<WR, WebhookMessageStructure, void>>;
-    modal(body: ModalCreateBodyRequest): Promise<undefined>;
+    modal(body: ModalCreateBodyRequest, options?: undefined): Promise<undefined>;
+    modal(body: ModalCreateBodyRequest, options: ModalCreateOptions): Promise<ModalSubmitInteraction | null>;
     deferReply<WR extends boolean = false>(ephemeral?: boolean, withResponse?: WR): Promise<When<WR, WebhookMessageStructure, undefined>>;
     editResponse(body: InteractionMessageUpdateBodyRequest): Promise<WebhookMessageStructure>;
     deleteResponse(): Promise<void>;

package/lib/commands/applications/menucontext.js

@@ -40,8 +40,10 @@ class MenuCommandContext extends basecontext_1.BaseContext {
     write(body, withResponse) {
         return this.interaction.write(body, withResponse);
     }
-    modal(body) {
-        return this.interaction.modal(body);
+    modal(body, options) {
+        if (options === undefined)
+            return this.interaction.modal(body);
+        return this.interaction.modal(body, options);
     }
     deferReply(ephemeral = false, withResponse) {
         return this.interaction.deferReply(ephemeral ? types_1.MessageFlags.Ephemeral : undefined, withResponse);

package/lib/common/types/write.d.ts

@@ -20,3 +20,6 @@ export type InteractionMessageUpdateBodyRequest = OmitInsert<RESTPatchAPIWebhook
 export type ComponentInteractionMessageUpdate = OmitInsert<APIInteractionResponseCallbackData, 'components' | 'embeds', ResolverProps>;
 export type InteractionCreateBodyRequest = OmitInsert<APIInteractionResponseChannelMessageWithSource['data'], 'components' | 'embeds' | 'poll', SendResolverProps>;
 export type ModalCreateBodyRequest = APIModalInteractionResponse['data'] | Modal;
+export interface ModalCreateOptions {
+    waitFor?: number;
+}

package/lib/components/componentcontext.d.ts

@@ -2,7 +2,8 @@ import type { AllChannels, ButtonInteraction, ChannelSelectMenuInteraction, Comp
 import type { GuildMemberStructure, GuildStructure, InteractionGuildMemberStructure, UserStructure, WebhookMessageStructure } from '../client/transformers';
 import type { CommandMetadata, ExtendContext, GlobalMetadata, RegisteredMiddlewares, UsingClient } from '../commands';
 import { BaseContext } from '../commands/basecontext';
-import type { ComponentInteractionMessageUpdate, InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, MakeRequired, MessageWebhookCreateBodyRequest, ModalCreateBodyRequest, UnionToTuple, When } from '../common';
+import { ComponentInteractionMessageUpdate, InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, MakeRequired, MessageWebhookCreateBodyRequest, ModalCreateBodyRequest, ModalCreateOptions, UnionToTuple, When } from '../common';
+import { ModalSubmitInteraction } from '../structures';
 import { type RESTGetAPIGuildQuery } from '../types';
 export interface ComponentContext<Type extends keyof ContextComponentCommandInteractionMap = keyof ContextComponentCommandInteractionMap> extends BaseContext, ExtendContext {
 }
@@ -73,7 +74,8 @@ export declare class ComponentContext<Type extends keyof ContextComponentCommand
      * @returns A promise that resolves when the response is deleted.
      */
     deleteResponse(): Promise<void>;
-    modal(body: ModalCreateBodyRequest): Promise<undefined>;
+    modal(body: ModalCreateBodyRequest, options?: undefined): Promise<undefined>;
+    modal(body: ModalCreateBodyRequest, options: ModalCreateOptions): Promise<ModalSubmitInteraction | null>;
     /**
      * Gets the channel of the interaction.
      * @param mode - The mode to fetch the channel.

package/lib/components/componentcontext.js

@@ -94,8 +94,10 @@ class ComponentContext extends basecontext_1.BaseContext {
     deleteResponse() {
         return this.interaction.deleteResponse();
     }
-    modal(body) {
-        return this.interaction.modal(body);
+    modal(body, options) {
+        if (options === undefined)
+            return this.interaction.modal(body);
+        return this.interaction.modal(body, options);
     }
     channel(mode = 'flow') {
         if (mode === 'cache')

package/lib/components/modalcontext.d.ts

@@ -1,8 +1,8 @@
-import type { AllChannels, Interaction, ModalCommand, ModalSubmitInteraction, ReturnCache } from '..';
+import type { AllChannels, ModalCommand, ModalSubmitInteraction, ReturnCache } from '..';
 import type { GuildMemberStructure, GuildStructure, InteractionGuildMemberStructure, UserStructure, WebhookMessageStructure } from '../client/transformers';
 import type { CommandMetadata, ExtendContext, GlobalMetadata, RegisteredMiddlewares, UsingClient } from '../commands';
 import { BaseContext } from '../commands/basecontext';
-import type { InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, MakeRequired, MessageWebhookCreateBodyRequest, ModalCreateBodyRequest, UnionToTuple, When } from '../common';
+import { InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, MakeRequired, MessageWebhookCreateBodyRequest, ModalCreateBodyRequest, ModalCreateOptions, UnionToTuple, When } from '../common';
 export interface ModalContext extends BaseContext, ExtendContext {
 }
 /**
@@ -68,7 +68,8 @@ export declare class ModalContext<M extends keyof RegisteredMiddlewares = never>
      * @returns A promise that resolves when the response is deleted.
      */
     deleteResponse(): Promise<void>;
-    modal(body: ModalCreateBodyRequest): ReturnType<Interaction['modal']>;
+    modal(body: ModalCreateBodyRequest, options?: undefined): Promise<undefined>;
+    modal(body: ModalCreateBodyRequest, options: ModalCreateOptions): Promise<ModalSubmitInteraction | null>;
     /**
      * Gets the channel of the interaction.
      * @param mode - The mode to fetch the channel.

package/lib/components/modalcontext.js

@@ -81,9 +81,9 @@ class ModalContext extends basecontext_1.BaseContext {
     deleteResponse() {
         return this.interaction.deleteResponse();
     }
-    modal(body) {
-        //@ts-expect-error
-        return this.interaction.modal(body);
+    modal(body, options) {
+        // @ts-expect-error
+        return this.interaction.modal(body, options);
     }
     channel(mode = 'flow') {
         if (mode === 'cache')

package/lib/structures/Interaction.d.ts

@@ -2,7 +2,7 @@ import type { RawFile } from '../api';
 import type { ReturnCache } from '../cache';
 import { type EntitlementStructure, type GuildRoleStructure, type GuildStructure, type InteractionGuildMemberStructure, type MessageStructure, type OptionResolverStructure, type UserStructure, type WebhookMessageStructure } from '../client/transformers';
 import type { UsingClient } from '../commands';
-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 ComponentInteractionMessageUpdate, type InteractionCreateBodyRequest, type InteractionMessageUpdateBodyRequest, type MessageCreateBodyRequest, type MessageUpdateBodyRequest, type MessageWebhookCreateBodyRequest, type ModalCreateBodyRequest, ModalCreateOptions, type ObjectToLower, type OmitInsert, type ToClass, type When } from '../common';
 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 AllChannels } from './';
 import { DiscordBase } from './extra/DiscordBase';
@@ -76,7 +76,8 @@ export declare class Interaction<FromGuild extends boolean = boolean, Type exten
     fetchMessage(messageId: string): Promise<WebhookMessageStructure>;
     fetchResponse(): Promise<WebhookMessageStructure>;
     write<FR extends boolean = false>(body: InteractionCreateBodyRequest, withResponse?: FR): Promise<When<FR, WebhookMessageStructure, void>>;
-    modal(body: ModalCreateBodyRequest): Promise<undefined>;
+    modal(body: ModalCreateBodyRequest, options?: undefined): Promise<undefined>;
+    modal(body: ModalCreateBodyRequest, options: ModalCreateOptions): Promise<ModalSubmitInteraction | null>;
     editOrReply<FR extends boolean = false>(body: InteractionCreateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessageStructure, void>>;
     editMessage(messageId: string, body: InteractionMessageUpdateBodyRequest): Promise<WebhookMessageStructure>;
     editResponse(body: InteractionMessageUpdateBodyRequest): Promise<WebhookMessageStructure>;

package/lib/structures/Interaction.js

@@ -268,11 +268,33 @@ class Interaction extends BaseInteraction {
             data: body,
         }, withResponse);
     }
-    modal(body) {
-        return this.reply({
+    async modal(body, options) {
+        if (options !== undefined && !(body instanceof builders_1.Modal)) {
+            body = new builders_1.Modal(body);
+        }
+        if (options === undefined)
+            return this.reply({
+                type: types_1.InteractionResponseType.Modal,
+                data: body,
+            });
+        const promise = new Promise(res => {
+            let nodeTimeout;
+            // body is always a modal here, so we can safely cast it
+            body.__exec = (interaction) => {
+                res(interaction);
+                clearTimeout(nodeTimeout);
+            };
+            if (options?.waitFor && options?.waitFor > 0) {
+                nodeTimeout = setTimeout(() => {
+                    res(null);
+                }, options.waitFor);
+            }
+        });
+        await this.reply({
             type: types_1.InteractionResponseType.Modal,
             data: body,
         });
+        return promise;
     }
     async editOrReply(body, fetchReply) {
         if (await this.replied) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "3.2.2",
+	"version": "3.2.3-dev-15770378141.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",
@@ -70,4 +70,4 @@
 			"esbuild"
 		]
 	}
-}
+}