discord.js 15.0.0-pr-11006.1765450794-e636950b2 → 15.0.0-pr-11005.1765454364-f3f6d34e7

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "discord.js",
-  "version": "15.0.0-pr-11006.1765450794-e636950b2",
+  "version": "15.0.0-pr-11005.1765454364-f3f6d34e7",
   "description": "A powerful library for interacting with the Discord API",
   "main": "./src/index.js",
   "types": "./typings/index.d.ts",
@@ -55,33 +55,35 @@
   "dependencies": {
     "@sapphire/snowflake": "3.5.5",
     "@vladfrangu/async_event_emitter": "^2.4.7",
-    "discord-api-types": "^0.38.36",
+    "discord-api-types": "^0.38.31",
     "fast-deep-equal": "3.1.3",
     "lodash.snakecase": "4.1.1",
     "magic-bytes.js": "^1.12.1",
     "tslib": "^2.8.1",
     "undici": "7.16.0",
-    "@discordjs/builders": "2.0.0-pr-11006.1765450794-e636950b2",
-    "@discordjs/formatters": "1.0.0-pr-11006.1765450794-e636950b2",
-    "@discordjs/collection": "3.0.0-pr-11006.1765450794-e636950b2",
-    "@discordjs/rest": "3.0.0-pr-11006.1765450794-e636950b2",
-    "@discordjs/util": "2.0.0-pr-11006.1765450794-e636950b2",
-    "@discordjs/ws": "3.0.0-pr-11006.1765450794-e636950b2"
+    "@discordjs/formatters": "1.0.0-pr-11005.1765454364-f3f6d34e7",
+    "@discordjs/builders": "2.0.0-pr-11005.1765454364-f3f6d34e7",
+    "@discordjs/collection": "3.0.0-pr-11005.1765454364-f3f6d34e7",
+    "@discordjs/rest": "3.0.0-pr-11005.1765454364-f3f6d34e7",
+    "@discordjs/util": "2.0.0-pr-11005.1765454364-f3f6d34e7",
+    "@discordjs/ws": "3.0.0-pr-11005.1765454364-f3f6d34e7"
   },
   "devDependencies": {
-    "@favware/cliff-jumper": "^6.0.0",
-    "@types/node": "^22.19.1",
+    "@favware/cliff-jumper": "^4.1.0",
+    "@types/node": "^22.18.13",
     "cross-env": "^10.1.0",
-    "eslint": "^9.39.1",
+    "eslint": "^9.38.0",
     "eslint-config-neon": "^0.2.9",
     "eslint-formatter-compact": "^9.0.1",
     "eslint-formatter-pretty": "^7.0.0",
-    "prettier": "^3.7.4",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-jsdoc": "^54.7.0",
+    "prettier": "^3.6.2",
     "tsd": "^0.33.0",
-    "turbo": "^2.6.3",
+    "turbo": "^2.5.8",
     "typescript": "~5.9.3",
-    "@discordjs/docgen": "0.12.1",
     "@discordjs/api-extractor": "7.52.7",
+    "@discordjs/docgen": "0.12.1",
     "@discordjs/scripts": "0.1.0"
   },
   "engines": {

package/src/client/Client.js

@@ -389,6 +389,15 @@ class Client extends AsyncEventEmitter {
     );
     this.ws.on(WebSocketShardEvents.Dispatch, this._handlePacket.bind(this));
 
+    this.ws.on(WebSocketShardEvents.Ready, async data => {
+      for (const guild of data.guilds) {
+        this.expectedGuilds.add(guild.id);
+      }
+
+      this.status = Status.WaitingForGuilds;
+      await this._checkReady();
+    });
+
     this.ws.on(WebSocketShardEvents.HeartbeatComplete, ({ heartbeatAt, latency }, shardId) => {
       this.emit(Events.Debug, `[WS => Shard ${shardId}] Heartbeat acknowledged, latency of ${latency}ms.`);
       this.lastPingTimestamps.set(shardId, heartbeatAt);
@@ -418,9 +427,7 @@ class Client extends AsyncEventEmitter {
         PacketHandlers[packet.t](this, packet, shardId);
       }
 
-      if (packet.t === GatewayDispatchEvents.Ready) {
-        await this._checkReady();
-      } else if (this.status === Status.WaitingForGuilds && WaitingForGuildEvents.includes(packet.t)) {
+      if (this.status === Status.WaitingForGuilds && WaitingForGuildEvents.includes(packet.t)) {
         this.expectedGuilds.delete(packet.d.id);
         await this._checkReady();
       }

package/src/client/websocket/handlers/READY.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const { ClientApplication } = require('../../../structures/ClientApplication.js');
-const { Status } = require('../../../util/Status.js');
 
 let ClientUser;
 
@@ -15,7 +14,6 @@ module.exports = (client, { d: data }, shardId) => {
   }
 
   for (const guild of data.guilds) {
-    client.expectedGuilds.add(guild.id);
     guild.shardId = shardId;
     client.guilds._add(guild);
   }
@@ -25,6 +23,4 @@ module.exports = (client, { d: data }, shardId) => {
   } else {
     client.application = new ClientApplication(client, data.application);
   }
-
-  client.status = Status.WaitingForGuilds;
 };

package/src/errors/DJSError.js

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

package/src/errors/ErrorCodes.js

@@ -83,7 +83,7 @@
  *
  * @property {'EmojiType'} EmojiType
  * @property {'EmojiManaged'} EmojiManaged
- * @property {'MissingGuildExpressionsPermission'} MissingGuildExpressionsPermission
+ * @property {'MissingManageGuildExpressionsPermission'} MissingManageGuildExpressionsPermission
  *
  * @property {'NotGuildSoundboardSound'} NotGuildSoundboardSound
  * @property {'NotGuildSticker'} NotGuildSticker
@@ -217,7 +217,7 @@ const keys = [
 
   'EmojiType',
   'EmojiManaged',
-  'MissingGuildExpressionsPermission',
+  'MissingManageGuildExpressionsPermission',
 
   'NotGuildSoundboardSound',
   'NotGuildSticker',

package/src/errors/Messages.js

@@ -88,8 +88,8 @@ const Messages = {
 
   [ErrorCodes.EmojiType]: 'Emoji must be a string or GuildEmoji/ReactionEmoji',
   [ErrorCodes.EmojiManaged]: 'Emoji is managed and has no Author.',
-  [ErrorCodes.MissingGuildExpressionsPermission]: guild =>
-    `Client must have Create Guild Expressions or Manage Guild Expressions permission in guild ${guild} to see emoji authors.`,
+  [ErrorCodes.MissingManageGuildExpressionsPermission]: guild =>
+    `Client must have Manage Guild Expressions permission in guild ${guild} to see emoji authors.`,
 
   [ErrorCodes.NotGuildSoundboardSound]: action =>
     `Soundboard sound is a default (non-guild) soundboard sound and can't be ${action}.`,

package/src/index.js

@@ -111,6 +111,7 @@ exports.ApplicationEmoji = require('./structures/ApplicationEmoji.js').Applicati
 exports.ApplicationRoleConnectionMetadata =
   require('./structures/ApplicationRoleConnectionMetadata.js').ApplicationRoleConnectionMetadata;
 exports.Attachment = require('./structures/Attachment.js').Attachment;
+exports.AttachmentBuilder = require('./structures/AttachmentBuilder.js').AttachmentBuilder;
 exports.AutocompleteInteraction = require('./structures/AutocompleteInteraction.js').AutocompleteInteraction;
 exports.AutoModerationActionExecution =
   require('./structures/AutoModerationActionExecution.js').AutoModerationActionExecution;

package/src/managers/ChannelManager.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const process = require('node:process');
-const { lazy, isFileBodyEncodable, isJSONEncodable } = require('@discordjs/util');
+const { lazy } = require('@discordjs/util');
 const { Routes } = require('discord-api-types/v10');
 const { BaseChannel } = require('../structures/BaseChannel.js');
 const { MessagePayload } = require('../structures/MessagePayload.js');
@@ -147,7 +147,7 @@ class ChannelManager extends CachedManager {
    * Creates a message in a channel.
    *
    * @param {TextChannelResolvable} channel The channel to send the message to
-   * @param {string|MessagePayload|MessageCreateOptions|JSONEncodable<RESTPostAPIChannelMessageJSONBody>|FileBodyEncodable<RESTPostAPIChannelMessageJSONBody>} options The options to provide
+   * @param {string|MessagePayload|MessageCreateOptions} options The options to provide
    * @returns {Promise<Message>}
    * @example
    * // Send a basic message
@@ -174,21 +174,18 @@ class ChannelManager extends CachedManager {
    *   .catch(console.error);
    */
   async createMessage(channel, options) {
-    let payload;
+    let messagePayload;
 
     if (options instanceof MessagePayload) {
-      payload = await options.resolveBody().resolveFiles();
-    } else if (isFileBodyEncodable(options)) {
-      payload = options.toFileBody();
-    } else if (isJSONEncodable(options)) {
-      payload = { body: options.toJSON() };
+      messagePayload = options.resolveBody();
     } else {
-      payload = await MessagePayload.create(this, options).resolveBody().resolveFiles();
+      messagePayload = MessagePayload.create(this, options).resolveBody();
     }
 
     const resolvedChannelId = this.resolveId(channel);
     const resolvedChannel = this.resolve(channel);
-    const data = await this.client.rest.post(Routes.channelMessages(resolvedChannelId), payload);
+    const { body, files } = await messagePayload.resolveFiles();
+    const data = await this.client.rest.post(Routes.channelMessages(resolvedChannelId), { body, files });
 
     return resolvedChannel?.messages._add(data) ?? new (getMessage())(this.client, data);
   }

package/src/managers/GuildEmojiManager.js

@@ -251,8 +251,8 @@ class GuildEmojiManager extends CachedManager {
 
     const { me } = this.guild.members;
     if (!me) throw new DiscordjsError(ErrorCodes.GuildUncachedMe);
-    if (!me.permissions.any(PermissionFlagsBits.CreateGuildExpressions | PermissionFlagsBits.ManageGuildExpressions)) {
-      throw new DiscordjsError(ErrorCodes.MissingGuildExpressionsPermission, this.guild);
+    if (!me.permissions.has(PermissionFlagsBits.ManageGuildExpressions)) {
+      throw new DiscordjsError(ErrorCodes.MissingManageGuildExpressionsPermission, this.guild);
     }
 
     const data = await this.client.rest.get(Routes.guildEmoji(this.guild.id, resolvedEmoji.id));

package/src/managers/MessageManager.js

@@ -2,7 +2,6 @@
 
 const { Collection } = require('@discordjs/collection');
 const { makeURLSearchParams } = require('@discordjs/rest');
-const { isFileBodyEncodable, isJSONEncodable } = require('@discordjs/util');
 const { Routes } = require('discord-api-types/v10');
 const { DiscordjsTypeError, ErrorCodes } = require('../errors/index.js');
 const { Message } = require('../structures/Message.js');
@@ -224,27 +223,21 @@ class MessageManager extends CachedManager {
    * Edits a message, even if it's not cached.
    *
    * @param {MessageResolvable} message The message to edit
-   * @param {string|MessageEditOptions|MessagePayload|FileBodyEncodable<RESTPatchAPIChannelMessageJSONBody>|JSONEncodable<RESTPatchAPIChannelMessageJSONBody>} options The options to edit the message
+   * @param {string|MessageEditOptions|MessagePayload} options The options to edit the message
    * @returns {Promise<Message>}
    */
   async edit(message, options) {
     const messageId = this.resolveId(message);
     if (!messageId) throw new DiscordjsTypeError(ErrorCodes.InvalidType, 'message', 'MessageResolvable');
 
-    let payload;
-    if (options instanceof MessagePayload) {
-      payload = await options.resolveBody().resolveFiles();
-    } else if (isFileBodyEncodable(options)) {
-      payload = options.toFileBody();
-    } else if (isJSONEncodable(options)) {
-      payload = { body: options.toJSON() };
-    } else {
-      payload = await MessagePayload.create(message instanceof Message ? message : this, options)
-        .resolveBody()
-        .resolveFiles();
-    }
-
-    const data = await this.client.rest.patch(Routes.channelMessage(this.channel.id, messageId), payload);
+    const { body, files } = await (
+      options instanceof MessagePayload
+        ? options
+        : MessagePayload.create(message instanceof Message ? message : this, options)
+    )
+      .resolveBody()
+      .resolveFiles();
+    const data = await this.client.rest.patch(Routes.channelMessage(this.channel.id, messageId), { body, files });
 
     const existing = this.cache.get(messageId);
     if (existing) {

package/src/structures/AttachmentBuilder.js

@@ -0,0 +1,185 @@
+'use strict';
+
+const { basename, flatten } = require('../util/Util.js');
+
+/**
+ * Represents an attachment builder
+ */
+class AttachmentBuilder {
+  /**
+   * @param {BufferResolvable|Stream} attachment The file
+   * @param {AttachmentData} [data] Extra data
+   */
+  constructor(attachment, data = {}) {
+    /**
+     * The file associated with this attachment.
+     *
+     * @type {BufferResolvable|Stream}
+     */
+    this.attachment = attachment;
+
+    /**
+     * The name of this attachment
+     *
+     * @type {?string}
+     */
+    this.name = data.name;
+
+    /**
+     * The description of the attachment
+     *
+     * @type {?string}
+     */
+    this.description = data.description;
+
+    /**
+     * The title of the attachment
+     *
+     * @type {?string}
+     */
+    this.title = data.title;
+
+    /**
+     * The base64 encoded byte array representing a sampled waveform
+     * <info>This is only for voice message attachments.</info>
+     *
+     * @type {?string}
+     */
+    this.waveform = data.waveform;
+
+    /**
+     * The duration of the attachment in seconds
+     * <info>This is only for voice message attachments.</info>
+     *
+     * @type {?number}
+     */
+    this.duration = data.duration;
+  }
+
+  /**
+   * Sets the description of this attachment.
+   *
+   * @param {string} description The description of the file
+   * @returns {AttachmentBuilder} This attachment
+   */
+  setDescription(description) {
+    this.description = description;
+    return this;
+  }
+
+  /**
+   * Sets the file of this attachment.
+   *
+   * @param {BufferResolvable|Stream} attachment The file
+   * @returns {AttachmentBuilder} This attachment
+   */
+  setFile(attachment) {
+    this.attachment = attachment;
+    return this;
+  }
+
+  /**
+   * Sets the name of this attachment.
+   *
+   * @param {string} name The name of the file
+   * @returns {AttachmentBuilder} This attachment
+   */
+  setName(name) {
+    this.name = name;
+    return this;
+  }
+
+  /**
+   * Sets the title of this attachment.
+   *
+   * @param {string} title The title of the file
+   * @returns {AttachmentBuilder} This attachment
+   */
+  setTitle(title) {
+    this.title = title;
+    return this;
+  }
+
+  /**
+   * Sets the waveform of this attachment.
+   * <info>This is only for voice message attachments.</info>
+   *
+   * @param {string} waveform The base64 encoded byte array representing a sampled waveform
+   * @returns {AttachmentBuilder} This attachment
+   */
+  setWaveform(waveform) {
+    this.waveform = waveform;
+    return this;
+  }
+
+  /**
+   * Sets the duration of this attachment.
+   * <info>This is only for voice message attachments.</info>
+   *
+   * @param {number} duration The duration of the attachment in seconds
+   * @returns {AttachmentBuilder} This attachment
+   */
+  setDuration(duration) {
+    this.duration = duration;
+    return this;
+  }
+
+  /**
+   * Sets whether this attachment is a spoiler
+   *
+   * @param {boolean} [spoiler=true] Whether the attachment should be marked as a spoiler
+   * @returns {AttachmentBuilder} This attachment
+   */
+  setSpoiler(spoiler = true) {
+    if (spoiler === this.spoiler) return this;
+
+    if (!spoiler) {
+      while (this.spoiler) {
+        this.name = this.name.slice('SPOILER_'.length);
+      }
+
+      return this;
+    }
+
+    this.name = `SPOILER_${this.name}`;
+    return this;
+  }
+
+  /**
+   * Whether or not this attachment has been marked as a spoiler
+   *
+   * @type {boolean}
+   * @readonly
+   */
+  get spoiler() {
+    return basename(this.name).startsWith('SPOILER_');
+  }
+
+  toJSON() {
+    return flatten(this);
+  }
+
+  /**
+   * Makes a new builder instance from a preexisting attachment structure.
+   *
+   * @param {AttachmentBuilder|Attachment|AttachmentPayload} other The builder to construct a new instance from
+   * @returns {AttachmentBuilder}
+   */
+  static from(other) {
+    return new AttachmentBuilder(other.attachment, {
+      name: other.name,
+      description: other.description,
+    });
+  }
+}
+
+exports.AttachmentBuilder = AttachmentBuilder;
+
+/**
+ * @typedef {Object} AttachmentData
+ * @property {string} [name] The name of the attachment
+ * @property {string} [description] The description of the attachment
+ * @property {string} [title] The title of the attachment
+ * @property {string} [waveform] The base64 encoded byte array representing a sampled waveform (for voice message attachments)
+ * @property {number} [duration] The duration of the attachment in seconds (for voice message attachments)
+ */

package/src/structures/Embed.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { embedLength } = require('@discordjs/util');
+const { embedLength } = require('@discordjs/builders');
 const isEqual = require('fast-deep-equal');
 
 /**

package/src/structures/Guild.js

@@ -641,7 +641,7 @@ class Guild extends AnonymousGuild {
   }
 
   /**
-   * The maximum bitrate available for a voice channel in this guild
+   * The maximum bitrate available for this guild
    *
    * @type {number}
    * @readonly
@@ -663,16 +663,6 @@ class Guild extends AnonymousGuild {
     }
   }
 
-  /**
-   * The maximum bitrate available for a stage channel in this guild
-   *
-   * @type {number}
-   * @readonly
-   */
-  get maximumStageBitrate() {
-    return 64_000;
-  }
-
   /**
    * Fetches a collection of integrations to this guild.
    * Resolves with a collection mapping integrations by their ids.

package/src/structures/GuildInvite.js

@@ -192,7 +192,7 @@ class GuildInvite extends BaseInvite {
     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

@@ -725,8 +725,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
@@ -837,19 +837,19 @@ 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),
     );
   }
 
   /**
    * Edits the content of the message.
    *
-   * @param {string|MessageEditOptions|MessagePayload|FileBodyEncodable<RESTPatchAPIChannelMessageJSONBody>|JSONEncodable<RESTPatchAPIChannelMessageJSONBody>} options The options to provide
+   * @param {string|MessagePayload|MessageEditOptions} options The options to provide
    * @returns {Promise<Message>}
    * @example
    * // Update the content of a message

package/src/structures/MessagePayload.js

@@ -197,13 +197,10 @@ class MessagePayload {
       waveform: file.waveform,
       duration_secs: file.duration,
     }));
-
-    // Only passable during edits
     if (Array.isArray(this.options.attachments)) {
-      attachments.push(
-        // Note how we don't check for file body encodable, since we aren't expecting file data here
-        ...this.options.attachments.map(attachment => (isJSONEncodable(attachment) ? attachment.toJSON() : attachment)),
-      );
+      this.options.attachments.push(...(attachments ?? []));
+    } else {
+      this.options.attachments = attachments;
     }
 
     let poll;
@@ -240,7 +237,7 @@ class MessagePayload {
           : allowedMentions,
       flags,
       message_reference,
-      attachments,
+      attachments: this.options.attachments,
       sticker_ids: this.options.stickers?.map(sticker => sticker.id ?? sticker),
       thread_name: threadName,
       applied_tags: appliedTags,

package/src/structures/interfaces/TextBasedChannel.js

@@ -88,7 +88,7 @@ class TextBasedChannel {
    * @property {Array<(EmbedBuilder|Embed|APIEmbed)>} [embeds] The embeds for the message
    * @property {MessageMentionOptions} [allowedMentions] Which mentions should be parsed from the message content
    * (see {@link https://discord.com/developers/docs/resources/message#allowed-mentions-object here} for more details)
-   * @property {Array<(Attachment|AttachmentPayload|BufferResolvable|FileBodyEncodable<APIAttachment>|Stream)>} [files]
+   * @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
@@ -156,7 +156,7 @@ class TextBasedChannel {
   /**
    * Sends a message to this channel.
    *
-   * @param {string|MessagePayload|MessageCreateOptions|JSONEncodable<RESTPostAPIChannelMessageJSONBody>|FileBodyEncodable<RESTPostAPIChannelMessageJSONBody>} options The options to provide
+   * @param {string|MessagePayload|MessageCreateOptions} options The options to provide
    * @returns {Promise<Message>}
    * @example
    * // Send a basic message

package/src/util/APITypes.js

@@ -683,13 +683,3 @@
  * @external WebhookType
  * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/enum/WebhookType}
  */
-
-/**
- * @external RESTPatchAPIChannelMessageJSONBody
- * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/RESTPatchAPIChannelMessageJSONBody}
- */
-
-/**
- * @external RESTPostAPIChannelMessageJSONBody
- * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/interface/RESTPostAPIChannelMessageJSONBody}
- */