discord.js 15.0.0-dev.1745947844-82435c308 → 15.0.0-dev.1746144802-75179fbf9

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "discord.js",
-  "version": "15.0.0-dev.1745947844-82435c308",
+  "version": "15.0.0-dev.1746144802-75179fbf9",
   "description": "A powerful library for interacting with the Discord API",
   "main": "./src/index.js",
   "types": "./typings/index.d.ts",
@@ -64,8 +64,8 @@
     "@discordjs/collection": "^2.1.1",
     "@discordjs/formatters": "^0.6.1",
     "@discordjs/util": "^1.1.1",
-    "@discordjs/ws": "^2.0.2",
-    "@discordjs/rest": "^2.5.0"
+    "@discordjs/rest": "^2.5.0",
+    "@discordjs/ws": "^2.0.2"
   },
   "devDependencies": {
     "@favware/cliff-jumper": "^4.1.0",
@@ -85,8 +85,8 @@
     "tslint": "6.1.3",
     "turbo": "^2.5.2",
     "typescript": "~5.8.3",
-    "@discordjs/api-extractor": "^7.38.1",
     "@discordjs/docgen": "^0.12.1",
+    "@discordjs/api-extractor": "^7.38.1",
     "@discordjs/scripts": "^0.1.0"
   },
   "engines": {

package/src/index.js

@@ -131,14 +131,12 @@ exports.CommandInteraction = require('./structures/CommandInteraction.js').Comma
 exports.CommandInteractionOptionResolver =
   require('./structures/CommandInteractionOptionResolver.js').CommandInteractionOptionResolver;
 exports.Component = require('./structures/Component.js').Component;
-exports.ContainerComponent = require('./structures/ContainerComponent.js').ContainerComponent;
 exports.ContextMenuCommandInteraction =
   require('./structures/ContextMenuCommandInteraction.js').ContextMenuCommandInteraction;
 exports.DMChannel = require('./structures/DMChannel.js').DMChannel;
 exports.Embed = require('./structures/Embed.js').Embed;
 exports.Emoji = require('./structures/Emoji.js').Emoji;
 exports.Entitlement = require('./structures/Entitlement.js').Entitlement;
-exports.FileComponent = require('./structures/FileComponent.js').FileComponent;
 exports.ForumChannel = require('./structures/ForumChannel.js').ForumChannel;
 exports.Guild = require('./structures/Guild.js').Guild;
 exports.GuildAuditLogs = require('./structures/GuildAuditLogs.js').GuildAuditLogs;
@@ -167,8 +165,6 @@ exports.InteractionWebhook = require('./structures/InteractionWebhook.js').Inter
 exports.Invite = require('./structures/Invite.js').Invite;
 exports.InviteGuild = require('./structures/InviteGuild.js').InviteGuild;
 exports.MediaChannel = require('./structures/MediaChannel.js').MediaChannel;
-exports.MediaGalleryComponent = require('./structures/MediaGalleryComponent.js').MediaGalleryComponent;
-exports.MediaGalleryItem = require('./structures/MediaGalleryItem.js').MediaGalleryItem;
 exports.MentionableSelectMenuComponent =
   require('./structures/MentionableSelectMenuComponent.js').MentionableSelectMenuComponent;
 exports.MentionableSelectMenuInteraction =
@@ -200,8 +196,6 @@ exports.RichPresenceAssets = require('./structures/Presence.js').RichPresenceAss
 exports.Role = require('./structures/Role.js').Role;
 exports.RoleSelectMenuComponent = require('./structures/RoleSelectMenuComponent.js').RoleSelectMenuComponent;
 exports.RoleSelectMenuInteraction = require('./structures/RoleSelectMenuInteraction.js').RoleSelectMenuInteraction;
-exports.SectionComponent = require('./structures/SectionComponent.js').SectionComponent;
-exports.SeparatorComponent = require('./structures/SeparatorComponent.js').SeparatorComponent;
 exports.SKU = require('./structures/SKU.js').SKU;
 exports.SoundboardSound = require('./structures/SoundboardSound.js').SoundboardSound;
 exports.StageChannel = require('./structures/StageChannel.js').StageChannel;
@@ -215,14 +209,11 @@ exports.Subscription = require('./structures/Subscription.js').Subscription;
 exports.Team = require('./structures/Team.js').Team;
 exports.TeamMember = require('./structures/TeamMember.js').TeamMember;
 exports.TextChannel = require('./structures/TextChannel.js').TextChannel;
-exports.TextDisplayComponent = require('./structures/TextDisplayComponent.js').TextDisplayComponent;
 exports.TextInputComponent = require('./structures/TextInputComponent.js').TextInputComponent;
 exports.ThreadChannel = require('./structures/ThreadChannel.js').ThreadChannel;
 exports.ThreadMember = require('./structures/ThreadMember.js').ThreadMember;
 exports.ThreadOnlyChannel = require('./structures/ThreadOnlyChannel.js').ThreadOnlyChannel;
-exports.ThumbnailComponent = require('./structures/ThumbnailComponent.js').ThumbnailComponent;
 exports.Typing = require('./structures/Typing.js').Typing;
-exports.UnfurledMediaItem = require('./structures/UnfurledMediaItem.js').UnfurledMediaItem;
 exports.User = require('./structures/User.js').User;
 exports.UserContextMenuCommandInteraction =
   require('./structures/UserContextMenuCommandInteraction.js').UserContextMenuCommandInteraction;

package/src/structures/Component.js

@@ -14,15 +14,6 @@ class Component {
     this.data = data;
   }
 
-  /**
-   * The id of this component
-   * @type {number}
-   * @readonly
-   */
-  get id() {
-    return this.data.id;
-  }
-
   /**
    * The type of the component
    * @type {ComponentType}

package/src/structures/Message.js

@@ -23,7 +23,7 @@ const { ReactionCollector } = require('./ReactionCollector.js');
 const { Sticker } = require('./Sticker.js');
 const { DiscordjsError, ErrorCodes } = require('../errors/index.js');
 const { ReactionManager } = require('../managers/ReactionManager.js');
-const { createComponent, findComponentByCustomId } = require('../util/Components.js');
+const { createComponent } = require('../util/Components.js');
 const { NonSystemMessageTypes, MaxBulkDeletableMessageAge, UndeletableMessageTypes } = require('../util/Constants.js');
 const { MessageFlagsBitField } = require('../util/MessageFlagsBitField.js');
 const { PermissionsBitField } = require('../util/PermissionsBitField.js');
@@ -151,10 +151,10 @@ class Message extends Base {
 
     if ('components' in data) {
       /**
-       * An array of components in the message.
+       * An array of action rows in the message.
        * <info>This property requires the {@link GatewayIntentBits.MessageContent} privileged intent
        * in a guild for messages that do not mention the client.</info>
-       * @type {Component[]}
+       * @type {ActionRow[]}
        */
       this.components = data.components.map(component => createComponent(component));
     } else {
@@ -1032,7 +1032,7 @@ class Message extends Base {
    * @returns {?MessageActionRowComponent}
    */
   resolveComponent(customId) {
-    return findComponentByCustomId(this.components, customId);
+    return this.components.flatMap(row => row.components).find(component => component.customId === customId) ?? null;
   }
 
   /**

package/src/structures/MessageComponentInteraction.js

@@ -4,7 +4,6 @@ const { lazy } = require('@discordjs/util');
 const { BaseInteraction } = require('./BaseInteraction.js');
 const { InteractionWebhook } = require('./InteractionWebhook.js');
 const { InteractionResponses } = require('./interfaces/InteractionResponses.js');
-const { findComponentByCustomId } = require('../util/Components.js');
 
 const getMessage = lazy(() => require('./Message.js').Message);
 
@@ -80,11 +79,13 @@ class MessageComponentInteraction extends BaseInteraction {
 
   /**
    * The component which was interacted with
-   * @type {MessageActionRowComponent|APIComponentInMessageActionRow}
+   * @type {MessageActionRowComponent|APIMessageActionRowComponent}
    * @readonly
    */
   get component() {
-    return findComponentByCustomId(this.message.components, this.customId);
+    return this.message.components
+      .flatMap(row => row.components)
+      .find(component => (component.customId ?? component.custom_id) === this.customId);
   }
 
   // These are here only for documentation purposes - they are implemented by InteractionResponses

package/src/structures/MessagePayload.js

@@ -217,8 +217,7 @@ class MessagePayload {
       components,
       username,
       avatar_url: avatarURL,
-      allowed_mentions:
-        this.isMessage() && this.target.author.id !== this.target.client.user.id ? undefined : allowedMentions,
+      allowed_mentions: content === undefined && message_reference === undefined ? undefined : allowedMentions,
       flags,
       message_reference,
       attachments: this.options.attachments,

package/src/structures/interfaces/TextBasedChannel.js

@@ -77,11 +77,8 @@ class TextBasedChannel {
    * (see {@link https://discord.com/developers/docs/resources/message#allowed-mentions-object here} for more details)
    * @property {Array<(AttachmentBuilder|Attachment|AttachmentPayload|BufferResolvable)>} [files]
    * The files to send with the message.
-   * @property {Array<(ActionRowBuilder|MessageTopLevelComponent|APIMessageTopLevelComponent)>} [components]
-   * Action rows containing interactive components for the message (buttons, select menus) and other
-   * top-level components.
-   * <info>When using components v2, the flag {@link MessageFlags.IsComponentsV2} needs to be set
-   * and `content`, `embeds`, `stickers`, and `poll` cannot be used.</info>
+   * @property {Array<(ActionRowBuilder|ActionRow|APIActionRowComponent)>} [components]
+   * Action rows containing interactive components for the message (buttons, select menus)
    */
 
   /**
@@ -101,9 +98,7 @@ class TextBasedChannel {
    * that message will be returned and no new message will be created
    * @property {StickerResolvable[]} [stickers=[]] The stickers to send in the message
    * @property {MessageFlags} [flags] Which flags to set for the message.
-   * <info>Only {@link MessageFlags.SuppressEmbeds}, {@link MessageFlags.SuppressNotifications} and
-   * {@link MessageFlags.IsComponentsV2} can be set.</info>
-   * <info>{@link MessageFlags.IsComponentsV2} is required if passing components that aren't action rows</info>
+   * <info>Only `MessageFlags.SuppressEmbeds` and `MessageFlags.SuppressNotifications` can be set.</info>
    */
 
   /**

package/src/util/APITypes.js

@@ -60,11 +60,6 @@
  * @see {@link https://discord-api-types.dev/api/discord-api-types-v10#APIChannelSelectComponent}
  */
 
-/**
- * @external APIContainerComponent
- * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/APIContainerComponent}
- */
-
 /**
  * @external APIEmbed
  * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/APIEmbed}
@@ -85,11 +80,6 @@
  * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/APIEmoji}
  */
 
-/**
- * @external APIFileComponent
- * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/APIFileComponent}
- */
-
 /**
  * @external APIGuild
  * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/APIGuild}
@@ -145,16 +135,6 @@
  * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/APIInteractionGuildMember}
  */
 
-/**
- * @external APIMediaGalleryComponent
- * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/APIMediaGalleryComponent}
- */
-
-/**
- * @external APIMediaGalleryItem
- * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/APIMediaGalleryItem}
- */
-
 /**
  * @external APIMentionableSelectComponent
  * @see {@link https://discord-api-types.dev/api/discord-api-types-v10#APIMentionableSelectComponent}
@@ -166,8 +146,8 @@
  */
 
 /**
- * @external APIComponentInMessageActionRow
- * @see {@link https://discord-api-types.dev/api/discord-api-types-v10#APIComponentInMessageActionRow}
+ * @external APIMessageActionRowComponent
+ * @see {@link https://discord-api-types.dev/api/discord-api-types-v10#APIMessageActionRowComponent}
  */
 
 /**
@@ -185,11 +165,6 @@
  * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/APIMessageInteractionMetadata}
  */
 
-/**
- * @external APIMessageTopLevelComponent
- * @see {@link https://discord-api-types.dev/api/discord-api-types-v10#APIMessageTopLevelComponent}
- */
-
 /**
  * @external APIModalInteractionResponse
  * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/APIModalInteractionResponse}
@@ -235,11 +210,6 @@
  * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/APISelectMenuOption}
  */
 
-/**
- * @external APISectionComponent
- * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/APISectionComponent}
- */
-
 /**
  * @external APISticker
  * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/APISticker}
@@ -255,16 +225,6 @@
  * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/APITextInputComponent}
  */
 
-/**
- * @external APIThumbnailComponent
- * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/APIThumbnailComponent}
- */
-
-/**
- * @external APIUnfurledMediaItem
- * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/APIUnfurledMediaItem}
- */
-
 /**
  * @external APIUser
  * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/APIUser}

package/src/util/Components.js

@@ -4,7 +4,6 @@ const { ComponentType } = require('discord-api-types/v10');
 
 /**
  * @typedef {Object} BaseComponentData
- * @property {number} [id] the id of this component
  * @property {ComponentType} type The type of component
  */
 
@@ -16,30 +15,30 @@ const { ComponentType } = require('discord-api-types/v10');
 /**
  * @typedef {BaseComponentData} ButtonComponentData
  * @property {ButtonStyle} style The style of the button
- * @property {boolean} [disabled] Whether this button is disabled
+ * @property {?boolean} disabled Whether this button is disabled
  * @property {string} label The label of this button
- * @property {APIMessageComponentEmoji} [emoji] The emoji on this button
- * @property {string} [customId] The custom id of the button
- * @property {string} [url] The URL of the button
+ * @property {?APIMessageComponentEmoji} emoji The emoji on this button
+ * @property {?string} customId The custom id of the button
+ * @property {?string} url The URL of the button
  */
 
 /**
  * @typedef {Object} SelectMenuComponentOptionData
  * @property {string} label The label of the option
  * @property {string} value The value of the option
- * @property {string} [description] The description of the option
- * @property {APIMessageComponentEmoji} [emoji] The emoji on the option
- * @property {boolean} [default] Whether this option is selected by default
+ * @property {?string} description The description of the option
+ * @property {?APIMessageComponentEmoji} emoji The emoji on the option
+ * @property {?boolean} default Whether this option is selected by default
  */
 
 /**
  * @typedef {BaseComponentData} SelectMenuComponentData
  * @property {string} customId The custom id of the select menu
- * @property {boolean} [disabled] Whether the select menu is disabled or not
- * @property {number} [maxValues] The maximum amount of options that can be selected
- * @property {number} [minValues] The minimum amount of options that can be selected
- * @property {SelectMenuComponentOptionData[]} [options] The options in this select menu
- * @property {string} [placeholder] The placeholder of the select menu
+ * @property {?boolean} disabled Whether the select menu is disabled or not
+ * @property {?number} maxValues The maximum amount of options that can be selected
+ * @property {?number} minValues The minimum amount of options that can be selected
+ * @property {?SelectMenuComponentOptionData[]} options The options in this select menu
+ * @property {?string} placeholder The placeholder of the select menu
  */
 
 /**
@@ -51,81 +50,15 @@ const { ComponentType } = require('discord-api-types/v10');
  * @property {string} customId The custom id of the text input
  * @property {TextInputStyle} style The style of the text input
  * @property {string} label The text that appears on top of the text input field
- * @property {number} [minLength] The minimum number of characters that can be entered in the text input
- * @property {number} [maxLength] The maximum number of characters that can be entered in the text input
- * @property {boolean} [required] Whether or not the text input is required or not
- * @property {string} [value] The pre-filled text in the text input
- * @property {string} [placeholder] Placeholder for the text input
+ * @property {?number} minLength The minimum number of characters that can be entered in the text input
+ * @property {?number} maxLength The maximum number of characters that can be entered in the text input
+ * @property {?boolean} required Whether or not the text input is required or not
+ * @property {?string} value The pre-filled text in the text input
+ * @property {?string} placeholder Placeholder for the text input
  */
 
 /**
- * @typedef {Object} UnfurledMediaItemData
- * @property {string} url The url of this media item. Accepts either http:, https: or attachment: protocol
- */
-
-/**
- * @typedef {BaseComponentData} ThumbnailComponentData
- * @property {UnfurledMediaItemData} media The media for the thumbnail
- * @property {string} [description] The description of the thumbnail
- * @property {boolean} [spoiler] Whether the thumbnail should be spoilered
- */
-
-/**
- * @typedef {BaseComponentData} FileComponentData
- * @property {UnfurledMediaItemData} file The file media in this component
- * @property {boolean} [spoiler] Whether the file should be spoilered
- */
-
-/**
- * @typedef {Object} MediaGalleryItemData
- * @property {UnfurledMediaItemData} media The media for the media gallery item
- * @property {string} [description] The description of the media gallery item
- * @property {boolean} [spoiler] Whether the media gallery item should be spoilered
- */
-
-/**
- * @typedef {BaseComponentData} MediaGalleryComponentData
- * @property {MediaGalleryItemData[]} items The media gallery items in this media gallery component
- */
-
-/**
- * @typedef {BaseComponentData} SeparatorComponentData
- * @property {SeparatorSpacingSize} [spacing] The spacing size of this component
- * @property {boolean} [divider] Whether the separator shows as a divider
- */
-
-/**
- * @typedef {BaseComponentData} SectionComponentData
- * @property {Components[]} components The components in this section
- * @property {ButtonComponentData|ThumbnailComponentData} accessory The accessory shown next to this section
- */
-
-/**
- * @typedef {BaseComponentData} TextDisplayComponentData
- * @property {string} content The content displayed in this component
- */
-
-/**
- * @typedef {ActionRowData|FileComponentData|MediaGalleryComponentData|SectionComponentData|
- * SeparatorComponentData|TextDisplayComponentData} ComponentInContainerData
- */
-
-/**
- * @typedef {BaseComponentData} ContainerComponentData
- * @property {ComponentInContainerData} components The components in this container
- * @property {?number} [accentColor] The accent color of this container
- * @property {boolean} [spoiler] Whether the container should be spoilered
- */
-
-/**
- * @typedef {ActionRowData|ButtonComponentData|SelectMenuComponentData|TextInputComponentData|
- * ThumbnailComponentData|FileComponentData|MediaGalleryComponentData|SeparatorComponentData|
- * SectionComponentData|TextDisplayComponentData|ContainerComponentData} ComponentData
- */
-
-/**
- * @typedef {ActionRow|ContainerComponent|FileComponent|MediaGalleryComponent|
- * SectionComponent|SeparatorComponent|TextDisplayComponent} MessageTopLevelComponent
+ * @typedef {ActionRowData|ButtonComponentData|SelectMenuComponentData|TextInputComponentData} ComponentData
  */
 
 /**
@@ -156,64 +89,19 @@ function createComponent(data) {
       return new MentionableSelectMenuComponent(data);
     case ComponentType.ChannelSelect:
       return new ChannelSelectMenuComponent(data);
-    case ComponentType.Container:
-      return new ContainerComponent(data);
-    case ComponentType.TextDisplay:
-      return new TextDisplayComponent(data);
-    case ComponentType.File:
-      return new FileComponent(data);
-    case ComponentType.MediaGallery:
-      return new MediaGalleryComponent(data);
-    case ComponentType.Section:
-      return new SectionComponent(data);
-    case ComponentType.Separator:
-      return new SeparatorComponent(data);
-    case ComponentType.Thumbnail:
-      return new ThumbnailComponent(data);
     default:
       return new Component(data);
   }
 }
 
-/**
- * Finds a component by customId in nested components
- * @param {Array<Component|APIMessageComponent>} components The components to search in
- * @param {string} customId The customId to search for
- * @returns {Component|APIMessageComponent}
- */
-function findComponentByCustomId(components, customId) {
-  return (
-    components
-      .flatMap(component => {
-        switch (component.type) {
-          case ComponentType.ActionRow:
-            return component.components;
-          case ComponentType.Section:
-            return [...component.components, component.accessory];
-          default:
-            return [component];
-        }
-      })
-      .find(component => (component.customId ?? component.custom_id) === customId) ?? null
-  );
-}
-
 exports.createComponent = createComponent;
-exports.findComponentByCustomId = findComponentByCustomId;
 
 const { ActionRow } = require('../structures/ActionRow.js');
 const { ButtonComponent } = require('../structures/ButtonComponent.js');
 const { ChannelSelectMenuComponent } = require('../structures/ChannelSelectMenuComponent.js');
 const { Component } = require('../structures/Component.js');
-const { ContainerComponent } = require('../structures/ContainerComponent.js');
-const { FileComponent } = require('../structures/FileComponent.js');
-const { MediaGalleryComponent } = require('../structures/MediaGalleryComponent.js');
 const { MentionableSelectMenuComponent } = require('../structures/MentionableSelectMenuComponent.js');
 const { RoleSelectMenuComponent } = require('../structures/RoleSelectMenuComponent.js');
-const { SectionComponent } = require('../structures/SectionComponent.js');
-const { SeparatorComponent } = require('../structures/SeparatorComponent.js');
 const { StringSelectMenuComponent } = require('../structures/StringSelectMenuComponent.js');
-const { TextDisplayComponent } = require('../structures/TextDisplayComponent.js');
 const { TextInputComponent } = require('../structures/TextInputComponent.js');
-const { ThumbnailComponent } = require('../structures/ThumbnailComponent.js');
 const { UserSelectMenuComponent } = require('../structures/UserSelectMenuComponent.js');