disgroove 2.2.7-dev.4cca8cf → 2.2.7-dev.8886fa2

package/dist/lib/types/interaction.d.ts

@@ -5,8 +5,8 @@ import type { RawChannel, Channel } from "./channel";
 import type { snowflake } from "./common";
 import type { RawEntitlement, Entitlement } from "./entitlements";
 import type { RawGuildMember, GuildMember, Guild, RawGuild } from "./guild";
-import type { RawMessage, RawAttachment, RawEmbed, RawAllowedMentions, Message, Attachment, Embed, AllowedMentions, MessageTopLevelComponent, RawMessageTopLevelComponent } from "./message";
-import type { RawTextInput, TextInput } from "./message-components";
+import type { RawMessage, RawAttachment, RawEmbed, RawAllowedMentions, Message, Attachment, Embed, AllowedMentions } from "./message";
+import type { ActionRow, Container, File, Label, MediaGallery, RawActionRow, RawContainer, RawFile, RawLabel, RawMediaGallery, RawSection, RawSeparator, RawTextDisplay, Section, Separator, TextDisplay } from "./message-components";
 import type { RawPollCreateParams, PollCreateParams } from "./poll";
 import type { RawRole, Role } from "./role";
 import type { RawUser, User } from "./user";
@@ -54,10 +54,7 @@ export interface RawMessageComponentData {
 /** https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object-modal-submit-data-structure */
 export interface RawModalSubmitData {
     custom_id: string;
-    components: Array<{
-        type: ComponentTypes.ActionRow;
-        components: Array<RawTextInput>;
-    }>;
+    components: Array<RawActionRow | RawTextDisplay | RawLabel>;
 }
 /** https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object-resolved-data-structure */
 export interface RawResolvedData {
@@ -96,7 +93,7 @@ export interface RawInteractionCallbackData {
     embeds?: Array<RawEmbed>;
     allowed_mentions?: RawAllowedMentions;
     flags?: MessageFlags;
-    components?: Array<RawMessageTopLevelComponent>;
+    components?: Array<RawActionRow | RawSection | RawTextDisplay | RawMediaGallery | RawFile | RawSeparator | RawContainer | RawLabel>;
     attachments?: Array<Pick<RawAttachment, "filename" | "description">>;
     poll?: RawPollCreateParams;
     files?: Array<FileData>;
@@ -168,10 +165,7 @@ export interface MessageComponentData {
 }
 export interface ModalSubmitData {
     customID: string;
-    components: Array<{
-        type: ComponentTypes.ActionRow;
-        components: Array<TextInput>;
-    }>;
+    components: Array<ActionRow | TextDisplay | Label>;
 }
 export interface ResolvedData {
     users?: Record<snowflake, User>;
@@ -205,7 +199,7 @@ export interface InteractionCallbackData {
     embeds?: Array<Embed>;
     allowedMentions?: AllowedMentions;
     flags?: MessageFlags;
-    components?: Array<MessageTopLevelComponent>;
+    components?: Array<ActionRow | Section | TextDisplay | MediaGallery | File | Separator | Container | Label>;
     attachments?: Array<Pick<Attachment, "filename" | "description">>;
     poll?: PollCreateParams;
     files?: Array<FileData>;

package/dist/lib/types/message-components.d.ts

@@ -1,81 +1,113 @@
 import type { ButtonStyles, ChannelTypes, ComponentTypes, SeparatorSpacing, TextInputStyles } from "../constants";
 import type { snowflake } from "./common";
 import type { RawEmoji, Emoji } from "./emoji";
+/** https://discord.com/developers/docs/components/reference#action-row-action-row-structure */
+export interface RawActionRow {
+    type: ComponentTypes.ActionRow;
+    components: Array<RawButton | RawStringSelect | RawTextInput | RawUserSelect | RawRoleSelect | RawMentionableSelect | RawChannelSelect>;
+    id?: number;
+}
 /** https://discord.com/developers/docs/components/reference#button-button-structure */
 export interface RawButton {
     type: ComponentTypes.Button;
+    id?: number;
     style: ButtonStyles;
     label?: string;
     emoji?: Pick<RawEmoji, "name" | "id" | "animated">;
-    custom_id?: string;
+    custom_id: string;
     sku_id?: snowflake;
     url?: string;
     disabled?: boolean;
-    id?: number;
 }
-/** https://discord.com/developers/docs/components/reference#container-container-structure */
-export interface RawContainer {
-    type: ComponentTypes.Container;
+/** https://discord.com/developers/docs/components/reference#string-select-string-select-structure */
+export interface RawStringSelect {
+    type: ComponentTypes.StringSelect;
     id?: number;
-    components: Array<RawActionRow | RawTextDisplay | RawSection | RawMediaGallery | RawSeparator | RawFile>;
-    accent_color?: number | null;
-    spoiler?: boolean;
+    custom_id: string;
+    options: Array<RawSelectOption>;
+    placeholder?: string;
+    min_values?: number;
+    max_values?: number;
+    required?: boolean;
+    disabled?: boolean;
 }
-/** https://discord.com/developers/docs/components/reference#file-file-structure */
-export interface RawFile {
-    type: ComponentTypes.File;
+/** https://discord.com/developers/docs/components/reference#string-select-select-option-structure */
+export interface RawSelectOption {
+    label: string;
+    value: string;
+    description?: string;
+    emoji?: Pick<RawEmoji, "name" | "id" | "animated">;
+    default?: boolean;
+}
+/** https://discord.com/developers/docs/components/reference#text-input-text-input-structure */
+export interface RawTextInput {
+    type: ComponentTypes.TextInput;
     id?: number;
-    file: RawUnfurledMediaItem;
-    spoiler?: boolean;
-    name: string;
-    size: number;
+    custom_id: string;
+    style: TextInputStyles;
+    min_length?: number;
+    max_length?: number;
+    required?: boolean;
+    value?: string;
+    placeholder?: string;
+    label: string;
 }
-/** https://discord.com/developers/docs/components/reference#media-gallery-media-gallery-structure */
-export interface RawMediaGallery {
-    type: ComponentTypes.MediaGallery;
+/** https://discord.com/developers/docs/components/reference#user-select-user-select-structure */
+export interface RawUserSelect {
+    type: ComponentTypes.UserSelect;
     id?: number;
-    items: Array<RawMediaGalleryItem>;
+    custom_id: string;
+    placeholder?: string;
+    default_values?: Array<RawDefaultValue>;
+    min_values?: number;
+    max_values?: number;
+    disabled?: boolean;
 }
-/** https://discord.com/developers/docs/components/reference#media-gallery-media-gallery-item-structure */
-export interface RawMediaGalleryItem {
-    media: RawUnfurledMediaItem;
-    description?: string;
-    spoiler?: boolean;
+/** https://discord.com/developers/docs/components/reference#user-select-select-default-value-structure */
+export interface RawDefaultValue {
+    id: snowflake;
+    type: "user" | "role" | "channel";
 }
-/** https://discord.com/developers/docs/components/reference#section-section-structure */
-export interface RawSection {
-    type: ComponentTypes.Section;
+/** https://discord.com/developers/docs/components/reference#role-select-role-select-structure */
+export interface RawRoleSelect {
+    type: ComponentTypes.RoleSelect;
     id?: number;
-    components: Array<RawTextDisplay>;
-    accessory: RawThumbnail | RawButton;
-}
-/** https://discord.com/developers/docs/interactions/message-components#select-menu-object-select-menu-structure */
-export interface RawSelectMenu {
-    type: ComponentTypes.ChannelSelect | ComponentTypes.MentionableSelect | ComponentTypes.RoleSelect | ComponentTypes.StringSelect | ComponentTypes.UserSelect;
     custom_id: string;
-    options?: Array<RawSelectOption>;
-    channel_types?: Array<ChannelTypes>;
     placeholder?: string;
     default_values?: Array<RawDefaultValue>;
     min_values?: number;
     max_values?: number;
     disabled?: boolean;
+}
+/** https://discord.com/developers/docs/components/reference#mentionable-select-mentionable-select-structure */
+export interface RawMentionableSelect {
+    type: ComponentTypes.MentionableSelect;
     id?: number;
+    custom_id: string;
+    placeholder?: string;
+    default_values?: Array<RawDefaultValue>;
+    min_values?: number;
+    max_values?: number;
+    disabled?: boolean;
 }
-/** https://discord.com/developers/docs/components/reference#string-select-select-option-structure */
-export interface RawSelectOption {
-    label: string;
-    value: string;
-    description?: string;
-    emoji?: Pick<RawEmoji, "name" | "id" | "animated">;
-    default?: boolean;
+/** https://discord.com/developers/docs/components/reference#channel-select-channel-select-structure */
+export interface RawChannelSelect {
+    type: ComponentTypes.ChannelSelect;
+    id?: number;
+    custom_id: string;
+    channel_types?: Array<ChannelTypes>;
+    placeholder?: string;
+    default_values?: Array<RawDefaultValue>;
+    min_values?: number;
+    max_values?: number;
+    disabled?: boolean;
 }
-/** https://discord.com/developers/docs/components/reference#separator-separator-structure */
-export interface RawSeparator {
-    type: ComponentTypes.Separator;
+/** https://discord.com/developers/docs/components/reference#section-section-structure */
+export interface RawSection {
+    type: ComponentTypes.Section;
     id?: number;
-    divider?: boolean;
-    spacing?: SeparatorSpacing;
+    components: Array<RawTextDisplay>;
+    accessory: RawButton | RawThumbnail;
 }
 /** https://discord.com/developers/docs/components/reference#text-display-text-display-structure */
 export interface RawTextDisplay {
@@ -91,31 +123,51 @@ export interface RawThumbnail {
     description?: string;
     spoiler?: boolean;
 }
-/** https://discord.com/developers/docs/components/reference#user-select-select-default-value-structure */
-export interface RawDefaultValue {
-    id: snowflake;
-    type: string;
+/** https://discord.com/developers/docs/components/reference#media-gallery-media-gallery-structure */
+export interface RawMediaGallery {
+    type: ComponentTypes.MediaGallery;
+    id?: number;
+    items: Array<RawMediaGalleryItem>;
 }
-/** https://discord.com/developers/docs/components/reference#text-input-text-input-structure */
-export interface RawTextInput {
-    type: ComponentTypes.TextInput;
-    custom_id: string;
-    style: TextInputStyles;
-    label: string;
-    min_length?: number;
-    max_length?: number;
-    required?: boolean;
-    value?: string;
-    placeholder?: string;
+/** https://discord.com/developers/docs/components/reference#media-gallery-media-gallery-item-structure */
+export interface RawMediaGalleryItem {
+    media: RawUnfurledMediaItem;
+    description?: string;
+    spoiler?: boolean;
+}
+/** https://discord.com/developers/docs/components/reference#file-file-structure */
+export interface RawFile {
+    type: ComponentTypes.File;
     id?: number;
+    file: RawUnfurledMediaItem;
+    spoiler?: boolean;
+    name: string;
+    size: number;
 }
-/** https://discord.com/developers/docs/components/reference#action-row-action-row-structure */
-export interface RawActionRow {
-    type: ComponentTypes.ActionRow;
-    components: Array<RawButton | RawSelectMenu | RawTextInput>;
+/** https://discord.com/developers/docs/components/reference#separator-separator-structure */
+export interface RawSeparator {
+    type: ComponentTypes.Separator;
+    id?: number;
+    divider?: boolean;
+    spacing?: SeparatorSpacing;
+}
+/** https://discord.com/developers/docs/components/reference#container-container-structure */
+export interface RawContainer {
+    type: ComponentTypes.Container;
     id?: number;
+    components: Array<RawActionRow | RawTextDisplay | RawSection | RawMediaGallery | RawSeparator | RawFile>;
+    accent_color?: number | null;
+    spoiler?: boolean;
+}
+/** https://discord.com/developers/docs/components/reference#label-label-structure */
+export interface RawLabel {
+    type: ComponentTypes.Label;
+    id?: number;
+    label: string;
+    description?: string;
+    component: RawTextInput | RawStringSelect;
 }
-/** https://discord.com/developers/docs/components/reference#unfurled-media-item-structure */
+/** https://discord.com/developers/docs/components/reference#unfurled-media-item-unfurled-media-item-structure */
 export interface RawUnfurledMediaItem {
     url: string;
     proxy_url?: string;
@@ -124,72 +176,102 @@ export interface RawUnfurledMediaItem {
     content_type?: string;
     attachment_id?: snowflake;
 }
+export interface ActionRow {
+    type: ComponentTypes.ActionRow;
+    components: Array<Button | StringSelect | TextInput | UserSelect | RoleSelect | MentionableSelect | ChannelSelect>;
+    id?: number;
+}
 export interface Button {
     type: ComponentTypes.Button;
+    id?: number;
     style: ButtonStyles;
     label?: string;
     emoji?: Pick<Emoji, "name" | "id" | "animated">;
-    customID?: string;
+    customID: string;
     skuID?: snowflake;
     url?: string;
     disabled?: boolean;
-    id?: number;
 }
-export interface Container {
-    type: ComponentTypes.Container;
+export interface StringSelect {
+    type: ComponentTypes.StringSelect;
     id?: number;
-    components: Array<ActionRow | TextDisplay | Section | MediaGallery | Separator | File>;
-    accentColor?: number | null;
-    spoiler?: boolean;
+    customID: string;
+    options: Array<SelectOption>;
+    placeholder?: string;
+    minValues?: number;
+    maxValues?: number;
+    required?: boolean;
+    disabled?: boolean;
 }
-export interface File {
-    type: ComponentTypes.File;
+export interface SelectOption {
+    label: string;
+    value: string;
+    description?: string;
+    emoji?: Pick<Emoji, "name" | "id" | "animated">;
+    default?: boolean;
+}
+export interface TextInput {
+    type: ComponentTypes.TextInput;
     id?: number;
-    file: UnfurledMediaItem;
-    spoiler?: boolean;
-    name: string;
-    size: number;
+    customID: string;
+    style: TextInputStyles;
+    minLength?: number;
+    maxLength?: number;
+    required?: boolean;
+    value?: string;
+    placeholder?: string;
+    label: string;
 }
-export interface MediaGallery {
-    type: ComponentTypes.MediaGallery;
+export interface UserSelect {
+    type: ComponentTypes.UserSelect;
     id?: number;
-    items: Array<MediaGalleryItem>;
+    customID: string;
+    placeholder?: string;
+    defaultValues?: Array<DefaultValue>;
+    minValues?: number;
+    maxValues?: number;
+    disabled?: boolean;
 }
-export interface MediaGalleryItem {
-    media: UnfurledMediaItem;
-    description?: string;
-    spoiler?: boolean;
+export interface DefaultValue {
+    id: snowflake;
+    type: "user" | "role" | "channel";
 }
-export interface Section {
-    type: ComponentTypes.Section;
+export interface RoleSelect {
+    type: ComponentTypes.RoleSelect;
     id?: number;
-    components: Array<TextDisplay>;
-    accessory: Thumbnail | Button;
-}
-export interface SelectMenu {
-    type: ComponentTypes.ChannelSelect | ComponentTypes.MentionableSelect | ComponentTypes.RoleSelect | ComponentTypes.StringSelect | ComponentTypes.UserSelect;
     customID: string;
-    options?: Array<SelectOption>;
-    channelTypes?: Array<ChannelTypes>;
     placeholder?: string;
     defaultValues?: Array<DefaultValue>;
     minValues?: number;
     maxValues?: number;
     disabled?: boolean;
+}
+export interface MentionableSelect {
+    type: ComponentTypes.MentionableSelect;
     id?: number;
+    customID: string;
+    placeholder?: string;
+    defaultValues?: Array<DefaultValue>;
+    minValues?: number;
+    maxValues?: number;
+    disabled?: boolean;
 }
-export interface SelectOption {
-    label: string;
-    value: string;
-    description?: string;
-    emoji?: Pick<Emoji, "name" | "id" | "animated">;
-    default?: boolean;
+export interface ChannelSelect {
+    type: ComponentTypes.ChannelSelect;
+    id?: number;
+    customID: string;
+    channelTypes?: Array<ChannelTypes>;
+    placeholder?: string;
+    defaultValues?: Array<DefaultValue>;
+    minValues?: number;
+    maxValues?: number;
+    disabled?: boolean;
 }
-export interface Separator {
-    type: ComponentTypes.Separator;
+export interface Section {
+    type: ComponentTypes.Section;
     id?: number;
-    divider?: boolean;
-    spacing?: SeparatorSpacing;
+    components: Array<TextDisplay>;
+    accessory: Button | Thumbnail;
 }
 export interface TextDisplay {
     type: ComponentTypes.TextDisplay;
@@ -203,26 +285,43 @@ export interface Thumbnail {
     description?: string;
     spoiler?: boolean;
 }
-export interface DefaultValue {
-    id: snowflake;
-    type: string;
+export interface MediaGallery {
+    type: ComponentTypes.MediaGallery;
+    id?: number;
+    items: Array<MediaGalleryItem>;
 }
-export interface TextInput {
-    type: ComponentTypes.TextInput;
-    customID: string;
-    style: TextInputStyles;
-    label: string;
-    minLength?: number;
-    maxLength?: number;
-    required?: boolean;
-    value?: string;
-    placeholder?: string;
+export interface MediaGalleryItem {
+    media: UnfurledMediaItem;
+    description?: string;
+    spoiler?: boolean;
+}
+export interface File {
+    type: ComponentTypes.File;
     id?: number;
+    file: UnfurledMediaItem;
+    spoiler?: boolean;
+    name: string;
+    size: number;
 }
-export interface ActionRow {
-    type: ComponentTypes.ActionRow;
-    components: Array<Button | SelectMenu | TextInput>;
+export interface Separator {
+    type: ComponentTypes.Separator;
     id?: number;
+    divider?: boolean;
+    spacing?: SeparatorSpacing;
+}
+export interface Container {
+    type: ComponentTypes.Container;
+    id?: number;
+    components: Array<ActionRow | TextDisplay | Section | MediaGallery | Separator | File>;
+    accentColor?: number | null;
+    spoiler?: boolean;
+}
+export interface Label {
+    type: ComponentTypes.Label;
+    id?: number;
+    label: string;
+    description?: string;
+    component: TextInput | StringSelect;
 }
 export interface UnfurledMediaItem {
     url: string;

package/dist/lib/types/message.d.ts

@@ -38,7 +38,7 @@ export interface RawMessage {
     interaction_metadata?: RawMessageInteractionMetadata;
     interaction?: RawMessageInteraction;
     thread?: RawChannel;
-    components?: Array<RawMessageTopLevelComponent>;
+    components?: Array<RawActionRow | RawSection | RawTextDisplay | RawMediaGallery | RawFile | RawSeparator | RawContainer>;
     sticker_items?: Array<RawStickerItem>;
     stickers?: Array<RawSticker>;
     position?: number;
@@ -47,7 +47,6 @@ export interface RawMessage {
     poll?: RawPoll;
     call?: RawMessageCall;
 }
-export type RawMessageTopLevelComponent = RawActionRow | RawTextDisplay | RawContainer | RawFile | RawSection | RawSeparator | RawMediaGallery;
 /** https://discord.com/developers/docs/resources/message#message-object-message-activity-structure */
 export interface RawMessageActivity {
     type: MessageActivityTypes;
@@ -231,7 +230,7 @@ export interface Message {
     interactionMetadata?: MessageInteractionMetadata;
     interaction?: MessageInteraction;
     thread?: Channel;
-    components?: Array<MessageTopLevelComponent>;
+    components?: Array<ActionRow | Section | TextDisplay | MediaGallery | File | Separator | Container>;
     stickerItems?: Array<StickerItem>;
     stickers?: Array<Sticker>;
     position?: number;
@@ -240,7 +239,6 @@ export interface Message {
     poll?: Poll;
     call?: MessageCall;
 }
-export type MessageTopLevelComponent = ActionRow | TextDisplay | Container | File | Section | Separator | MediaGallery;
 export interface MessageActivity {
     type: MessageActivityTypes;
     partyID?: string;

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "disgroove",
-    "version": "2.2.7-dev.4cca8cf",
+    "version": "2.2.7-dev.8886fa2",
     "description": "A module to interface with Discord",
     "main": "./dist/lib/index.js",
     "types": "./dist/lib/index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "disgroove",
-  "version": "2.2.7-dev.4cca8cf",
+  "version": "2.2.7-dev.8886fa2",
   "description": "A module to interface with Discord",
   "main": "./dist/lib/index.js",
   "types": "./dist/lib/index.d.ts",