discord.js 14.19.3 → 14.21.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "discord.js",
-  "version": "14.19.3",
+  "version": "14.21.0",
   "description": "A powerful library for interacting with the Discord API",
   "main": "./src/index.js",
   "types": "./typings/index.d.ts",
@@ -23,7 +23,8 @@
   },
   "files": [
     "src",
-    "typings"
+    "typings/*.d.ts",
+    "typings/*.d.mts"
   ],
   "contributors": [
     "Crawl <icrawltogo@gmail.com>",
@@ -55,15 +56,15 @@
     "@discordjs/builders": "^1.11.2",
     "@discordjs/collection": "1.5.3",
     "@discordjs/formatters": "^0.6.1",
-    "@discordjs/ws": "^1.2.2",
+    "@discordjs/ws": "^1.2.3",
     "@sapphire/snowflake": "3.5.3",
     "discord-api-types": "^0.38.1",
     "fast-deep-equal": "3.1.3",
     "lodash.snakecase": "4.1.1",
     "magic-bytes.js": "^1.10.0",
     "tslib": "^2.6.3",
-    "undici": "6.21.1",
-    "@discordjs/rest": "^2.5.0",
+    "undici": "6.21.3",
+    "@discordjs/rest": "^2.5.1",
     "@discordjs/util": "^1.1.1"
   },
   "devDependencies": {

package/src/client/Client.js

@@ -277,7 +277,6 @@ class Client extends BaseClient {
     const code = resolveInviteCode(invite);
     const query = makeURLSearchParams({
       with_counts: true,
-      with_expiration: true,
       guild_scheduled_event_id: options?.guildScheduledEventId,
     });
     const data = await this.rest.get(Routes.invite(code), { query });

package/src/client/actions/InteractionCreate.js

@@ -9,6 +9,7 @@ const ChatInputCommandInteraction = require('../../structures/ChatInputCommandIn
 const MentionableSelectMenuInteraction = require('../../structures/MentionableSelectMenuInteraction');
 const MessageContextMenuCommandInteraction = require('../../structures/MessageContextMenuCommandInteraction');
 const ModalSubmitInteraction = require('../../structures/ModalSubmitInteraction');
+const PrimaryEntryPointCommandInteraction = require('../../structures/PrimaryEntryPointCommandInteraction');
 const RoleSelectMenuInteraction = require('../../structures/RoleSelectMenuInteraction');
 const StringSelectMenuInteraction = require('../../structures/StringSelectMenuInteraction');
 const UserContextMenuCommandInteraction = require('../../structures/UserContextMenuCommandInteraction');
@@ -38,6 +39,9 @@ class InteractionCreateAction extends Action {
             if (channel && !channel.isTextBased()) return;
             InteractionClass = MessageContextMenuCommandInteraction;
             break;
+          case ApplicationCommandType.PrimaryEntryPoint:
+            InteractionClass = PrimaryEntryPointCommandInteraction;
+            break;
           default:
             client.emit(
               Events.Debug,

package/src/index.js

@@ -180,6 +180,7 @@ exports.PartialGroupDMChannel = require('./structures/PartialGroupDMChannel');
 exports.PermissionOverwrites = require('./structures/PermissionOverwrites');
 exports.Poll = require('./structures/Poll').Poll;
 exports.PollAnswer = require('./structures/PollAnswer').PollAnswer;
+exports.PrimaryEntryPointCommandInteraction = require('./structures/PrimaryEntryPointCommandInteraction');
 exports.Presence = require('./structures/Presence').Presence;
 exports.ReactionCollector = require('./structures/ReactionCollector');
 exports.ReactionEmoji = require('./structures/ReactionEmoji');

package/src/managers/ApplicationCommandManager.js

@@ -261,6 +261,7 @@ class ApplicationCommandManager extends CachedManager {
       dm_permission: command.dmPermission ?? command.dm_permission,
       integration_types: command.integrationTypes ?? command.integration_types,
       contexts: command.contexts,
+      handler: command.handler,
     };
   }
 }

package/src/managers/ChannelManager.js

@@ -69,6 +69,13 @@ class ChannelManager extends CachedManager {
 
     channel?.parent?.threads?.cache.delete(id);
     this.cache.delete(id);
+
+    if (channel?.threads) {
+      for (const threadId of channel.threads.cache.keys()) {
+        this.cache.delete(threadId);
+        channel.guild?.channels.cache.delete(threadId);
+      }
+    }
   }
 
   /**

package/src/structures/ApplicationCommand.js

@@ -174,6 +174,18 @@ class ApplicationCommand extends Base {
       this.contexts ??= null;
     }
 
+    if ('handler' in data) {
+      /**
+       * Determines whether the interaction is handled by the app's interactions handler or by Discord.
+       * <info>Only available for {@link ApplicationCommandType.PrimaryEntryPoint} commands on
+       * applications with the {@link ApplicationFlags.Embedded} flag (i.e, those that have an Activity)</info>
+       * @type {?EntryPointCommandHandlerType}
+       */
+      this.handler = data.handler;
+    } else {
+      this.handler ??= null;
+    }
+
     if ('version' in data) {
       /**
        * Autoincrementing version identifier updated during substantial record changes
@@ -216,15 +228,20 @@ class ApplicationCommand extends Base {
    * @property {string} name The name of the command, must be in all lowercase if type is
    * {@link ApplicationCommandType.ChatInput}
    * @property {Object<Locale, string>} [nameLocalizations] The localizations for the command name
-   * @property {string} description The description of the command, if type is {@link ApplicationCommandType.ChatInput}
+   * @property {string} description The description of the command,
+   * if type is {@link ApplicationCommandType.ChatInput} or {@link ApplicationCommandType.PrimaryEntryPoint}
    * @property {boolean} [nsfw] Whether the command is age-restricted
    * @property {Object<Locale, string>} [descriptionLocalizations] The localizations for the command description,
-   * if type is {@link ApplicationCommandType.ChatInput}
+   * if type is {@link ApplicationCommandType.ChatInput} or {@link ApplicationCommandType.PrimaryEntryPoint}
    * @property {ApplicationCommandType} [type=ApplicationCommandType.ChatInput] The type of the command
    * @property {ApplicationCommandOptionData[]} [options] Options for the command
    * @property {?PermissionResolvable} [defaultMemberPermissions] The bitfield used to determine the default permissions
    * a member needs in order to run the command
    * @property {boolean} [dmPermission] Whether the command is enabled in DMs
+   * @property {ApplicationIntegrationType[]} [integrationTypes] Installation contexts where the command is available
+   * @property {InteractionContextType[]} [contexts] Interaction contexts where the command can be used
+   * @property {EntryPointCommandHandlerType} [handler] Whether the interaction is handled by the app's
+   * interactions handler or by Discord.
    */
 
   /**
@@ -419,7 +436,8 @@ class ApplicationCommand extends Base {
         this.descriptionLocalizations ?? {},
       ) ||
       !isEqual(command.integrationTypes ?? command.integration_types ?? [], this.integrationTypes ?? []) ||
-      !isEqual(command.contexts ?? [], this.contexts ?? [])
+      !isEqual(command.contexts ?? [], this.contexts ?? []) ||
+      ('handler' in command && command.handler !== this.handler)
     ) {
       return false;
     }

package/src/structures/BaseInteraction.js

@@ -122,6 +122,12 @@ class BaseInteraction extends Base {
      * @type {?InteractionContextType}
      */
     this.context = data.context ?? null;
+
+    /**
+     * Attachment size limit in bytes
+     * @type {number}
+     */
+    this.attachmentSizeLimit = data.attachment_size_limit;
   }
 
   /**
@@ -219,6 +225,16 @@ class BaseInteraction extends Base {
     );
   }
 
+  /**
+   * Indicates whether this interaction is a {@link PrimaryEntryPointCommandInteraction}
+   * @returns {boolean}
+   */
+  isPrimaryEntryPointCommand() {
+    return (
+      this.type === InteractionType.ApplicationCommand && this.commandType === ApplicationCommandType.PrimaryEntryPoint
+    );
+  }
+
   /**
    * Indicates whether this interaction is a {@link MessageComponentInteraction}
    * @returns {boolean}

package/src/structures/ClientApplication.js

@@ -163,6 +163,17 @@ class ClientApplication extends Application {
       this.approximateUserInstallCount ??= null;
     }
 
+    if ('approximate_user_authorization_count' in data) {
+      /**
+       * An approximate amount of users that have OAuth2 authorizations for this application.
+       *
+       * @type {?number}
+       */
+      this.approximateUserAuthorizationCount = data.approximate_user_authorization_count;
+    } else {
+      this.approximateUserAuthorizationCount ??= null;
+    }
+
     if ('guild_id' in data) {
       /**
        * The id of the guild associated with this application.

package/src/structures/ClientUser.js

@@ -64,8 +64,6 @@ class ClientUser extends User {
       },
     });
 
-    this.client.token = data.token;
-    this.client.rest.setToken(data.token);
     const { updated } = this.client.actions.UserUpdate.handle(data);
     return updated ?? this;
   }

package/src/structures/CommandInteraction.js

@@ -152,6 +152,7 @@ class CommandInteraction extends BaseInteraction {
   editReply() {}
   deleteReply() {}
   followUp() {}
+  launchActivity() {}
   showModal() {}
   sendPremiumRequired() {}
   awaitModalSubmit() {}

package/src/structures/GuildMember.js

@@ -122,6 +122,20 @@ class GuildMember extends Base {
     } else {
       this.flags ??= new GuildMemberFlagsBitField().freeze();
     }
+
+    if (data.avatar_decoration_data) {
+      /**
+       * The member avatar decoration's data
+       *
+       * @type {?AvatarDecorationData}
+       */
+      this.avatarDecorationData = {
+        asset: data.avatar_decoration_data.asset,
+        skuId: data.avatar_decoration_data.sku_id,
+      };
+    } else {
+      this.avatarDecorationData = null;
+    }
   }
 
   _clone() {
@@ -166,6 +180,15 @@ class GuildMember extends Base {
     return this.avatar && this.client.rest.cdn.guildMemberAvatar(this.guild.id, this.id, this.avatar, options);
   }
 
+  /**
+   * A link to the member's avatar decoration.
+   *
+   * @returns {?string}
+   */
+  avatarDecorationURL() {
+    return this.avatarDecorationData ? this.client.rest.cdn.avatarDecoration(this.avatarDecorationData.asset) : null;
+  }
+
   /**
    * A link to the member's banner.
    * @param {ImageURLOptions} [options={}] Options for the banner URL
@@ -195,6 +218,16 @@ class GuildMember extends Base {
     return this.bannerURL(options) ?? this.user.bannerURL(options);
   }
 
+  /**
+   * A link to the member's guild avatar decoration if they have one.
+   * Otherwise, a link to their {@link User#avatarDecorationURL} will be returned.
+   *
+   * @returns {?string}
+   */
+  displayAvatarDecorationURL() {
+    return this.avatarDecorationURL() ?? this.user.avatarDecorationURL();
+  }
+
   /**
    * The time this member joined the guild
    * @type {?Date}
@@ -499,7 +532,10 @@ class GuildMember extends Base {
       this.communicationDisabledUntilTimestamp === member.communicationDisabledUntilTimestamp &&
       this.flags.bitfield === member.flags.bitfield &&
       (this._roles === member._roles ||
-        (this._roles.length === member._roles.length && this._roles.every((role, i) => role === member._roles[i])))
+        (this._roles.length === member._roles.length &&
+          this._roles.every((role, index) => role === member._roles[index]))) &&
+      this.avatarDecorationData?.asset === member.avatarDecorationData?.asset &&
+      this.avatarDecorationData?.skuId === member.avatarDecorationData?.skuId
     );
   }
 
@@ -525,6 +561,7 @@ class GuildMember extends Base {
     json.bannerURL = this.bannerURL();
     json.displayAvatarURL = this.displayAvatarURL();
     json.displayBannerURL = this.displayBannerURL();
+    json.avatarDecorationURL = this.avatarDecorationURL();
     return json;
   }
 }

package/src/structures/MessageComponentInteraction.js

@@ -97,6 +97,7 @@ class MessageComponentInteraction extends BaseInteraction {
   followUp() {}
   deferUpdate() {}
   update() {}
+  launchActivity() {}
   showModal() {}
   sendPremiumRequired() {}
   awaitModalSubmit() {}

package/src/structures/ModalSubmitInteraction.js

@@ -119,6 +119,7 @@ class ModalSubmitInteraction extends BaseInteraction {
   deferUpdate() {}
   update() {}
   sendPremiumRequired() {}
+  launchActivity() {}
 }
 
 InteractionResponses.applyToClass(ModalSubmitInteraction, 'showModal');

package/src/structures/PartialGroupDMChannel.js

@@ -27,7 +27,7 @@ class PartialGroupDMChannel extends BaseChannel {
      * The hash of the channel icon
      * @type {?string}
      */
-    this.icon = data.icon;
+    this.icon = data.icon ?? null;
 
     /**
      * Recipient data received in a {@link PartialGroupDMChannel}.
@@ -39,7 +39,7 @@ class PartialGroupDMChannel extends BaseChannel {
      * The recipients of this Group DM Channel.
      * @type {PartialRecipient[]}
      */
-    this.recipients = data.recipients;
+    this.recipients = data.recipients ?? [];
 
     /**
      * A manager of the messages belonging to this channel

package/src/structures/PrimaryEntryPointCommandInteraction.js

@@ -0,0 +1,11 @@
+'use strict';
+
+const CommandInteraction = require('./CommandInteraction.js');
+
+/**
+ * Represents a primary entry point command interaction.
+ * @extends {CommandInteraction}
+ */
+class PrimaryEntryPointCommandInteraction extends CommandInteraction {}
+
+module.exports = PrimaryEntryPointCommandInteraction;

package/src/structures/interfaces/InteractionResponses.js

@@ -69,6 +69,12 @@ class InteractionResponses {
    * <warn>This option is deprecated. Use `withResponse` or fetch the response instead.</warn>
    */
 
+  /**
+   * Options for launching activity in response to a {@link BaseInteraction}
+   * @typedef {Object} LaunchActivityOptions
+   * @property {boolean} [withResponse] Whether to return an {@link InteractionCallbackResponse} as the response
+   */
+
   /**
    * Options for showing a modal in response to a {@link BaseInteraction}
    * @typedef {Object} ShowModalOptions
@@ -370,6 +376,25 @@ class InteractionResponses {
         : new InteractionResponse(this, this.message.interactionMetadata?.id);
   }
 
+  /**
+   * Launches this application's activity, if enabled
+   * @param {LaunchActivityOptions} [options={}] Options for launching the activity
+   * @returns {Promise<InteractionCallbackResponse|undefined>}
+   */
+  async launchActivity({ withResponse } = {}) {
+    if (this.deferred || this.replied) throw new DiscordjsError(ErrorCodes.InteractionAlreadyReplied);
+    const response = await this.client.rest.post(Routes.interactionCallback(this.id, this.token), {
+      query: makeURLSearchParams({ with_response: withResponse ?? false }),
+      body: {
+        type: InteractionResponseType.LaunchActivity,
+      },
+      auth: false,
+    });
+    this.replied = true;
+
+    return withResponse ? new InteractionCallbackResponse(this.client, response) : undefined;
+  }
+
   /**
    * Shows a modal component
    * @param {ModalBuilder|ModalComponentData|APIModalInteractionResponseCallbackData} modal The modal to show
@@ -450,6 +475,7 @@ class InteractionResponses {
       'followUp',
       'deferUpdate',
       'update',
+      'launchActivity',
       'showModal',
       'sendPremiumRequired',
       'awaitModalSubmit',

package/src/util/APITypes.js

@@ -370,6 +370,11 @@
  * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/enum/EntitlementType}
  */
 
+/**
+ * @external EntryPointCommandHandlerType
+ * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/enum/EntryPointCommandHandlerType}
+ */
+
 /**
  * @external ForumLayoutType
  * @see {@link https://discord-api-types.dev/api/discord-api-types-v10/enum/ForumLayoutType}

package/src/util/Components.js

@@ -141,44 +141,7 @@ const { ComponentType } = require('discord-api-types/v10');
  * @ignore
  */
 function createComponent(data) {
-  if (data instanceof Component) {
-    return data;
-  }
-
-  switch (data.type) {
-    case ComponentType.ActionRow:
-      return new ActionRow(data);
-    case ComponentType.Button:
-      return new ButtonComponent(data);
-    case ComponentType.StringSelect:
-      return new StringSelectMenuComponent(data);
-    case ComponentType.TextInput:
-      return new TextInputComponent(data);
-    case ComponentType.UserSelect:
-      return new UserSelectMenuComponent(data);
-    case ComponentType.RoleSelect:
-      return new RoleSelectMenuComponent(data);
-    case ComponentType.MentionableSelect:
-      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);
-  }
+  return data instanceof Component ? data : new (ComponentTypeToComponent[data.type] ?? Component)(data);
 }
 
 /**
@@ -188,30 +151,7 @@ function createComponent(data) {
  * @ignore
  */
 function createComponentBuilder(data) {
-  if (data instanceof ComponentBuilder) {
-    return data;
-  }
-
-  switch (data.type) {
-    case ComponentType.ActionRow:
-      return new ActionRowBuilder(data);
-    case ComponentType.Button:
-      return new ButtonBuilder(data);
-    case ComponentType.StringSelect:
-      return new StringSelectMenuBuilder(data);
-    case ComponentType.TextInput:
-      return new TextInputBuilder(data);
-    case ComponentType.UserSelect:
-      return new UserSelectMenuBuilder(data);
-    case ComponentType.RoleSelect:
-      return new RoleSelectMenuBuilder(data);
-    case ComponentType.MentionableSelect:
-      return new MentionableSelectMenuBuilder(data);
-    case ComponentType.ChannelSelect:
-      return new ChannelSelectMenuBuilder(data);
-    default:
-      return new ComponentBuilder(data);
-  }
+  return data instanceof ComponentBuilder ? data : new (ComponentTypeToBuilder[data.type] ?? ComponentBuilder)(data);
 }
 
 /**
@@ -274,3 +214,32 @@ const TextInputComponent = require('../structures/TextInputComponent');
 const ThumbnailComponent = require('../structures/ThumbnailComponent');
 const UserSelectMenuBuilder = require('../structures/UserSelectMenuBuilder');
 const UserSelectMenuComponent = require('../structures/UserSelectMenuComponent');
+
+const ComponentTypeToComponent = {
+  [ComponentType.ActionRow]: ActionRow,
+  [ComponentType.Button]: ButtonComponent,
+  [ComponentType.StringSelect]: StringSelectMenuComponent,
+  [ComponentType.TextInput]: TextInputComponent,
+  [ComponentType.UserSelect]: UserSelectMenuComponent,
+  [ComponentType.RoleSelect]: RoleSelectMenuComponent,
+  [ComponentType.MentionableSelect]: MentionableSelectMenuComponent,
+  [ComponentType.ChannelSelect]: ChannelSelectMenuComponent,
+  [ComponentType.Container]: ContainerComponent,
+  [ComponentType.TextDisplay]: TextDisplayComponent,
+  [ComponentType.File]: FileComponent,
+  [ComponentType.MediaGallery]: MediaGalleryComponent,
+  [ComponentType.Section]: SectionComponent,
+  [ComponentType.Separator]: SeparatorComponent,
+  [ComponentType.Thumbnail]: ThumbnailComponent,
+};
+
+const ComponentTypeToBuilder = {
+  [ComponentType.ActionRow]: ActionRowBuilder,
+  [ComponentType.Button]: ButtonBuilder,
+  [ComponentType.StringSelect]: StringSelectMenuBuilder,
+  [ComponentType.TextInput]: TextInputBuilder,
+  [ComponentType.UserSelect]: UserSelectMenuBuilder,
+  [ComponentType.RoleSelect]: RoleSelectMenuBuilder,
+  [ComponentType.MentionableSelect]: MentionableSelectMenuBuilder,
+  [ComponentType.ChannelSelect]: ChannelSelectMenuBuilder,
+};

package/src/util/Transformers.js

@@ -2,6 +2,7 @@
 
 const { isJSONEncodable } = require('@discordjs/util');
 const snakeCase = require('lodash.snakecase');
+const { resolvePartialEmoji } = require('./Util');
 
 /**
  * Transforms camel-cased keys into snake cased keys
@@ -13,7 +14,14 @@ function toSnakeCase(obj) {
   if (obj instanceof Date) return obj;
   if (isJSONEncodable(obj)) return toSnakeCase(obj.toJSON());
   if (Array.isArray(obj)) return obj.map(toSnakeCase);
-  return Object.fromEntries(Object.entries(obj).map(([key, value]) => [snakeCase(key), toSnakeCase(value)]));
+  return Object.fromEntries(
+    Object.entries(obj).map(([key, value]) => [
+      snakeCase(key),
+      // TODO: The special handling of 'emoji' is just a temporary fix for v14, will be dropped in v15.
+      // See https://github.com/discordjs/discord.js/issues/10909
+      key === 'emoji' && typeof value === 'string' ? resolvePartialEmoji(value) : toSnakeCase(value),
+    ]),
+  );
 }
 
 /**