Merge branch 'main' into refactor/typeof-undefined

packages/builders/src/messages/embed/Embed.ts

@@ -94,7 +94,7 @@ export class EmbedBuilder {
 	 *
 	 * @remarks
 	 * This method behaves similarly
-	 * to {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice | Array.prototype.splice}.
+	 * to {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice | Array.prototype.splice}.
 	 * The maximum amount of fields that can be added is 25.
 	 *
 	 * It's useful for modifying and adjusting order of the already-existing fields of an embed.

packages/core/README.md

@@ -35,7 +35,7 @@ pnpm add @discordjs/core
 ```ts
 import { REST } from '@discordjs/rest';
 import { WebSocketManager } from '@discordjs/ws';
-import { GatewayIntentBits, InteractionType, MessageFlags, Client } from '@discordjs/core';
+import { GatewayDispatchEvents, GatewayIntentBits, InteractionType, MessageFlags, Client } from '@discordjs/core';
 
 // Create REST and WebSocket managers directly
 const rest = new REST({ version: '10' }).setToken(token);
@@ -51,7 +51,7 @@ const client = new Client({ rest, ws });
 // Listen for interactions
 // Each event contains an `api` prop along with the event data that allows you to interface with the Discord REST API
 client.on(GatewayDispatchEvents.InteractionCreate, async ({ data: interaction, api }) => {
-	if (!(interaction.type === InteractionType.ApplicationCommand) || interaction.data.name !== 'ping') {
+	if (interaction.type !== InteractionType.ApplicationCommand || interaction.data.name !== 'ping') {
 		return;
 	}
 

packages/core/src/api/guild.ts

@@ -1,5 +1,9 @@
 import type { RawFile } from '@discordjs/rest';
 import { makeURLSearchParams, type REST } from '@discordjs/rest';
+import type {
+	RESTPatchAPIGuildVoiceStateCurrentMemberJSONBody,
+	RESTPatchAPIGuildVoiceStateCurrentMemberResult,
+} from 'discord-api-types/v10';
 import {
 	Routes,
 	type GuildMFALevel,
@@ -976,4 +980,17 @@ export class GuildsAPI {
 	public async getWebhooks(id: Snowflake) {
 		return this.rest.get(Routes.guildWebhooks(id)) as Promise<RESTGetAPIGuildWebhooksResult>;
 	}
+
+	/**
+	 * Sets the voice state for the current user
+	 *
+	 * @see {@link https://discord.com/developers/docs/resources/guild#modify-current-user-voice-state}
+	 * @param guildId - The id of the guild
+	 * @param options - The options to use when setting the voice state
+	 */
+	public async setVoiceState(guildId: Snowflake, options: RESTPatchAPIGuildVoiceStateCurrentMemberJSONBody = {}) {
+		return this.rest.patch(Routes.guildVoiceState(guildId, '@me'), {
+			body: options,
+		}) as Promise<RESTPatchAPIGuildVoiceStateCurrentMemberResult>;
+	}
 }

packages/core/src/api/interactions.ts

@@ -28,6 +28,7 @@ export class InteractionsAPI {
 	) {
 		await this.rest.post(Routes.interactionCallback(interactionId, interactionToken), {
 			files,
+			auth: false,
 			body: {
 				type: InteractionResponseType.ChannelMessageWithSource,
 				data,
@@ -44,6 +45,7 @@ export class InteractionsAPI {
 	 */
 	public async defer(interactionId: Snowflake, interactionToken: string) {
 		await this.rest.post(Routes.interactionCallback(interactionId, interactionToken), {
+			auth: false,
 			body: {
 				type: InteractionResponseType.DeferredChannelMessageWithSource,
 			},
@@ -59,6 +61,7 @@ export class InteractionsAPI {
 	 */
 	public async deferMessageUpdate(interactionId: Snowflake, interactionToken: string) {
 		await this.rest.post(Routes.interactionCallback(interactionId, interactionToken), {
+			auth: false,
 			body: {
 				type: InteractionResponseType.DeferredMessageUpdate,
 			},
@@ -143,6 +146,7 @@ export class InteractionsAPI {
 	) {
 		await this.rest.post(Routes.interactionCallback(interactionId, interactionToken), {
 			files,
+			auth: false,
 			body: {
 				type: InteractionResponseType.UpdateMessage,
 				data,
@@ -164,6 +168,7 @@ export class InteractionsAPI {
 		data: APICommandAutocompleteInteractionResponseCallbackData,
 	) {
 		await this.rest.post(Routes.interactionCallback(interactionId, interactionToken), {
+			auth: false,
 			body: {
 				type: InteractionResponseType.ApplicationCommandAutocompleteResult,
 				data,
@@ -185,6 +190,7 @@ export class InteractionsAPI {
 		data: APIModalInteractionResponseCallbackData,
 	) {
 		await this.rest.post(Routes.interactionCallback(interactionId, interactionToken), {
+			auth: false,
 			body: {
 				type: InteractionResponseType.Modal,
 				data,

packages/core/src/api/user.ts

@@ -12,8 +12,6 @@ import {
 	type RESTPatchAPICurrentUserResult,
 	type RESTPatchAPIGuildMemberJSONBody,
 	type RESTPatchAPIGuildMemberResult,
-	type RESTPatchAPIGuildVoiceStateCurrentMemberJSONBody,
-	type RESTPatchAPIGuildVoiceStateCurrentMemberResult,
 	type RESTPostAPICurrentUserCreateDMChannelResult,
 	type RESTPutAPICurrentUserApplicationRoleConnectionJSONBody,
 	type RESTPutAPICurrentUserApplicationRoleConnectionResult,
@@ -99,19 +97,6 @@ export class UsersAPI {
 		}) as Promise<RESTPatchAPIGuildMemberResult>;
 	}
 
-	/**
-	 * Sets the voice state for the current user
-	 *
-	 * @see {@link https://discord.com/developers/docs/resources/guild#modify-current-user-voice-state}
-	 * @param guildId - The id of the guild
-	 * @param options - The options to use when setting the voice state
-	 */
-	public async setVoiceState(guildId: Snowflake, options: RESTPatchAPIGuildVoiceStateCurrentMemberJSONBody = {}) {
-		return this.rest.patch(Routes.guildVoiceState(guildId, '@me'), {
-			body: options,
-		}) as Promise<RESTPatchAPIGuildVoiceStateCurrentMemberResult>;
-	}
-
 	/**
 	 * Opens a new DM channel with a user
 	 *

packages/core/src/client.ts

@@ -7,7 +7,6 @@ import { AsyncEventEmitter } from '@vladfrangu/async_event_emitter';
 import {
 	GatewayDispatchEvents,
 	GatewayOpcodes,
-	type GatewayVoiceStateUpdateData,
 	type APIGuildMember,
 	type GatewayAutoModerationActionExecutionDispatchData,
 	type GatewayAutoModerationRuleCreateDispatchData,
@@ -17,6 +16,7 @@ import {
 	type GatewayChannelDeleteDispatchData,
 	type GatewayChannelPinsUpdateDispatchData,
 	type GatewayChannelUpdateDispatchData,
+	type GatewayGuildAuditLogEntryCreateDispatchData,
 	type GatewayGuildBanAddDispatchData,
 	type GatewayGuildBanRemoveDispatchData,
 	type GatewayGuildCreateDispatchData,
@@ -25,8 +25,8 @@ import {
 	type GatewayGuildIntegrationsUpdateDispatchData,
 	type GatewayGuildMemberAddDispatchData,
 	type GatewayGuildMemberRemoveDispatchData,
-	type GatewayGuildMembersChunkDispatchData,
 	type GatewayGuildMemberUpdateDispatchData,
+	type GatewayGuildMembersChunkDispatchData,
 	type GatewayGuildRoleCreateDispatchData,
 	type GatewayGuildRoleDeleteDispatchData,
 	type GatewayGuildRoleUpdateDispatchData,
@@ -51,6 +51,7 @@ import {
 	type GatewayMessageReactionRemoveDispatchData,
 	type GatewayMessageReactionRemoveEmojiDispatchData,
 	type GatewayMessageUpdateDispatchData,
+	type GatewayPresenceUpdateData,
 	type GatewayPresenceUpdateDispatchData,
 	type GatewayReadyDispatchData,
 	type GatewayRequestGuildMembersData,
@@ -60,15 +61,15 @@ import {
 	type GatewayThreadCreateDispatchData,
 	type GatewayThreadDeleteDispatchData,
 	type GatewayThreadListSyncDispatchData,
-	type GatewayThreadMembersUpdateDispatchData,
 	type GatewayThreadMemberUpdateDispatchData,
+	type GatewayThreadMembersUpdateDispatchData,
 	type GatewayThreadUpdateDispatchData,
 	type GatewayTypingStartDispatchData,
 	type GatewayUserUpdateDispatchData,
 	type GatewayVoiceServerUpdateDispatchData,
+	type GatewayVoiceStateUpdateData,
 	type GatewayVoiceStateUpdateDispatchData,
 	type GatewayWebhooksUpdateDispatchData,
-	type GatewayPresenceUpdateData,
 } from 'discord-api-types/v10';
 import { API } from './api/index.js';
 
@@ -88,10 +89,17 @@ export interface WithIntrinsicProps<T> extends IntrinsicProps {
 }
 
 export interface MappedEvents {
+	[GatewayDispatchEvents.AutoModerationActionExecution]: [
+		WithIntrinsicProps<GatewayAutoModerationActionExecutionDispatchData>,
+	];
+	[GatewayDispatchEvents.AutoModerationRuleCreate]: [WithIntrinsicProps<GatewayAutoModerationRuleCreateDispatchData>];
+	[GatewayDispatchEvents.AutoModerationRuleDelete]: [WithIntrinsicProps<GatewayAutoModerationRuleDeleteDispatchData>];
+	[GatewayDispatchEvents.AutoModerationRuleUpdate]: [WithIntrinsicProps<GatewayAutoModerationRuleUpdateDispatchData>];
 	[GatewayDispatchEvents.ChannelCreate]: [WithIntrinsicProps<GatewayChannelCreateDispatchData>];
 	[GatewayDispatchEvents.ChannelDelete]: [WithIntrinsicProps<GatewayChannelDeleteDispatchData>];
 	[GatewayDispatchEvents.ChannelPinsUpdate]: [WithIntrinsicProps<GatewayChannelPinsUpdateDispatchData>];
 	[GatewayDispatchEvents.ChannelUpdate]: [WithIntrinsicProps<GatewayChannelUpdateDispatchData>];
+	[GatewayDispatchEvents.GuildAuditLogEntryCreate]: [WithIntrinsicProps<GatewayGuildAuditLogEntryCreateDispatchData>];
 	[GatewayDispatchEvents.GuildBanAdd]: [WithIntrinsicProps<GatewayGuildBanAddDispatchData>];
 	[GatewayDispatchEvents.GuildBanRemove]: [WithIntrinsicProps<GatewayGuildBanRemoveDispatchData>];
 	[GatewayDispatchEvents.GuildCreate]: [WithIntrinsicProps<GatewayGuildCreateDispatchData>];
@@ -134,6 +142,7 @@ export interface MappedEvents {
 	[GatewayDispatchEvents.MessageUpdate]: [WithIntrinsicProps<GatewayMessageUpdateDispatchData>];
 	[GatewayDispatchEvents.PresenceUpdate]: [WithIntrinsicProps<GatewayPresenceUpdateDispatchData>];
 	[GatewayDispatchEvents.Ready]: [WithIntrinsicProps<GatewayReadyDispatchData>];
+	[GatewayDispatchEvents.Resumed]: [WithIntrinsicProps<never>];
 	[GatewayDispatchEvents.StageInstanceCreate]: [WithIntrinsicProps<GatewayStageInstanceCreateDispatchData>];
 	[GatewayDispatchEvents.StageInstanceDelete]: [WithIntrinsicProps<GatewayStageInstanceDeleteDispatchData>];
 	[GatewayDispatchEvents.StageInstanceUpdate]: [WithIntrinsicProps<GatewayStageInstanceUpdateDispatchData>];
@@ -143,18 +152,11 @@ export interface MappedEvents {
 	[GatewayDispatchEvents.ThreadMemberUpdate]: [WithIntrinsicProps<GatewayThreadMemberUpdateDispatchData>];
 	[GatewayDispatchEvents.ThreadMembersUpdate]: [WithIntrinsicProps<GatewayThreadMembersUpdateDispatchData>];
 	[GatewayDispatchEvents.ThreadUpdate]: [WithIntrinsicProps<GatewayThreadUpdateDispatchData>];
+	[GatewayDispatchEvents.TypingStart]: [WithIntrinsicProps<GatewayTypingStartDispatchData>];
 	[GatewayDispatchEvents.UserUpdate]: [WithIntrinsicProps<GatewayUserUpdateDispatchData>];
 	[GatewayDispatchEvents.VoiceServerUpdate]: [WithIntrinsicProps<GatewayVoiceServerUpdateDispatchData>];
 	[GatewayDispatchEvents.VoiceStateUpdate]: [WithIntrinsicProps<GatewayVoiceStateUpdateDispatchData>];
 	[GatewayDispatchEvents.WebhooksUpdate]: [WithIntrinsicProps<GatewayWebhooksUpdateDispatchData>];
-	[GatewayDispatchEvents.Resumed]: [WithIntrinsicProps<never>];
-	[GatewayDispatchEvents.TypingStart]: [WithIntrinsicProps<GatewayTypingStartDispatchData>];
-	[GatewayDispatchEvents.AutoModerationActionExecution]: [
-		WithIntrinsicProps<GatewayAutoModerationActionExecutionDispatchData>,
-	];
-	[GatewayDispatchEvents.AutoModerationRuleCreate]: [WithIntrinsicProps<GatewayAutoModerationRuleCreateDispatchData>];
-	[GatewayDispatchEvents.AutoModerationRuleDelete]: [WithIntrinsicProps<GatewayAutoModerationRuleDeleteDispatchData>];
-	[GatewayDispatchEvents.AutoModerationRuleUpdate]: [WithIntrinsicProps<GatewayAutoModerationRuleUpdateDispatchData>];
 }
 
 export type ManagerShardEventsMap = {

packages/discord.js/src/client/actions/Action.js

@@ -34,7 +34,7 @@ class GenericAction {
   getChannel(data) {
     const id = data.channel_id ?? data.id;
     return (
-      data.channel ??
+      data[this.client.actions.injectedChannel] ??
       this.getPayload(
         {
           id,
@@ -51,7 +51,7 @@ class GenericAction {
   getMessage(data, channel, cache) {
     const id = data.message_id ?? data.id;
     return (
-      data.message ??
+      data[this.client.actions.injectedMessage] ??
       this.getPayload(
         {
           id,
@@ -86,7 +86,7 @@ class GenericAction {
 
   getUser(data) {
     const id = data.user_id;
-    return data.user ?? this.getPayload({ id }, this.client.users, id, Partials.User);
+    return data[this.client.actions.injectedUser] ?? this.getPayload({ id }, this.client.users, id, Partials.User);
   }
 
   getUserFromMember(data) {

packages/discord.js/src/client/actions/ActionsManager.js

@@ -1,6 +1,13 @@
 'use strict';
 
 class ActionsManager {
+  // These symbols represent fully built data that we inject at times when calling actions manually. Action#getUser,
+  // for example, will return the injected data (which is assumed to be a built structure) instead of trying to make it
+  // from provided data
+  injectedUser = Symbol('djs.actions.injectedUser');
+  injectedChannel = Symbol('djs.actions.injectedChannel');
+  injectedMessage = Symbol('djs.actions.injectedMessage');
+
   constructor(client) {
     this.client = client;
 

packages/discord.js/src/managers/MessageManager.js

@@ -49,6 +49,7 @@ class MessageManager extends CachedManager {
 
   /**
    * Options used to fetch multiple messages.
+   * <info>The `before`, `after`, and `around` parameters are mutually exclusive.</info>
    * @typedef {Object} FetchMessagesOptions
    * @property {number} [limit] The maximum number of messages to return
    * @property {Snowflake} [before] Consider only messages before this id

packages/discord.js/src/managers/ThreadManager.js

@@ -148,7 +148,7 @@ class ThreadManager extends CachedManager {
     let id;
     const query = makeURLSearchParams({ limit });
     if (before !== undefined) {
-      if (before instanceof ThreadChannel || /^\d{16,19}$/.test(String(before))) {
+      if (before instanceof ThreadChannel || /^\d{17,19}$/.test(String(before))) {
         id = this.resolveId(before);
         timestamp = this.resolve(before)?.archivedAt?.toISOString();
         const toUse = type === 'private' && !fetchAll ? id : timestamp;

packages/discord.js/src/structures/Message.js

@@ -787,9 +787,9 @@ class Message extends Base {
 
     return this.client.actions.MessageReactionAdd.handle(
       {
-        user: this.client.user,
-        channel: this.channel,
-        message: this,
+        [this.client.actions.injectedUser]: this.client.user,
+        [this.client.actions.injectedChannel]: this.channel,
+        [this.client.actions.injectedMessage]: this,
         emoji: resolvePartialEmoji(emoji),
       },
       true,

packages/discord.js/src/structures/interfaces/Collector.js

@@ -95,6 +95,20 @@ class Collector extends EventEmitter {
 
     if (options.time) this._timeout = setTimeout(() => this.stop('time'), options.time).unref();
     if (options.idle) this._idletimeout = setTimeout(() => this.stop('idle'), options.idle).unref();
+
+    /**
+     * The timestamp at which this collector last collected an item
+     * @type {?number}
+     */
+    this.lastCollectedTimestamp = null;
+  }
+
+  /**
+   * The Date at which this collector last collected an item
+   * @type {?Date}
+   */
+  get lastCollectedAt() {
+    return this.lastCollectedTimestamp && new Date(this.lastCollectedTimestamp);
   }
 
   /**
@@ -118,6 +132,7 @@ class Collector extends EventEmitter {
          */
         this.emit('collect', ...args);
 
+        this.lastCollectedTimestamp = Date.now();
         if (this._idletimeout) {
           clearTimeout(this._idletimeout);
           this._idletimeout = setTimeout(() => this.stop('idle'), this.options.idle).unref();

packages/discord.js/typings/index.d.ts

@@ -1060,6 +1060,8 @@ export abstract class Collector<K, V, F extends unknown[] = []> extends EventEmi
 
   public readonly client: Client;
   public collected: Collection<K, V>;
+  public lastCollectedTimestamp: number | null;
+  public get lastCollectedAt(): Date | null;
   public ended: boolean;
   public get endReason(): string | null;
   public filter: CollectorFilter<[V, ...F]>;

packages/proxy-container/Dockerfile

@@ -23,7 +23,7 @@ COPY --from=builder /usr/proxy/out/yarn.lock ./yarn.lock
 RUN yarn install
 
 COPY --from=builder /usr/proxy/out/full/ .
-COPY tsup.config.js tsup.config.js
+COPY tsup.config.ts tsup.config.ts
 COPY turbo.json turbo.json
 COPY tsconfig.json tsconfig.json
 RUN yarn dlx turbo run build --filter=@discordjs/proxy-container...

packages/rest/src/lib/RequestManager.ts

@@ -499,14 +499,14 @@ export class RequestManager extends EventEmitter {
 	 * @internal
 	 */
 	private static generateRouteData(endpoint: RouteLike, method: RequestMethod): RouteData {
-		const majorIdMatch = /^\/(?:channels|guilds|webhooks)\/(\d{16,19})/.exec(endpoint);
+		const majorIdMatch = /^\/(?:channels|guilds|webhooks)\/(\d{17,19})/.exec(endpoint);
 
 		// Get the major id for this route - global otherwise
 		const majorId = majorIdMatch?.[1] ?? 'global';
 
 		const baseRoute = endpoint
 			// Strip out all ids
-			.replaceAll(/\d{16,19}/g, ':id')
+			.replaceAll(/\d{17,19}/g, ':id')
 			// Strip out reaction as they fall under the same bucket
 			.replace(/\/reactions\/(.*)/, '/reactions/:reaction');
 
@@ -515,7 +515,7 @@ export class RequestManager extends EventEmitter {
 		// Hard-Code Old Message Deletion Exception (2 week+ old messages are a different bucket)
 		// https://github.com/discord/discord-api-docs/issues/1295
 		if (method === RequestMethod.Delete && baseRoute === '/channels/:id/messages/:id') {
-			const id = /\d{16,19}$/.exec(endpoint)![0]!;
+			const id = /\d{17,19}$/.exec(endpoint)![0]!;
 			const timestamp = DiscordSnowflake.timestampFrom(id);
 			if (Date.now() - timestamp > 1_000 * 60 * 60 * 24 * 14) {
 				exceptions += '/Delete Old Message';

packages/voice/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+# [@discordjs/voice@0.15.0](https://github.com/discordjs/discord.js/compare/@discordjs/voice@0.14.0...@discordjs/voice@0.15.0) - (2023-03-12)
+
+## Bug Fixes
+
+- **Voice:** Send keep alives without awaiting a response (#9202) ([c6d98fa](https://github.com/discordjs/discord.js/commit/c6d98fa0c55a482cd4a81abd6f08290c29839b1b))
+
+## Documentation
+
+- Fix version export (#9049) ([8b70f49](https://github.com/discordjs/discord.js/commit/8b70f497a1207e30edebdecd12b926c981c13d28))
+
+## Features
+
+- **website:** Add support for source file links (#9048) ([f6506e9](https://github.com/discordjs/discord.js/commit/f6506e99c496683ee0ab67db0726b105b929af38))
+
 # [@discordjs/voice@0.14.0](https://github.com/discordjs/discord.js/compare/@discordjs/voice@0.13.0...@discordjs/voice@0.14.0) - (2022-11-28)
 
 ## Bug Fixes