From bf0f66b60a97f79c0e80ace5b408baee343bc82c Mon Sep 17 00:00:00 2001
From: Suneet Tipirneni <77477100+suneettipirneni@users.noreply.github.com>
Date: Thu, 10 Feb 2022 05:33:50 -0500
Subject: [PATCH] feat(Interactions): add modal and text input interactions
 (#243)

BREAKING CHANGE: `APIBaseMessageComponent` was renamed to `APIBaseComponent`
---
 deno/payloads/v8/_interactions/modalSubmit.ts | 28 +++++++
 deno/payloads/v8/_interactions/responses.ts   | 29 +++++++
 deno/payloads/v8/channel.ts                   | 79 +++++++++++++++++--
 deno/payloads/v8/interactions.ts              |  1 +
 deno/payloads/v9/_interactions/modalSubmit.ts | 28 +++++++
 deno/payloads/v9/_interactions/responses.ts   | 29 +++++++
 deno/payloads/v9/channel.ts                   | 79 +++++++++++++++++--
 deno/payloads/v9/interactions.ts              |  1 +
 deno/rest/v8/channel.ts                       |  5 +-
 deno/rest/v8/webhook.ts                       |  3 +-
 deno/rest/v9/channel.ts                       |  5 +-
 deno/rest/v9/webhook.ts                       |  3 +-
 payloads/v8/_interactions/modalSubmit.ts      | 28 +++++++
 payloads/v8/_interactions/responses.ts        | 29 +++++++
 payloads/v8/channel.ts                        | 79 +++++++++++++++++--
 payloads/v8/interactions.ts                   |  1 +
 payloads/v9/_interactions/modalSubmit.ts      | 28 +++++++
 payloads/v9/_interactions/responses.ts        | 29 +++++++
 payloads/v9/channel.ts                        | 79 +++++++++++++++++--
 payloads/v9/interactions.ts                   |  1 +
 rest/v8/channel.ts                            |  5 +-
 rest/v8/webhook.ts                            |  3 +-
 rest/v9/channel.ts                            |  5 +-
 rest/v9/webhook.ts                            |  3 +-
 24 files changed, 536 insertions(+), 44 deletions(-)
 create mode 100644 deno/payloads/v8/_interactions/modalSubmit.ts
 create mode 100644 deno/payloads/v9/_interactions/modalSubmit.ts
 create mode 100644 payloads/v8/_interactions/modalSubmit.ts
 create mode 100644 payloads/v9/_interactions/modalSubmit.ts

diff --git a/deno/payloads/v8/_interactions/modalSubmit.ts b/deno/payloads/v8/_interactions/modalSubmit.ts
new file mode 100644
index 00000000..c092492c
--- /dev/null
+++ b/deno/payloads/v8/_interactions/modalSubmit.ts
@@ -0,0 +1,28 @@
+import type { APIActionRowComponent, APIModalComponent } from '../channel.ts';
+import type { APIBaseInteraction, InteractionType, ComponentType } from '../mod.ts';
+
+export interface ModalSubmitComponent {
+	type: ComponentType;
+	custom_id: string;
+	value: string;
+}
+
+export interface ModalSubmitActionRowComponent extends Omit<APIActionRowComponent<APIModalComponent>, 'components'> {
+	components: ModalSubmitComponent[];
+}
+
+export interface APIModalSubmission {
+	/**
+	 * A developer-defined identifier for the component, max 100 characters
+	 */
+	custom_id: string;
+	/**
+	 * A list of child components
+	 */
+	components?: ModalSubmitActionRowComponent[];
+}
+
+/**
+ * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object
+ */
+export type APIModalSubmitInteraction = APIBaseInteraction<InteractionType.ModalSubmit, APIModalSubmission>;
diff --git a/deno/payloads/v8/_interactions/responses.ts b/deno/payloads/v8/_interactions/responses.ts
index 4edff842..160af94b 100644
--- a/deno/payloads/v8/_interactions/responses.ts
+++ b/deno/payloads/v8/_interactions/responses.ts
@@ -1,6 +1,7 @@
 import type { MessageFlags } from '../mod.ts';
 import type { RESTPostAPIWebhookWithTokenJSONBody } from '../../../v8.ts';
 import type { APIApplicationCommandOptionChoice } from './applicationCommands.ts';
+import type { APIActionRowComponent, APIModalComponent } from '../channel.ts';
 
 /**
  * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object-interaction-type
@@ -10,6 +11,7 @@ export enum InteractionType {
 	ApplicationCommand,
 	MessageComponent,
 	ApplicationCommandAutocomplete,
+	ModalSubmit,
 }
 
 /**
@@ -32,6 +34,11 @@ export interface APIApplicationCommandAutocompleteResponse {
 	data: APICommandAutocompleteInteractionResponseCallbackData;
 }
 
+export interface APIModalInteractionResponse {
+	type: InteractionResponseType.Modal;
+	data: APIModalInteractionResponseCallbackData;
+}
+
 export interface APIInteractionResponseChannelMessageWithSource {
 	type: InteractionResponseType.ChannelMessageWithSource;
 	data: APIInteractionResponseCallbackData;
@@ -79,6 +86,10 @@ export enum InteractionResponseType {
 	 * For autocomplete interactions
 	 */
 	ApplicationCommandAutocompleteResult,
+	/**
+	 * Respond to an interaction with an modal for a user to fill-out
+	 */
+	Modal,
 }
 
 /**
@@ -92,3 +103,21 @@ export type APIInteractionResponseCallbackData = Omit<
 export interface APICommandAutocompleteInteractionResponseCallbackData {
 	choices?: APIApplicationCommandOptionChoice[];
 }
+
+/**
+ * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-response-object-modal
+ */
+export interface APIModalInteractionResponseCallbackData {
+	/**
+	 * A developer-defined identifier for the component, max 100 characters
+	 */
+	custom_id: string;
+	/**
+	 * The title of the popup modal
+	 */
+	title: string;
+	/**
+	 * Between 1 and 5 (inclusive) components that make up the modal
+	 */
+	components: APIActionRowComponent<APIModalComponent>[];
+}
diff --git a/deno/payloads/v8/channel.ts b/deno/payloads/v8/channel.ts
index 621c1510..cd7e1768 100644
--- a/deno/payloads/v8/channel.ts
+++ b/deno/payloads/v8/channel.ts
@@ -3,10 +3,10 @@
  */
 
 import type { Permissions, Snowflake } from '../../globals.ts';
+import type { APIApplication } from './application.ts';
 import type { APIPartialEmoji } from './emoji.ts';
 import type { APIGuildMember } from './guild.ts';
 import type { APIMessageInteraction } from './interactions.ts';
-import type { APIApplication } from './application.ts';
 import type { APIRole } from './permissions.ts';
 import type { APISticker, APIStickerItem } from './sticker.ts';
 import type { APIUser } from './user.ts';
@@ -406,7 +406,7 @@ export interface APIMessage {
 	/**
 	 * Sent if the message contains components like buttons, action rows, or other interactive components
 	 */
-	components?: APIActionRowComponent[];
+	components?: APIActionRowComponent<APIMessageComponent>[];
 	/**
 	 * Sent if the message contains stickers
 	 *
@@ -976,7 +976,7 @@ export interface APIAllowedMentions {
 /**
  * https://discord.com/developers/docs/interactions/message-components#component-object
  */
-export interface APIBaseMessageComponent<T extends ComponentType> {
+export interface APIBaseComponent<T extends ComponentType> {
 	/**
 	 * The type of the component
 	 */
@@ -999,22 +999,27 @@ export enum ComponentType {
 	 * Select Menu component
 	 */
 	SelectMenu,
+	/**
+	 * Text Input component
+	 */
+	TextInput,
 }
 
 /**
  * https://discord.com/developers/docs/interactions/message-components#action-rows
  */
-export interface APIActionRowComponent extends APIBaseMessageComponent<ComponentType.ActionRow> {
+export interface APIActionRowComponent<T extends APIActionRowComponentTypes>
+	extends APIBaseComponent<ComponentType.ActionRow> {
 	/**
 	 * The components in the ActionRow
 	 */
-	components: Exclude<APIMessageComponent, APIActionRowComponent>[];
+	components: Exclude<T, APIActionRowComponent<T>>[];
 }
 
 /**
  * https://discord.com/developers/docs/interactions/message-components#buttons
  */
-interface APIButtonComponentBase<Style extends ButtonStyle> extends APIBaseMessageComponent<ComponentType.Button> {
+interface APIButtonComponentBase<Style extends ButtonStyle> extends APIBaseComponent<ComponentType.Button> {
 	/**
 	 * The label to be displayed on the button
 	 */
@@ -1078,10 +1083,18 @@ export enum ButtonStyle {
 	Link,
 }
 
+/**
+ * https://discord.com/developers/docs/interactions/message-components#text-inputs-text-input-styles
+ */
+export enum TextInputStyle {
+	Short = 1,
+	Paragraph,
+}
+
 /**
  * https://discord.com/developers/docs/interactions/message-components#select-menus
  */
-export interface APISelectMenuComponent extends APIBaseMessageComponent<ComponentType.SelectMenu> {
+export interface APISelectMenuComponent extends APIBaseComponent<ComponentType.SelectMenu> {
 	/**
 	 * A developer-defined identifier for the select menu, max 100 characters
 	 */
@@ -1140,7 +1153,57 @@ export interface APISelectMenuOption {
 	default?: boolean;
 }
 
+/**
+ * https://discord.com/developers/docs/interactions/message-components#text-inputs-text-input-structure
+ */
+export interface APITextInputComponent extends APIBaseComponent<ComponentType.TextInput> {
+	/**
+	 * One of text input styles
+	 */
+	style: TextInputStyle;
+	/**
+	 * The custom id for the text input
+	 */
+	custom_id: string;
+	/**
+	 * Text that appears on top of the text input field, max 80 characters
+	 */
+	label: string;
+	/**
+	 * Placeholder for the text input
+	 */
+	placeholder?: string;
+	/**
+	 * The pre-filled text in the text input
+	 */
+	value?: string;
+	/**
+	 * Minimal length of text input
+	 */
+	min_length?: number;
+	/**
+	 * Maximal length of text input
+	 */
+	max_length?: number;
+	/**
+	 * Whether or not this text input is required or not
+	 */
+	required?: boolean;
+}
+
+export type APIActionRowComponentTypes = APIMessageComponent | APIModalComponent;
+
 /**
  * https://discord.com/developers/docs/interactions/message-components#message-components
  */
-export type APIMessageComponent = APIActionRowComponent | APIButtonComponent | APISelectMenuComponent;
+export type APIMessageComponent =
+	| APIActionRowComponent<APIMessageComponent>
+	| APIButtonComponent
+	| APISelectMenuComponent;
+
+export type APIMessageActionRowComponent = APIActionRowComponent<APIMessageComponent>;
+
+// Modal components
+export type APIModalComponent = APIActionRowComponent<APIModalComponent> | APITextInputComponent;
+
+export type APIModalActionRowComponent = APIActionRowComponent<APIModalComponent>;
diff --git a/deno/payloads/v8/interactions.ts b/deno/payloads/v8/interactions.ts
index e2903adc..68256d1c 100644
--- a/deno/payloads/v8/interactions.ts
+++ b/deno/payloads/v8/interactions.ts
@@ -16,6 +16,7 @@ export * from './_interactions/messageComponents.ts';
 export * from './_interactions/ping.ts';
 export * from './_interactions/responses.ts';
 export * from './_interactions/applicationCommands.ts';
+export * from './_interactions/modalSubmit.ts';
 
 /**
  * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object
diff --git a/deno/payloads/v9/_interactions/modalSubmit.ts b/deno/payloads/v9/_interactions/modalSubmit.ts
new file mode 100644
index 00000000..c092492c
--- /dev/null
+++ b/deno/payloads/v9/_interactions/modalSubmit.ts
@@ -0,0 +1,28 @@
+import type { APIActionRowComponent, APIModalComponent } from '../channel.ts';
+import type { APIBaseInteraction, InteractionType, ComponentType } from '../mod.ts';
+
+export interface ModalSubmitComponent {
+	type: ComponentType;
+	custom_id: string;
+	value: string;
+}
+
+export interface ModalSubmitActionRowComponent extends Omit<APIActionRowComponent<APIModalComponent>, 'components'> {
+	components: ModalSubmitComponent[];
+}
+
+export interface APIModalSubmission {
+	/**
+	 * A developer-defined identifier for the component, max 100 characters
+	 */
+	custom_id: string;
+	/**
+	 * A list of child components
+	 */
+	components?: ModalSubmitActionRowComponent[];
+}
+
+/**
+ * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object
+ */
+export type APIModalSubmitInteraction = APIBaseInteraction<InteractionType.ModalSubmit, APIModalSubmission>;
diff --git a/deno/payloads/v9/_interactions/responses.ts b/deno/payloads/v9/_interactions/responses.ts
index a4655fb5..9a8b63fb 100644
--- a/deno/payloads/v9/_interactions/responses.ts
+++ b/deno/payloads/v9/_interactions/responses.ts
@@ -1,6 +1,7 @@
 import type { MessageFlags } from '../mod.ts';
 import type { RESTPostAPIWebhookWithTokenJSONBody } from '../../../v9.ts';
 import type { APIApplicationCommandOptionChoice } from './applicationCommands.ts';
+import type { APIActionRowComponent, APIModalComponent } from '../channel.ts';
 
 /**
  * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object-interaction-type
@@ -10,6 +11,7 @@ export enum InteractionType {
 	ApplicationCommand,
 	MessageComponent,
 	ApplicationCommandAutocomplete,
+	ModalSubmit,
 }
 
 /**
@@ -32,6 +34,11 @@ export interface APIApplicationCommandAutocompleteResponse {
 	data: APICommandAutocompleteInteractionResponseCallbackData;
 }
 
+export interface APIModalInteractionResponse {
+	type: InteractionResponseType.Modal;
+	data: APIModalInteractionResponseCallbackData;
+}
+
 export interface APIInteractionResponseChannelMessageWithSource {
 	type: InteractionResponseType.ChannelMessageWithSource;
 	data: APIInteractionResponseCallbackData;
@@ -79,6 +86,10 @@ export enum InteractionResponseType {
 	 * For autocomplete interactions
 	 */
 	ApplicationCommandAutocompleteResult,
+	/**
+	 * Respond to an interaction with an modal for a user to fill-out
+	 */
+	Modal,
 }
 
 /**
@@ -92,3 +103,21 @@ export type APIInteractionResponseCallbackData = Omit<
 export interface APICommandAutocompleteInteractionResponseCallbackData {
 	choices?: APIApplicationCommandOptionChoice[];
 }
+
+/**
+ * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-response-object-modal
+ */
+export interface APIModalInteractionResponseCallbackData {
+	/**
+	 * A developer-defined identifier for the component, max 100 characters
+	 */
+	custom_id: string;
+	/**
+	 * The title of the popup modal
+	 */
+	title: string;
+	/**
+	 * Between 1 and 5 (inclusive) components that make up the modal
+	 */
+	components: APIActionRowComponent<APIModalComponent>[];
+}
diff --git a/deno/payloads/v9/channel.ts b/deno/payloads/v9/channel.ts
index 92d1c1df..f98c49d4 100644
--- a/deno/payloads/v9/channel.ts
+++ b/deno/payloads/v9/channel.ts
@@ -3,10 +3,10 @@
  */
 
 import type { Permissions, Snowflake } from '../../globals.ts';
+import type { APIApplication } from './application.ts';
 import type { APIPartialEmoji } from './emoji.ts';
 import type { APIGuildMember } from './guild.ts';
 import type { APIMessageInteraction } from './interactions.ts';
-import type { APIApplication } from './application.ts';
 import type { APIRole } from './permissions.ts';
 import type { APISticker, APIStickerItem } from './sticker.ts';
 import type { APIUser } from './user.ts';
@@ -483,7 +483,7 @@ export interface APIMessage {
 	/**
 	 * Sent if the message contains components like buttons, action rows, or other interactive components
 	 */
-	components?: APIActionRowComponent[];
+	components?: APIActionRowComponent<APIMessageComponent>[];
 	/**
 	 * Sent if the message contains stickers
 	 *
@@ -1145,7 +1145,7 @@ export interface APIAllowedMentions {
 /**
  * https://discord.com/developers/docs/interactions/message-components#component-object
  */
-export interface APIBaseMessageComponent<T extends ComponentType> {
+export interface APIBaseComponent<T extends ComponentType> {
 	/**
 	 * The type of the component
 	 */
@@ -1168,22 +1168,27 @@ export enum ComponentType {
 	 * Select Menu component
 	 */
 	SelectMenu,
+	/**
+	 * Text Input component
+	 */
+	TextInput,
 }
 
 /**
  * https://discord.com/developers/docs/interactions/message-components#action-rows
  */
-export interface APIActionRowComponent extends APIBaseMessageComponent<ComponentType.ActionRow> {
+export interface APIActionRowComponent<T extends APIActionRowComponentTypes>
+	extends APIBaseComponent<ComponentType.ActionRow> {
 	/**
 	 * The components in the ActionRow
 	 */
-	components: Exclude<APIMessageComponent, APIActionRowComponent>[];
+	components: Exclude<T, APIActionRowComponent<T>>[];
 }
 
 /**
  * https://discord.com/developers/docs/interactions/message-components#buttons
  */
-interface APIButtonComponentBase<Style extends ButtonStyle> extends APIBaseMessageComponent<ComponentType.Button> {
+interface APIButtonComponentBase<Style extends ButtonStyle> extends APIBaseComponent<ComponentType.Button> {
 	/**
 	 * The label to be displayed on the button
 	 */
@@ -1247,10 +1252,18 @@ export enum ButtonStyle {
 	Link,
 }
 
+/**
+ * https://discord.com/developers/docs/interactions/message-components#text-inputs-text-input-styles
+ */
+export enum TextInputStyle {
+	Short = 1,
+	Paragraph,
+}
+
 /**
  * https://discord.com/developers/docs/interactions/message-components#select-menus
  */
-export interface APISelectMenuComponent extends APIBaseMessageComponent<ComponentType.SelectMenu> {
+export interface APISelectMenuComponent extends APIBaseComponent<ComponentType.SelectMenu> {
 	/**
 	 * A developer-defined identifier for the select menu, max 100 characters
 	 */
@@ -1309,7 +1322,57 @@ export interface APISelectMenuOption {
 	default?: boolean;
 }
 
+/**
+ * https://discord.com/developers/docs/interactions/message-components#text-inputs-text-input-structure
+ */
+export interface APITextInputComponent extends APIBaseComponent<ComponentType.TextInput> {
+	/**
+	 * One of text input styles
+	 */
+	style: TextInputStyle;
+	/**
+	 * The custom id for the text input
+	 */
+	custom_id: string;
+	/**
+	 * Text that appears on top of the text input field, max 80 characters
+	 */
+	label: string;
+	/**
+	 * Placeholder for the text input
+	 */
+	placeholder?: string;
+	/**
+	 * The pre-filled text in the text input
+	 */
+	value?: string;
+	/**
+	 * Minimal length of text input
+	 */
+	min_length?: number;
+	/**
+	 * Maximal length of text input
+	 */
+	max_length?: number;
+	/**
+	 * Whether or not this text input is required or not
+	 */
+	required?: boolean;
+}
+
+export type APIActionRowComponentTypes = APIMessageComponent | APIModalComponent;
+
 /**
  * https://discord.com/developers/docs/interactions/message-components#message-components
  */
-export type APIMessageComponent = APIActionRowComponent | APIButtonComponent | APISelectMenuComponent;
+export type APIMessageComponent =
+	| APIActionRowComponent<APIMessageComponent>
+	| APIButtonComponent
+	| APISelectMenuComponent;
+
+export type APIMessageActionRowComponent = APIActionRowComponent<APIMessageComponent>;
+
+// Modal components
+export type APIModalComponent = APIActionRowComponent<APIModalComponent> | APITextInputComponent;
+
+export type APIModalActionRowComponent = APIActionRowComponent<APIModalComponent>;
diff --git a/deno/payloads/v9/interactions.ts b/deno/payloads/v9/interactions.ts
index e2903adc..68256d1c 100644
--- a/deno/payloads/v9/interactions.ts
+++ b/deno/payloads/v9/interactions.ts
@@ -16,6 +16,7 @@ export * from './_interactions/messageComponents.ts';
 export * from './_interactions/ping.ts';
 export * from './_interactions/responses.ts';
 export * from './_interactions/applicationCommands.ts';
+export * from './_interactions/modalSubmit.ts';
 
 /**
  * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object
diff --git a/deno/rest/v8/channel.ts b/deno/rest/v8/channel.ts
index 8a79ea46..5250efc3 100644
--- a/deno/rest/v8/channel.ts
+++ b/deno/rest/v8/channel.ts
@@ -1,6 +1,7 @@
 import type { Permissions, Snowflake } from '../../globals.ts';
 import type {
 	APIActionRowComponent,
+	APIMessageComponent,
 	APIAllowedMentions,
 	APIAttachment,
 	APIChannel,
@@ -213,7 +214,7 @@ export type RESTPostAPIChannelMessageJSONBody = AddUndefinedToPossiblyUndefinedP
 	 *
 	 * See https://discord.com/developers/docs/interactions/message-components#component-object
 	 */
-	components?: APIActionRowComponent[];
+	components?: APIActionRowComponent<APIMessageComponent>[];
 	/**
 	 * IDs of up to 3 stickers in the server to send in the message
 	 *
@@ -347,7 +348,7 @@ export type RESTPatchAPIChannelMessageJSONBody = AddUndefinedToPossiblyUndefined
 	 *
 	 * See https://discord.com/developers/docs/interactions/message-components#component-object
 	 */
-	components?: APIActionRowComponent[] | null;
+	components?: APIActionRowComponent<APIMessageComponent>[] | null;
 }>;
 
 /**
diff --git a/deno/rest/v8/webhook.ts b/deno/rest/v8/webhook.ts
index 343c1a3b..776e110f 100644
--- a/deno/rest/v8/webhook.ts
+++ b/deno/rest/v8/webhook.ts
@@ -7,6 +7,7 @@ import type {
 	APIWebhook,
 	APIAttachment,
 	MessageFlags,
+	APIMessageComponent,
 } from '../../payloads/v8/mod.ts';
 import type { AddUndefinedToPossiblyUndefinedPropertiesOfInterface, Nullable } from '../../utils/internals.ts';
 
@@ -135,7 +136,7 @@ export type RESTPostAPIWebhookWithTokenJSONBody = AddUndefinedToPossiblyUndefine
 	 *
 	 * See https://discord.com/developers/docs/interactions/message-components#component-object
 	 */
-	components?: APIActionRowComponent[];
+	components?: APIActionRowComponent<APIMessageComponent>[];
 	/**
 	 * Attachment objects with filename and description
 	 */
diff --git a/deno/rest/v9/channel.ts b/deno/rest/v9/channel.ts
index efc08bd8..167aec75 100644
--- a/deno/rest/v9/channel.ts
+++ b/deno/rest/v9/channel.ts
@@ -1,5 +1,6 @@
 import type { Permissions, Snowflake } from '../../globals.ts';
 import type {
+	APIMessageComponent,
 	APIActionRowComponent,
 	APIAllowedMentions,
 	APIAttachment,
@@ -246,7 +247,7 @@ export type RESTPostAPIChannelMessageJSONBody = AddUndefinedToPossiblyUndefinedP
 	 *
 	 * See https://discord.com/developers/docs/interactions/message-components#component-object
 	 */
-	components?: APIActionRowComponent[];
+	components?: APIActionRowComponent<APIMessageComponent>[];
 	/**
 	 * IDs of up to 3 stickers in the server to send in the message
 	 *
@@ -380,7 +381,7 @@ export type RESTPatchAPIChannelMessageJSONBody = AddUndefinedToPossiblyUndefined
 	 *
 	 * See https://discord.com/developers/docs/interactions/message-components#component-object
 	 */
-	components?: APIActionRowComponent[] | null;
+	components?: APIActionRowComponent<APIMessageComponent>[] | null;
 }>;
 
 /**
diff --git a/deno/rest/v9/webhook.ts b/deno/rest/v9/webhook.ts
index 9b4e53de..7266b6fe 100644
--- a/deno/rest/v9/webhook.ts
+++ b/deno/rest/v9/webhook.ts
@@ -7,6 +7,7 @@ import type {
 	APIWebhook,
 	APIAttachment,
 	MessageFlags,
+	APIMessageComponent,
 } from '../../payloads/v9/mod.ts';
 import type { AddUndefinedToPossiblyUndefinedPropertiesOfInterface, Nullable } from '../../utils/internals.ts';
 
@@ -135,7 +136,7 @@ export type RESTPostAPIWebhookWithTokenJSONBody = AddUndefinedToPossiblyUndefine
 	 *
 	 * See https://discord.com/developers/docs/interactions/message-components#component-object
 	 */
-	components?: APIActionRowComponent[];
+	components?: APIActionRowComponent<APIMessageComponent>[];
 	/**
 	 * Attachment objects with filename and description
 	 */
diff --git a/payloads/v8/_interactions/modalSubmit.ts b/payloads/v8/_interactions/modalSubmit.ts
new file mode 100644
index 00000000..9f429044
--- /dev/null
+++ b/payloads/v8/_interactions/modalSubmit.ts
@@ -0,0 +1,28 @@
+import type { APIActionRowComponent, APIModalComponent } from '../channel';
+import type { APIBaseInteraction, InteractionType, ComponentType } from '../index';
+
+export interface ModalSubmitComponent {
+	type: ComponentType;
+	custom_id: string;
+	value: string;
+}
+
+export interface ModalSubmitActionRowComponent extends Omit<APIActionRowComponent<APIModalComponent>, 'components'> {
+	components: ModalSubmitComponent[];
+}
+
+export interface APIModalSubmission {
+	/**
+	 * A developer-defined identifier for the component, max 100 characters
+	 */
+	custom_id: string;
+	/**
+	 * A list of child components
+	 */
+	components?: ModalSubmitActionRowComponent[];
+}
+
+/**
+ * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object
+ */
+export type APIModalSubmitInteraction = APIBaseInteraction<InteractionType.ModalSubmit, APIModalSubmission>;
diff --git a/payloads/v8/_interactions/responses.ts b/payloads/v8/_interactions/responses.ts
index d27cafea..0a46f5ab 100644
--- a/payloads/v8/_interactions/responses.ts
+++ b/payloads/v8/_interactions/responses.ts
@@ -1,6 +1,7 @@
 import type { MessageFlags } from '../index';
 import type { RESTPostAPIWebhookWithTokenJSONBody } from '../../../v8';
 import type { APIApplicationCommandOptionChoice } from './applicationCommands';
+import type { APIActionRowComponent, APIModalComponent } from '../channel';
 
 /**
  * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object-interaction-type
@@ -10,6 +11,7 @@ export enum InteractionType {
 	ApplicationCommand,
 	MessageComponent,
 	ApplicationCommandAutocomplete,
+	ModalSubmit,
 }
 
 /**
@@ -32,6 +34,11 @@ export interface APIApplicationCommandAutocompleteResponse {
 	data: APICommandAutocompleteInteractionResponseCallbackData;
 }
 
+export interface APIModalInteractionResponse {
+	type: InteractionResponseType.Modal;
+	data: APIModalInteractionResponseCallbackData;
+}
+
 export interface APIInteractionResponseChannelMessageWithSource {
 	type: InteractionResponseType.ChannelMessageWithSource;
 	data: APIInteractionResponseCallbackData;
@@ -79,6 +86,10 @@ export enum InteractionResponseType {
 	 * For autocomplete interactions
 	 */
 	ApplicationCommandAutocompleteResult,
+	/**
+	 * Respond to an interaction with an modal for a user to fill-out
+	 */
+	Modal,
 }
 
 /**
@@ -92,3 +103,21 @@ export type APIInteractionResponseCallbackData = Omit<
 export interface APICommandAutocompleteInteractionResponseCallbackData {
 	choices?: APIApplicationCommandOptionChoice[];
 }
+
+/**
+ * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-response-object-modal
+ */
+export interface APIModalInteractionResponseCallbackData {
+	/**
+	 * A developer-defined identifier for the component, max 100 characters
+	 */
+	custom_id: string;
+	/**
+	 * The title of the popup modal
+	 */
+	title: string;
+	/**
+	 * Between 1 and 5 (inclusive) components that make up the modal
+	 */
+	components: APIActionRowComponent<APIModalComponent>[];
+}
diff --git a/payloads/v8/channel.ts b/payloads/v8/channel.ts
index f2ca05c5..5be0ce1f 100644
--- a/payloads/v8/channel.ts
+++ b/payloads/v8/channel.ts
@@ -3,10 +3,10 @@
  */
 
 import type { Permissions, Snowflake } from '../../globals';
+import type { APIApplication } from './application';
 import type { APIPartialEmoji } from './emoji';
 import type { APIGuildMember } from './guild';
 import type { APIMessageInteraction } from './interactions';
-import type { APIApplication } from './application';
 import type { APIRole } from './permissions';
 import type { APISticker, APIStickerItem } from './sticker';
 import type { APIUser } from './user';
@@ -406,7 +406,7 @@ export interface APIMessage {
 	/**
 	 * Sent if the message contains components like buttons, action rows, or other interactive components
 	 */
-	components?: APIActionRowComponent[];
+	components?: APIActionRowComponent<APIMessageComponent>[];
 	/**
 	 * Sent if the message contains stickers
 	 *
@@ -976,7 +976,7 @@ export interface APIAllowedMentions {
 /**
  * https://discord.com/developers/docs/interactions/message-components#component-object
  */
-export interface APIBaseMessageComponent<T extends ComponentType> {
+export interface APIBaseComponent<T extends ComponentType> {
 	/**
 	 * The type of the component
 	 */
@@ -999,22 +999,27 @@ export enum ComponentType {
 	 * Select Menu component
 	 */
 	SelectMenu,
+	/**
+	 * Text Input component
+	 */
+	TextInput,
 }
 
 /**
  * https://discord.com/developers/docs/interactions/message-components#action-rows
  */
-export interface APIActionRowComponent extends APIBaseMessageComponent<ComponentType.ActionRow> {
+export interface APIActionRowComponent<T extends APIActionRowComponentTypes>
+	extends APIBaseComponent<ComponentType.ActionRow> {
 	/**
 	 * The components in the ActionRow
 	 */
-	components: Exclude<APIMessageComponent, APIActionRowComponent>[];
+	components: Exclude<T, APIActionRowComponent<T>>[];
 }
 
 /**
  * https://discord.com/developers/docs/interactions/message-components#buttons
  */
-interface APIButtonComponentBase<Style extends ButtonStyle> extends APIBaseMessageComponent<ComponentType.Button> {
+interface APIButtonComponentBase<Style extends ButtonStyle> extends APIBaseComponent<ComponentType.Button> {
 	/**
 	 * The label to be displayed on the button
 	 */
@@ -1078,10 +1083,18 @@ export enum ButtonStyle {
 	Link,
 }
 
+/**
+ * https://discord.com/developers/docs/interactions/message-components#text-inputs-text-input-styles
+ */
+export enum TextInputStyle {
+	Short = 1,
+	Paragraph,
+}
+
 /**
  * https://discord.com/developers/docs/interactions/message-components#select-menus
  */
-export interface APISelectMenuComponent extends APIBaseMessageComponent<ComponentType.SelectMenu> {
+export interface APISelectMenuComponent extends APIBaseComponent<ComponentType.SelectMenu> {
 	/**
 	 * A developer-defined identifier for the select menu, max 100 characters
 	 */
@@ -1140,7 +1153,57 @@ export interface APISelectMenuOption {
 	default?: boolean;
 }
 
+/**
+ * https://discord.com/developers/docs/interactions/message-components#text-inputs-text-input-structure
+ */
+export interface APITextInputComponent extends APIBaseComponent<ComponentType.TextInput> {
+	/**
+	 * One of text input styles
+	 */
+	style: TextInputStyle;
+	/**
+	 * The custom id for the text input
+	 */
+	custom_id: string;
+	/**
+	 * Text that appears on top of the text input field, max 80 characters
+	 */
+	label: string;
+	/**
+	 * Placeholder for the text input
+	 */
+	placeholder?: string;
+	/**
+	 * The pre-filled text in the text input
+	 */
+	value?: string;
+	/**
+	 * Minimal length of text input
+	 */
+	min_length?: number;
+	/**
+	 * Maximal length of text input
+	 */
+	max_length?: number;
+	/**
+	 * Whether or not this text input is required or not
+	 */
+	required?: boolean;
+}
+
+export type APIActionRowComponentTypes = APIMessageComponent | APIModalComponent;
+
 /**
  * https://discord.com/developers/docs/interactions/message-components#message-components
  */
-export type APIMessageComponent = APIActionRowComponent | APIButtonComponent | APISelectMenuComponent;
+export type APIMessageComponent =
+	| APIActionRowComponent<APIMessageComponent>
+	| APIButtonComponent
+	| APISelectMenuComponent;
+
+export type APIMessageActionRowComponent = APIActionRowComponent<APIMessageComponent>;
+
+// Modal components
+export type APIModalComponent = APIActionRowComponent<APIModalComponent> | APITextInputComponent;
+
+export type APIModalActionRowComponent = APIActionRowComponent<APIModalComponent>;
diff --git a/payloads/v8/interactions.ts b/payloads/v8/interactions.ts
index e1ef9072..5448a203 100644
--- a/payloads/v8/interactions.ts
+++ b/payloads/v8/interactions.ts
@@ -16,6 +16,7 @@ export * from './_interactions/messageComponents';
 export * from './_interactions/ping';
 export * from './_interactions/responses';
 export * from './_interactions/applicationCommands';
+export * from './_interactions/modalSubmit';
 
 /**
  * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object
diff --git a/payloads/v9/_interactions/modalSubmit.ts b/payloads/v9/_interactions/modalSubmit.ts
new file mode 100644
index 00000000..9f429044
--- /dev/null
+++ b/payloads/v9/_interactions/modalSubmit.ts
@@ -0,0 +1,28 @@
+import type { APIActionRowComponent, APIModalComponent } from '../channel';
+import type { APIBaseInteraction, InteractionType, ComponentType } from '../index';
+
+export interface ModalSubmitComponent {
+	type: ComponentType;
+	custom_id: string;
+	value: string;
+}
+
+export interface ModalSubmitActionRowComponent extends Omit<APIActionRowComponent<APIModalComponent>, 'components'> {
+	components: ModalSubmitComponent[];
+}
+
+export interface APIModalSubmission {
+	/**
+	 * A developer-defined identifier for the component, max 100 characters
+	 */
+	custom_id: string;
+	/**
+	 * A list of child components
+	 */
+	components?: ModalSubmitActionRowComponent[];
+}
+
+/**
+ * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object
+ */
+export type APIModalSubmitInteraction = APIBaseInteraction<InteractionType.ModalSubmit, APIModalSubmission>;
diff --git a/payloads/v9/_interactions/responses.ts b/payloads/v9/_interactions/responses.ts
index fd169657..3f92fcf8 100644
--- a/payloads/v9/_interactions/responses.ts
+++ b/payloads/v9/_interactions/responses.ts
@@ -1,6 +1,7 @@
 import type { MessageFlags } from '../index';
 import type { RESTPostAPIWebhookWithTokenJSONBody } from '../../../v9';
 import type { APIApplicationCommandOptionChoice } from './applicationCommands';
+import type { APIActionRowComponent, APIModalComponent } from '../channel';
 
 /**
  * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object-interaction-type
@@ -10,6 +11,7 @@ export enum InteractionType {
 	ApplicationCommand,
 	MessageComponent,
 	ApplicationCommandAutocomplete,
+	ModalSubmit,
 }
 
 /**
@@ -32,6 +34,11 @@ export interface APIApplicationCommandAutocompleteResponse {
 	data: APICommandAutocompleteInteractionResponseCallbackData;
 }
 
+export interface APIModalInteractionResponse {
+	type: InteractionResponseType.Modal;
+	data: APIModalInteractionResponseCallbackData;
+}
+
 export interface APIInteractionResponseChannelMessageWithSource {
 	type: InteractionResponseType.ChannelMessageWithSource;
 	data: APIInteractionResponseCallbackData;
@@ -79,6 +86,10 @@ export enum InteractionResponseType {
 	 * For autocomplete interactions
 	 */
 	ApplicationCommandAutocompleteResult,
+	/**
+	 * Respond to an interaction with an modal for a user to fill-out
+	 */
+	Modal,
 }
 
 /**
@@ -92,3 +103,21 @@ export type APIInteractionResponseCallbackData = Omit<
 export interface APICommandAutocompleteInteractionResponseCallbackData {
 	choices?: APIApplicationCommandOptionChoice[];
 }
+
+/**
+ * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-response-object-modal
+ */
+export interface APIModalInteractionResponseCallbackData {
+	/**
+	 * A developer-defined identifier for the component, max 100 characters
+	 */
+	custom_id: string;
+	/**
+	 * The title of the popup modal
+	 */
+	title: string;
+	/**
+	 * Between 1 and 5 (inclusive) components that make up the modal
+	 */
+	components: APIActionRowComponent<APIModalComponent>[];
+}
diff --git a/payloads/v9/channel.ts b/payloads/v9/channel.ts
index 1a63edb9..ad6f22da 100644
--- a/payloads/v9/channel.ts
+++ b/payloads/v9/channel.ts
@@ -3,10 +3,10 @@
  */
 
 import type { Permissions, Snowflake } from '../../globals';
+import type { APIApplication } from './application';
 import type { APIPartialEmoji } from './emoji';
 import type { APIGuildMember } from './guild';
 import type { APIMessageInteraction } from './interactions';
-import type { APIApplication } from './application';
 import type { APIRole } from './permissions';
 import type { APISticker, APIStickerItem } from './sticker';
 import type { APIUser } from './user';
@@ -483,7 +483,7 @@ export interface APIMessage {
 	/**
 	 * Sent if the message contains components like buttons, action rows, or other interactive components
 	 */
-	components?: APIActionRowComponent[];
+	components?: APIActionRowComponent<APIMessageComponent>[];
 	/**
 	 * Sent if the message contains stickers
 	 *
@@ -1145,7 +1145,7 @@ export interface APIAllowedMentions {
 /**
  * https://discord.com/developers/docs/interactions/message-components#component-object
  */
-export interface APIBaseMessageComponent<T extends ComponentType> {
+export interface APIBaseComponent<T extends ComponentType> {
 	/**
 	 * The type of the component
 	 */
@@ -1168,22 +1168,27 @@ export enum ComponentType {
 	 * Select Menu component
 	 */
 	SelectMenu,
+	/**
+	 * Text Input component
+	 */
+	TextInput,
 }
 
 /**
  * https://discord.com/developers/docs/interactions/message-components#action-rows
  */
-export interface APIActionRowComponent extends APIBaseMessageComponent<ComponentType.ActionRow> {
+export interface APIActionRowComponent<T extends APIActionRowComponentTypes>
+	extends APIBaseComponent<ComponentType.ActionRow> {
 	/**
 	 * The components in the ActionRow
 	 */
-	components: Exclude<APIMessageComponent, APIActionRowComponent>[];
+	components: Exclude<T, APIActionRowComponent<T>>[];
 }
 
 /**
  * https://discord.com/developers/docs/interactions/message-components#buttons
  */
-interface APIButtonComponentBase<Style extends ButtonStyle> extends APIBaseMessageComponent<ComponentType.Button> {
+interface APIButtonComponentBase<Style extends ButtonStyle> extends APIBaseComponent<ComponentType.Button> {
 	/**
 	 * The label to be displayed on the button
 	 */
@@ -1247,10 +1252,18 @@ export enum ButtonStyle {
 	Link,
 }
 
+/**
+ * https://discord.com/developers/docs/interactions/message-components#text-inputs-text-input-styles
+ */
+export enum TextInputStyle {
+	Short = 1,
+	Paragraph,
+}
+
 /**
  * https://discord.com/developers/docs/interactions/message-components#select-menus
  */
-export interface APISelectMenuComponent extends APIBaseMessageComponent<ComponentType.SelectMenu> {
+export interface APISelectMenuComponent extends APIBaseComponent<ComponentType.SelectMenu> {
 	/**
 	 * A developer-defined identifier for the select menu, max 100 characters
 	 */
@@ -1309,7 +1322,57 @@ export interface APISelectMenuOption {
 	default?: boolean;
 }
 
+/**
+ * https://discord.com/developers/docs/interactions/message-components#text-inputs-text-input-structure
+ */
+export interface APITextInputComponent extends APIBaseComponent<ComponentType.TextInput> {
+	/**
+	 * One of text input styles
+	 */
+	style: TextInputStyle;
+	/**
+	 * The custom id for the text input
+	 */
+	custom_id: string;
+	/**
+	 * Text that appears on top of the text input field, max 80 characters
+	 */
+	label: string;
+	/**
+	 * Placeholder for the text input
+	 */
+	placeholder?: string;
+	/**
+	 * The pre-filled text in the text input
+	 */
+	value?: string;
+	/**
+	 * Minimal length of text input
+	 */
+	min_length?: number;
+	/**
+	 * Maximal length of text input
+	 */
+	max_length?: number;
+	/**
+	 * Whether or not this text input is required or not
+	 */
+	required?: boolean;
+}
+
+export type APIActionRowComponentTypes = APIMessageComponent | APIModalComponent;
+
 /**
  * https://discord.com/developers/docs/interactions/message-components#message-components
  */
-export type APIMessageComponent = APIActionRowComponent | APIButtonComponent | APISelectMenuComponent;
+export type APIMessageComponent =
+	| APIActionRowComponent<APIMessageComponent>
+	| APIButtonComponent
+	| APISelectMenuComponent;
+
+export type APIMessageActionRowComponent = APIActionRowComponent<APIMessageComponent>;
+
+// Modal components
+export type APIModalComponent = APIActionRowComponent<APIModalComponent> | APITextInputComponent;
+
+export type APIModalActionRowComponent = APIActionRowComponent<APIModalComponent>;
diff --git a/payloads/v9/interactions.ts b/payloads/v9/interactions.ts
index e1ef9072..5448a203 100644
--- a/payloads/v9/interactions.ts
+++ b/payloads/v9/interactions.ts
@@ -16,6 +16,7 @@ export * from './_interactions/messageComponents';
 export * from './_interactions/ping';
 export * from './_interactions/responses';
 export * from './_interactions/applicationCommands';
+export * from './_interactions/modalSubmit';
 
 /**
  * https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object
diff --git a/rest/v8/channel.ts b/rest/v8/channel.ts
index 856cbd44..f53131d8 100644
--- a/rest/v8/channel.ts
+++ b/rest/v8/channel.ts
@@ -1,6 +1,7 @@
 import type { Permissions, Snowflake } from '../../globals';
 import type {
 	APIActionRowComponent,
+	APIMessageComponent,
 	APIAllowedMentions,
 	APIAttachment,
 	APIChannel,
@@ -213,7 +214,7 @@ export type RESTPostAPIChannelMessageJSONBody = AddUndefinedToPossiblyUndefinedP
 	 *
 	 * See https://discord.com/developers/docs/interactions/message-components#component-object
 	 */
-	components?: APIActionRowComponent[];
+	components?: APIActionRowComponent<APIMessageComponent>[];
 	/**
 	 * IDs of up to 3 stickers in the server to send in the message
 	 *
@@ -347,7 +348,7 @@ export type RESTPatchAPIChannelMessageJSONBody = AddUndefinedToPossiblyUndefined
 	 *
 	 * See https://discord.com/developers/docs/interactions/message-components#component-object
 	 */
-	components?: APIActionRowComponent[] | null;
+	components?: APIActionRowComponent<APIMessageComponent>[] | null;
 }>;
 
 /**
diff --git a/rest/v8/webhook.ts b/rest/v8/webhook.ts
index 5b1336d9..69e33547 100644
--- a/rest/v8/webhook.ts
+++ b/rest/v8/webhook.ts
@@ -7,6 +7,7 @@ import type {
 	APIWebhook,
 	APIAttachment,
 	MessageFlags,
+	APIMessageComponent,
 } from '../../payloads/v8/index';
 import type { AddUndefinedToPossiblyUndefinedPropertiesOfInterface, Nullable } from '../../utils/internals';
 
@@ -135,7 +136,7 @@ export type RESTPostAPIWebhookWithTokenJSONBody = AddUndefinedToPossiblyUndefine
 	 *
 	 * See https://discord.com/developers/docs/interactions/message-components#component-object
 	 */
-	components?: APIActionRowComponent[];
+	components?: APIActionRowComponent<APIMessageComponent>[];
 	/**
 	 * Attachment objects with filename and description
 	 */
diff --git a/rest/v9/channel.ts b/rest/v9/channel.ts
index 35d08a60..a30547bb 100644
--- a/rest/v9/channel.ts
+++ b/rest/v9/channel.ts
@@ -1,5 +1,6 @@
 import type { Permissions, Snowflake } from '../../globals';
 import type {
+	APIMessageComponent,
 	APIActionRowComponent,
 	APIAllowedMentions,
 	APIAttachment,
@@ -246,7 +247,7 @@ export type RESTPostAPIChannelMessageJSONBody = AddUndefinedToPossiblyUndefinedP
 	 *
 	 * See https://discord.com/developers/docs/interactions/message-components#component-object
 	 */
-	components?: APIActionRowComponent[];
+	components?: APIActionRowComponent<APIMessageComponent>[];
 	/**
 	 * IDs of up to 3 stickers in the server to send in the message
 	 *
@@ -380,7 +381,7 @@ export type RESTPatchAPIChannelMessageJSONBody = AddUndefinedToPossiblyUndefined
 	 *
 	 * See https://discord.com/developers/docs/interactions/message-components#component-object
 	 */
-	components?: APIActionRowComponent[] | null;
+	components?: APIActionRowComponent<APIMessageComponent>[] | null;
 }>;
 
 /**
diff --git a/rest/v9/webhook.ts b/rest/v9/webhook.ts
index e413559a..cf402514 100644
--- a/rest/v9/webhook.ts
+++ b/rest/v9/webhook.ts
@@ -7,6 +7,7 @@ import type {
 	APIWebhook,
 	APIAttachment,
 	MessageFlags,
+	APIMessageComponent,
 } from '../../payloads/v9/index';
 import type { AddUndefinedToPossiblyUndefinedPropertiesOfInterface, Nullable } from '../../utils/internals';
 
@@ -135,7 +136,7 @@ export type RESTPostAPIWebhookWithTokenJSONBody = AddUndefinedToPossiblyUndefine
 	 *
 	 * See https://discord.com/developers/docs/interactions/message-components#component-object
 	 */
-	components?: APIActionRowComponent[];
+	components?: APIActionRowComponent<APIMessageComponent>[];
 	/**
 	 * Attachment objects with filename and description
 	 */