discord.js 14.25.0 → 14.26.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "discord.js",
-  "version": "14.25.0",
+  "version": "14.26.0",
   "description": "A powerful library for interacting with the Discord API",
   "main": "./src/index.js",
   "types": "./typings/index.d.ts",
@@ -56,32 +56,32 @@
     "@discordjs/collection": "1.5.3",
     "@discordjs/ws": "^1.2.3",
     "@sapphire/snowflake": "3.5.3",
-    "discord-api-types": "^0.38.33",
+    "discord-api-types": "^0.38.40",
     "fast-deep-equal": "3.1.3",
     "lodash.snakecase": "4.1.1",
-    "magic-bytes.js": "^1.10.0",
+    "magic-bytes.js": "^1.13.0",
     "tslib": "^2.6.3",
-    "undici": "6.21.3",
-    "@discordjs/builders": "^1.13.0",
-    "@discordjs/formatters": "^0.6.2",
-    "@discordjs/rest": "^2.6.0",
-    "@discordjs/util": "^1.2.0"
+    "undici": "6.24.1",
+    "@discordjs/builders": "^1.14.0",
+    "@discordjs/rest": "^2.6.1",
+    "@discordjs/util": "^1.2.0",
+    "@discordjs/formatters": "^0.6.2"
   },
   "devDependencies": {
     "@favware/cliff-jumper": "^4.1.0",
-    "@types/node": "^16.18.105",
-    "@typescript-eslint/eslint-plugin": "^8.2.0",
-    "@typescript-eslint/parser": "^8.2.0",
+    "@types/node": "^16.18.126",
+    "@typescript-eslint/eslint-plugin": "^8.56.0",
+    "@typescript-eslint/parser": "^8.56.0",
     "cross-env": "^7.0.3",
     "dtslint": "4.2.1",
-    "eslint": "^8.57.0",
+    "eslint": "^8.57.1",
     "eslint-formatter-pretty": "^5.0.0",
     "jest": "29.7.0",
-    "prettier": "^3.3.3",
+    "prettier": "^3.8.1",
     "tsd": "^0.31.1",
     "tslint": "6.1.3",
-    "turbo": "^2.0.14",
-    "typescript": "~5.5.4",
+    "turbo": "^2.8.10",
+    "typescript": "~5.8.3",
     "@discordjs/api-extractor": "^7.38.1",
     "@discordjs/docgen": "^0.12.1",
     "@discordjs/scripts": "^0.1.0"

package/src/client/actions/Action.js

@@ -33,10 +33,16 @@ class GenericAction {
     const payloadData = {};
     const id = data.channel_id ?? data.id;
 
-    if (!('recipients' in data)) {
-      // Try to resolve the recipient, but do not add the client user.
+    if ('recipients' in data) {
+      // Try to resolve the recipient, but do not add if already existing in recipients.
       const recipient = data.author ?? data.user ?? { id: data.user_id };
-      if (recipient.id !== this.client.user.id) payloadData.recipients = [recipient];
+      if (!data.recipients.some(existingRecipient => recipient.id === existingRecipient.id)) {
+        payloadData.recipients = [...data.recipients, recipient];
+      }
+    } else {
+      // Try to resolve the recipient.
+      const recipient = data.author ?? data.user ?? { id: data.user_id };
+      payloadData.recipients = [recipient];
     }
 
     if (id !== undefined) payloadData.id = id;

package/src/client/actions/InteractionCreate.js

@@ -21,7 +21,9 @@ class InteractionCreateAction extends Action {
     const client = this.client;
 
     // Resolve and cache partial channels for Interaction#channel getter
-    const channel = data.channel && this.getChannel(data.channel);
+    const channel =
+      data.channel &&
+      this.getChannel({ ...data.channel, ...('recipients' in data.channel ? { user: data.user } : undefined) });
 
     // Do not emit this for interactions that cache messages that are non-text-based.
     let InteractionClass;

package/src/errors/DJSError.js

@@ -11,15 +11,19 @@ const Messages = require('./Messages');
  * @ignore
  */
 function makeDiscordjsError(Base) {
-  return class DiscordjsError extends Base {
+  return class extends Base {
+    static {
+      Object.defineProperty(this, 'name', { value: `Discordjs${Base.name}` });
+    }
+
     constructor(code, ...args) {
       super(message(code, args));
       this.code = code;
-      Error.captureStackTrace?.(this, DiscordjsError);
+      Error.captureStackTrace(this, this.constructor);
     }
 
     get name() {
-      return `${super.name} [${this.code}]`;
+      return `${this.constructor.name} [${this.code}]`;
     }
   };
 }

package/src/errors/Messages.js

@@ -115,7 +115,8 @@ const Messages = {
   [DjsErrorCodes.EmojiType]: 'Emoji must be a string or GuildEmoji/ReactionEmoji',
   [DjsErrorCodes.EmojiManaged]: 'Emoji is managed and has no Author.',
   [DjsErrorCodes.MissingManageGuildExpressionsPermission]: guild =>
-    `Client must have Manage Guild Expressions permission in guild ${guild} to see emoji authors.`,
+    // eslint-disable-next-line max-len
+    `Client must have Create Guild Expressions or Manage Guild Expressions permission in guild ${guild} to see emoji authors.`,
   [DjsErrorCodes.MissingManageEmojisAndStickersPermission]: guild =>
     `Client must have Manage Emojis and Stickers permission in guild ${guild} to see emoji authors.`,
 

package/src/managers/GuildEmojiManager.js

@@ -161,7 +161,7 @@ class GuildEmojiManager extends BaseGuildEmojiManager {
 
     const { me } = this.guild.members;
     if (!me) throw new DiscordjsError(ErrorCodes.GuildUncachedMe);
-    if (!me.permissions.has(PermissionFlagsBits.ManageGuildExpressions)) {
+    if (!me.permissions.any(PermissionFlagsBits.CreateGuildExpressions | PermissionFlagsBits.ManageGuildExpressions)) {
       throw new DiscordjsError(ErrorCodes.MissingManageGuildExpressionsPermission, this.guild);
     }
 

package/src/managers/UserManager.js

@@ -41,9 +41,12 @@ class UserManager extends CachedManager {
    * @private
    */
   dmChannel(userId) {
+    const expectedRecipientIds = [userId, this.client.user.id];
     return (
-      this.client.channels.cache.find(channel => channel.type === ChannelType.DM && channel.recipientId === userId) ??
-      null
+      this.client.channels.cache.find(
+        channel =>
+          channel.type === ChannelType.DM && channel.recipientIds.every(id => expectedRecipientIds.includes(id)),
+      ) ?? null
     );
   }
 

package/src/structures/DMChannel.js

@@ -30,16 +30,18 @@ class DMChannel extends BaseChannel {
     super._patch(data);
 
     if (data.recipients) {
-      const recipient = data.recipients[0];
-
       /**
-       * The recipient's id
-       * @type {Snowflake}
+       * The recipients' ids
+       * @type {Snowflake[]}
        */
-      this.recipientId = recipient.id;
-
-      if ('username' in recipient || this.client.options.partials.includes(Partials.User)) {
-        this.client.users._add(recipient);
+      this.recipientIds = [
+        ...new Set([...(this.recipientIds ?? []), ...data.recipients.map(recipient => recipient.id)]),
+      ];
+
+      for (const recipient of data.recipients) {
+        if ('username' in recipient || this.client.options.partials.includes(Partials.User)) {
+          this.client.users._add(recipient);
+        }
       }
     }
 
@@ -71,6 +73,18 @@ class DMChannel extends BaseChannel {
     return this.lastMessageId === undefined;
   }
 
+  /**
+   * The recipient's id.
+   * <info>For DMChannel the client user is not a part of this might return a wrong id.
+   * This will return `null` in the next major version.</info>
+   * @type {Snowflake}
+   * @readonly
+   */
+  get recipientId() {
+    // To not be a breaking change this returns the arbitrary first id if this is not a DMChannel with the client user
+    return this.recipientIds.find(recipientId => recipientId !== this.client.user.id) ?? this.recipientIds[0];
+  }
+
   /**
    * The recipient on the other end of the DM
    * @type {?User}

package/src/structures/Invite.js

@@ -256,7 +256,7 @@ class Invite extends Base {
     if (!guild.members.me) throw new DiscordjsError(ErrorCodes.GuildUncachedMe);
     return Boolean(
       this.channel?.permissionsFor(this.client.user).has(PermissionFlagsBits.ManageChannels, false) ||
-        guild.members.me.permissions.has(PermissionFlagsBits.ManageGuild),
+      guild.members.me.permissions.has(PermissionFlagsBits.ManageGuild),
     );
   }
 

package/src/structures/Message.js

@@ -711,8 +711,8 @@ class Message extends Base {
   get editable() {
     const precheck = Boolean(
       this.author.id === this.client.user.id &&
-        (!this.guild || this.channel?.viewable) &&
-        this.reference?.type !== MessageReferenceType.Forward,
+      (!this.guild || this.channel?.viewable) &&
+      this.reference?.type !== MessageReferenceType.Forward,
     );
 
     // Regardless of permissions thread messages cannot be edited if
@@ -788,10 +788,7 @@ class Message extends Base {
     const permissions = channel?.permissionsFor(this.client.user);
     if (!permissions) return false;
 
-    return (
-      permissions.has(PermissionFlagsBits.ReadMessageHistory | PermissionFlagsBits.PinMessages) ||
-      permissions.has(PermissionFlagsBits.ReadMessageHistory | PermissionFlagsBits.ManageMessages)
-    );
+    return permissions.has(PermissionFlagsBits.ReadMessageHistory | PermissionFlagsBits.PinMessages);
   }
 
   /**
@@ -820,12 +817,12 @@ class Message extends Base {
     const { channel } = this;
     return Boolean(
       channel?.type === ChannelType.GuildAnnouncement &&
-        !this.flags.has(MessageFlags.Crossposted) &&
-        this.reference?.type !== MessageReferenceType.Forward &&
-        this.type === MessageType.Default &&
-        !this.poll &&
-        channel.viewable &&
-        channel.permissionsFor(this.client.user)?.has(bitfield, false),
+      !this.flags.has(MessageFlags.Crossposted) &&
+      this.reference?.type !== MessageReferenceType.Forward &&
+      this.type === MessageType.Default &&
+      !this.poll &&
+      channel.viewable &&
+      channel.permissionsFor(this.client.user)?.has(bitfield, false),
     );
   }
 

package/src/structures/ModalSubmitFields.js

@@ -227,6 +227,37 @@ class ModalSubmitFields {
   getUploadedFiles(customId, required = false) {
     return this._getTypedComponent(customId, [ComponentType.FileUpload], ['attachments'], required).attachments ?? null;
   }
+
+  /**
+   * Get radio group component
+   *
+   * @param {string} customId The custom id of the component
+   * @param {boolean} [required=false] Whether to throw an error if the component value is not found or empty
+   * @returns {?string} The selected radio group option value, or null if none were selected and not required
+   */
+  getRadioGroup(customId, required = false) {
+    return this._getTypedComponent(customId, [ComponentType.RadioGroup], ['value'], required).value;
+  }
+
+  /**
+   * Get checkbox group component
+   *
+   * @param {string} customId The custom id of the component
+   * @returns {string[]} The selected checkbox group option values
+   */
+  getCheckboxGroup(customId) {
+    return this._getTypedComponent(customId, [ComponentType.CheckboxGroup]).values;
+  }
+
+  /**
+   * Get checkbox component
+   *
+   * @param {string} customId The custom id of the component
+   * @returns {boolean} Whether this checkbox was selected
+   */
+  getCheckbox(customId) {
+    return this._getTypedComponent(customId, [ComponentType.Checkbox]).value;
+  }
 }
 
 module.exports = ModalSubmitFields;

package/src/structures/ModalSubmitInteraction.js

@@ -24,6 +24,24 @@ const getAttachment = lazy(() => require('./Attachment'));
  * @property {Collection<Snowflake, Attachment>} [attachments] The resolved attachments
  */
 
+/**
+ * @typedef {BaseModalData} RadioGroupModalData
+ * @property {string} customId The custom id of the radio group
+ * @property {?string} value The value selected for the radio group
+ */
+
+/**
+ * @typedef {BaseModalData} CheckboxGroupModalData
+ * @property {string} customId The custom id of the checkbox group
+ * @property {string[]} values The values selected for the checkbox group
+ */
+
+/**
+ * @typedef {BaseModalData} CheckboxModalData
+ * @property {string} customId The custom id of the checkbox
+ * @property {boolean} value Whether this checkbox was selected
+ */
+
 /**
  * @typedef {BaseModalData} TextInputModalData
  * @property {string} customId The custom id of the field
@@ -45,7 +63,8 @@ const getAttachment = lazy(() => require('./Attachment'));
  */
 
 /**
- * @typedef {SelectMenuModalData|TextInputModalData|FileUploadModalData} ModalData
+ * @typedef {SelectMenuModalData|TextInputModalData|FileUploadModalData|RadioGroupModalData|
+ * CheckboxGroupModalData|CheckboxModalData} ModalData
  */
 
 /**

package/src/util/Components.js

@@ -24,7 +24,8 @@ const { ComponentType } = require('discord-api-types/v10');
 /**
  * @typedef {StringSelectMenuComponentData|TextInputComponentData|UserSelectMenuComponentData|
  * RoleSelectMenuComponentData|MentionableSelectMenuComponentData|ChannelSelectMenuComponentData|
- * FileUploadComponentData} ComponentInLabelData
+ * FileUploadComponentData|RadioGroupComponentData|CheckboxGroupComponentData|
+ * CheckboxComponentData} ComponentInLabelData
  */
 
 /**
@@ -52,6 +53,44 @@ const { ComponentType } = require('discord-api-types/v10');
  * @property {boolean} [required] Whether this component is required in modals
  */
 
+/**
+ * @typedef {Object} RadioGroupOption
+ * @property {string} value The value of the radio group option
+ * @property {string} label The label to use
+ * @property {string} [description] The optional description for the radio group option
+ * @property {boolean} [default] Whether this option is default selected
+ */
+
+/**
+ * @typedef {BaseComponentData} RadioGroupComponentData
+ * @property {string} customId The custom id of the radio group
+ * @property {RadioGroupOption[]} options The options in this radio group (2-10)
+ * @property {boolean} [required] Whether this component is required in modals
+ */
+
+/**
+ * @typedef {Object} CheckboxGroupOption
+ * @property {string} value The value of the checkbox group option
+ * @property {string} label The label to use
+ * @property {string} [description] The optional description for the checkbox group option
+ * @property {boolean} [default] Whether this option is default selected
+ */
+
+/**
+ * @typedef {BaseComponentData} CheckboxGroupComponentData
+ * @property {string} customId The custom id of the checkbox group
+ * @property {CheckboxGroupOption[]} options The options in this checkbox group
+ * @property {number} [minValues] The minimum number of options that must be selected (0-10)
+ * @property {number} [maxValues] The maximum number of options that can be selected (defaults to options length)
+ * @property {boolean} [required] Whether this component is required in modals
+ */
+
+/**
+ * @typedef {BaseComponentData} CheckboxComponentData
+ * @property {string} customId The custom id of the checkbox
+ * @property {boolean} [default] Whether this component is default selected in modals
+ */
+
 /**
  * @typedef {BaseComponentData} BaseSelectMenuComponentData
  * @property {string} customId The custom id of the select menu