chore(core): release @discordjs/core@2.0.1

This reverts commit 7b2a2e3a15.

apps/website/src/components/Badges.tsx

@@ -18,9 +18,8 @@ export async function Badges({ node }: { readonly node: any }) {
 	const isAbstract = node.isAbstract;
 	const isReadonly = node.isReadonly;
 	const isOptional = node.isOptional;
-	const isExternal = node.isExternal;
 
-	const isAny = isDeprecated || isProtected || isStatic || isAbstract || isReadonly || isOptional || isExternal;
+	const isAny = isDeprecated || isProtected || isStatic || isAbstract || isReadonly || isOptional;
 
 	return isAny ? (
 		<div className="mb-1 flex gap-3">
@@ -34,7 +33,6 @@ export async function Badges({ node }: { readonly node: any }) {
 			{isAbstract ? <Badge className="bg-cyan-500/20 text-cyan-500">abstract</Badge> : null}
 			{isReadonly ? <Badge className="bg-purple-500/20 text-purple-500">readonly</Badge> : null}
 			{isOptional ? <Badge className="bg-cyan-500/20 text-cyan-500">optional</Badge> : null}
-			{isExternal ? <Badge className="bg-purple-500/20 text-purple-500">external</Badge> : null}
 		</div>
 	) : null;
 }

apps/website/src/util/fetchDependencies.ts

@@ -20,7 +20,7 @@ export async function fetchDependencies({
 
 			return Object.entries<string>(parsedDependencies)
 				.filter(([key]) => key.startsWith('@discordjs/') && !key.includes('api-extractor'))
-				.map(([key, value]) => `${key.replace('@discordjs/', '').replaceAll('.', '-')}-${value.replaceAll('.', '-')}`);
+				.map(([key, value]) => `${key.replace('@discordjs/', '').replaceAll('.', '-')}-${sanitizeVersion(value)}`);
 		} catch {
 			return [];
 		}
@@ -36,8 +36,12 @@ export async function fetchDependencies({
 
 		return Object.entries<string>(parsedDependencies)
 			.filter(([key]) => key.startsWith('@discordjs/') && !key.includes('api-extractor'))
-			.map(([key, value]) => `${key.replace('@discordjs/', '').replaceAll('.', '-')}-${value.replaceAll('.', '-')}`);
+			.map(([key, value]) => `${key.replace('@discordjs/', '').replaceAll('.', '-')}-${sanitizeVersion(value)}`);
 	} catch {
 		return [];
 	}
 }
+
+function sanitizeVersion(version: string) {
+	return version.replaceAll('.', '-').replace(/^[\^~]/, '');
+}

packages/actions/package.json

@@ -49,7 +49,7 @@
 		"meilisearch": "^0.38.0",
 		"p-limit": "^6.1.0",
 		"tslib": "^2.6.3",
-		"undici": "6.21.1"
+		"undici": "6.19.8"
 	},
 	"devDependencies": {
 		"@types/node": "^18.19.45",

packages/api-extractor/src/generators/ApiModelGenerator.ts

@@ -1510,15 +1510,17 @@ export class ApiModelGenerator {
 			const excerptTokens: IExcerptToken[] = [
 				{
 					kind: ExcerptTokenKind.Content,
-					text: `on('${name}', (${
-						jsDoc.params?.length ? `${jsDoc.params[0]?.name}${jsDoc.params[0]?.nullable ? '?' : ''}: ` : ') => {})'
+					text: `public on(eventName: '${name}', listener: (${
+						jsDoc.params?.length
+							? `${jsDoc.params[0]?.name}${jsDoc.params[0]?.optional ? '?' : ''}: `
+							: ') => void): this;'
 					}`,
 				},
 			];
 			const parameters: IApiParameterOptions[] = [];
 			for (let index = 0; index < (jsDoc.params?.length ?? 0) - 1; index++) {
 				const parameter = jsDoc.params![index]!;
-				const newTokens = this._mapVarType(parameter.type);
+				const newTokens = this._mapVarType(parameter.type, parameter.nullable);
 				parameters.push({
 					parameterName: parameter.name,
 					parameterTypeTokenRange: {
@@ -1537,7 +1539,7 @@ export class ApiModelGenerator {
 
 			if (jsDoc.params?.length) {
 				const parameter = jsDoc.params![jsDoc.params.length - 1]!;
-				const newTokens = this._mapVarType(parameter.type);
+				const newTokens = this._mapVarType(parameter.type, parameter.nullable);
 				parameters.push({
 					parameterName: parameter.name,
 					parameterTypeTokenRange: {
@@ -1550,7 +1552,7 @@ export class ApiModelGenerator {
 				excerptTokens.push(...newTokens);
 				excerptTokens.push({
 					kind: ExcerptTokenKind.Content,
-					text: `) => {})`,
+					text: `) => void): this;`,
 				});
 			}
 
@@ -1773,7 +1775,7 @@ export class ApiModelGenerator {
 			.replaceAll('* ', '\n * * ');
 	}
 
-	private _mapVarType(typey: DocgenVarTypeJson): IExcerptToken[] {
+	private _mapVarType(typey: DocgenVarTypeJson, nullable?: boolean): IExcerptToken[] {
 		const mapper = Array.isArray(typey) ? typey : (typey.types ?? []);
 		const lookup: { [K in ts.SyntaxKind]?: string } = {
 			[ts.SyntaxKind.ClassDeclaration]: 'class',
@@ -1816,7 +1818,22 @@ export class ApiModelGenerator {
 						{ kind: ExcerptTokenKind.Content, text: symbol ?? '' },
 					];
 				}, []);
-				return index === 0 ? result : [{ kind: ExcerptTokenKind.Content, text: ' | ' }, ...result];
+				return index === 0
+					? mapper.length === 1 && (nullable || ('nullable' in typey && typey.nullable))
+						? [
+								...result,
+								{ kind: ExcerptTokenKind.Content, text: ' | ' },
+								{ kind: ExcerptTokenKind.Reference, text: 'null' },
+							]
+						: result
+					: index === mapper.length - 1 && (nullable || ('nullable' in typey && typey.nullable))
+						? [
+								{ kind: ExcerptTokenKind.Content, text: ' | ' },
+								...result,
+								{ kind: ExcerptTokenKind.Content, text: ' | ' },
+								{ kind: ExcerptTokenKind.Reference, text: 'null' },
+							]
+						: [{ kind: ExcerptTokenKind.Content, text: ' | ' }, ...result];
 			})
 			.filter((excerpt) => excerpt.text.length);
 	}

packages/brokers/README.md

@@ -23,7 +23,7 @@
 
 ## Installation
 
-**Node.js 18 or newer is required.**
+**Node.js 20 or newer is required.**
 
 ```sh
 npm install @discordjs/brokers

packages/brokers/cliff.toml

@@ -30,8 +30,10 @@ body = """
 			{{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}]({{ self::remote_url() }}/commit/{{ commit.id }}))\
 			{% if commit.github.username %} by @{{ commit.github.username }}{%- endif %}\
 		{% if commit.breaking %}\
-			{% for breakingChange in commit.footers %}\
-				\n{% raw %}  {% endraw %}- **{{ breakingChange.token }}{{ breakingChange.separator }}** {{ breakingChange.value }}\
+			{% for footer in commit.footers %}\
+				{% if footer.breaking %}\
+					\n{% raw %}  {% endraw %}- **{{ footer.token }}{{ footer.separator }}** {{ footer.value }}\
+				{% endif %}\
 			{% endfor %}\
 		{% endif %}\
 	{% endfor %}

packages/brokers/package.json

@@ -89,7 +89,7 @@
 		"vitest": "^2.0.5"
 	},
 	"engines": {
-		"node": ">=18"
+		"node": ">=20"
 	},
 	"publishConfig": {
 		"access": "public",

packages/builders/CHANGELOG.md

@@ -2,42 +2,6 @@
 
 All notable changes to this project will be documented in this file.
 
-# [@discordjs/builders@1.12.2](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.12.1...@discordjs/builders@1.12.2) - (2025-10-09)
-
-## Bug Fixes
-
-- **Assertions:** Literal default values ([43362c9](https://github.com/discordjs/discord.js/commit/43362c93525f98d72b894eb0fc6b358d30ec45b9))
-
-# [@discordjs/builders@1.12.1](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.12.0...@discordjs/builders@1.12.1) - (2025-10-08)
-
-## Bug Fixes
-
-- **builders:** Text display component support for modals (#11155) ([99b8436](https://github.com/discordjs/discord.js/commit/99b8436117bc12654278337abc4a23f5bdf4ba46))
-
-# [@discordjs/builders@1.12.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.11.3...@discordjs/builders@1.12.0) - (2025-10-08)
-
-## Features
-
-- **builders:** Modal select menus in builders v1 (#11138) ([ac683b9](https://github.com/discordjs/discord.js/commit/ac683b9d040635de8514c80a9d433d9c6d63701b))
-
-# [@discordjs/builders@1.11.3](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.11.2...@discordjs/builders@1.11.3) - (2025-08-10)
-
-## Bug Fixes
-
-- **contextMenuCommands:** Remove regular expression validation (#10996) ([4906aae](https://github.com/discordjs/discord.js/commit/4906aaea4c0e6e868fa658d3359026eb662fbcb8))
-
-# [@discordjs/builders@1.11.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.10.1...@discordjs/builders@1.11.0) - (2025-04-25)
-
-## Features
-
-- Components v2 in builders v1 (#10787) ([118e682](https://github.com/discordjs/discord.js/commit/118e6826821b3b90f5923e40f167747e0658cfd1))
-
-# [@discordjs/builders@1.10.1](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.10.0...@discordjs/builders@1.10.1) - (2025-02-10)
-
-## Bug Fixes
-
-- **EmbedBuilder:** Allow empty `name` and `value` on fields (#10747) ([49ef3a8](https://github.com/discordjs/discord.js/commit/49ef3a833eab23d426d5c667e28aa493ddc9cb6c))
-
 # [@discordjs/builders@1.9.0](https://github.com/discordjs/discord.js/compare/@discordjs/builders@1.8.2...@discordjs/builders@1.9.0) - (2024-09-01)
 
 ## Features

packages/builders/README.md

@@ -23,7 +23,7 @@
 
 ## Installation
 
-**Node.js 16.11.0 or newer is required.**
+**Node.js 18 or newer is required.**
 
 ```sh
 npm install @discordjs/builders

packages/builders/__tests__/components/actionRow.test.ts

@@ -2,7 +2,7 @@ import {
 	ButtonStyle,
 	ComponentType,
 	type APIActionRowComponent,
-	type APIComponentInMessageActionRow,
+	type APIMessageActionRowComponent,
 } from 'discord-api-types/v10';
 import { describe, test, expect } from 'vitest';
 import {
@@ -13,7 +13,7 @@ import {
 	StringSelectMenuOptionBuilder,
 } from '../../src/index.js';
 
-const rowWithButtonData: APIActionRowComponent<APIComponentInMessageActionRow> = {
+const rowWithButtonData: APIActionRowComponent<APIMessageActionRowComponent> = {
 	type: ComponentType.ActionRow,
 	components: [
 		{
@@ -25,7 +25,7 @@ const rowWithButtonData: APIActionRowComponent<APIComponentInMessageActionRow> =
 	],
 };
 
-const rowWithSelectMenuData: APIActionRowComponent<APIComponentInMessageActionRow> = {
+const rowWithSelectMenuData: APIActionRowComponent<APIMessageActionRowComponent> = {
 	type: ComponentType.ActionRow,
 	components: [
 		{
@@ -57,7 +57,7 @@ describe('Action Row Components', () => {
 		});
 
 		test('GIVEN valid JSON input THEN valid JSON output is given', () => {
-			const actionRowData: APIActionRowComponent<APIComponentInMessageActionRow> = {
+			const actionRowData: APIActionRowComponent<APIMessageActionRowComponent> = {
 				type: ComponentType.ActionRow,
 				components: [
 					{
@@ -92,7 +92,7 @@ describe('Action Row Components', () => {
 		});
 
 		test('GIVEN valid builder options THEN valid JSON output is given', () => {
-			const rowWithButtonData: APIActionRowComponent<APIComponentInMessageActionRow> = {
+			const rowWithButtonData: APIActionRowComponent<APIMessageActionRowComponent> = {
 				type: ComponentType.ActionRow,
 				components: [
 					{
@@ -104,7 +104,7 @@ describe('Action Row Components', () => {
 				],
 			};
 
-			const rowWithSelectMenuData: APIActionRowComponent<APIComponentInMessageActionRow> = {
+			const rowWithSelectMenuData: APIActionRowComponent<APIMessageActionRowComponent> = {
 				type: ComponentType.ActionRow,
 				components: [
 					{

packages/builders/__tests__/components/components.test.ts

@@ -3,7 +3,7 @@ import {
 	ComponentType,
 	TextInputStyle,
 	type APIButtonComponent,
-	type APIComponentInMessageActionRow,
+	type APIMessageActionRowComponent,
 	type APISelectMenuComponent,
 	type APITextInputComponent,
 	type APIActionRowComponent,
@@ -27,7 +27,7 @@ describe('createComponentBuilder', () => {
 	);
 
 	test('GIVEN an action row component THEN returns a ActionRowBuilder', () => {
-		const actionRow: APIActionRowComponent<APIComponentInMessageActionRow> = {
+		const actionRow: APIActionRowComponent<APIMessageActionRowComponent> = {
 			components: [],
 			type: ComponentType.ActionRow,
 		};

packages/builders/__tests__/components/textInput.test.ts

@@ -100,7 +100,7 @@ describe('Text Input Components', () => {
 				.setPlaceholder('hello')
 				.setStyle(TextInputStyle.Paragraph)
 				.toJSON();
-		}).not.toThrowError();
+		}).toThrowError();
 	});
 
 	test('GIVEN valid input THEN valid JSON outputs are given', () => {

packages/builders/__tests__/components/v2/container.test.ts

@@ -1,248 +0,0 @@
-import { type APIContainerComponent, ComponentType, SeparatorSpacingSize } from 'discord-api-types/v10';
-import { describe, test, expect } from 'vitest';
-import { ActionRowBuilder } from '../../../src/components/ActionRow.js';
-import { createComponentBuilder } from '../../../src/components/Components.js';
-import { ButtonBuilder } from '../../../src/components/button/Button.js';
-import { ContainerBuilder } from '../../../src/components/v2/Container.js';
-import { FileBuilder } from '../../../src/components/v2/File.js';
-import { MediaGalleryBuilder } from '../../../src/components/v2/MediaGallery.js';
-import { SectionBuilder } from '../../../src/components/v2/Section.js';
-import { SeparatorBuilder } from '../../../src/components/v2/Separator.js';
-import { TextDisplayBuilder } from '../../../src/components/v2/TextDisplay.js';
-
-const containerWithTextDisplay: APIContainerComponent = {
-	type: ComponentType.Container,
-	components: [
-		{
-			type: ComponentType.TextDisplay,
-			content: 'test',
-			id: 123,
-		},
-	],
-};
-
-const containerWithSeparatorData: APIContainerComponent = {
-	type: ComponentType.Container,
-	components: [
-		{
-			type: ComponentType.Separator,
-			id: 1_234,
-			spacing: SeparatorSpacingSize.Small,
-			divider: false,
-		},
-	],
-	accent_color: 0x00ff00,
-};
-
-const containerWithSeparatorDataNoColor: APIContainerComponent = {
-	type: ComponentType.Container,
-	components: [
-		{
-			type: ComponentType.Separator,
-			id: 1_234,
-			spacing: SeparatorSpacingSize.Small,
-			divider: false,
-		},
-	],
-};
-
-describe('Container Components', () => {
-	describe('Assertion Tests', () => {
-		test('GIVEN valid components THEN do not throw', () => {
-			expect(() =>
-				new ContainerBuilder().addActionRowComponents(
-					new ActionRowBuilder<ButtonBuilder>().addComponents(new ButtonBuilder()),
-				),
-			).not.toThrowError();
-			expect(() => new ContainerBuilder().addFileComponents(new FileBuilder())).not.toThrowError();
-			expect(() => new ContainerBuilder().addMediaGalleryComponents(new MediaGalleryBuilder())).not.toThrowError();
-			expect(() => new ContainerBuilder().addSectionComponents(new SectionBuilder())).not.toThrowError();
-			expect(() => new ContainerBuilder().addSeparatorComponents(new SeparatorBuilder())).not.toThrowError();
-			expect(() => new ContainerBuilder().addTextDisplayComponents(new TextDisplayBuilder())).not.toThrowError();
-			expect(() => new ContainerBuilder().spliceComponents(0, 0, new SeparatorBuilder())).not.toThrowError();
-			expect(() => new ContainerBuilder().addSeparatorComponents([new SeparatorBuilder()])).not.toThrowError();
-			expect(() =>
-				new ContainerBuilder().spliceComponents(0, 0, [{ type: ComponentType.Separator }]),
-			).not.toThrowError();
-		});
-
-		test('GIVEN valid JSON input THEN valid JSON output is given', () => {
-			const containerData: APIContainerComponent = {
-				type: ComponentType.Container,
-				components: [
-					{
-						type: ComponentType.TextDisplay,
-						content: 'test',
-						id: 3,
-					},
-					{
-						type: ComponentType.Separator,
-						spacing: SeparatorSpacingSize.Large,
-						divider: true,
-						id: 4,
-					},
-					{
-						type: ComponentType.File,
-						file: {
-							url: 'attachment://file.png',
-						},
-						spoiler: false,
-					},
-				],
-				accent_color: 0xff00ff,
-				spoiler: true,
-			};
-
-			expect(new ContainerBuilder(containerData).toJSON()).toEqual(containerData);
-			expect(() => createComponentBuilder({ type: ComponentType.Container, components: [] })).not.toThrowError();
-		});
-
-		test('GIVEN valid builder options THEN valid JSON output is given', () => {
-			const containerWithTextDisplay: APIContainerComponent = {
-				type: ComponentType.Container,
-				components: [
-					{
-						type: ComponentType.TextDisplay,
-						content: 'test',
-						id: 123,
-					},
-				],
-			};
-
-			const containerWithSeparatorData: APIContainerComponent = {
-				type: ComponentType.Container,
-				components: [
-					{
-						type: ComponentType.Separator,
-						id: 1_234,
-						spacing: SeparatorSpacingSize.Small,
-						divider: false,
-					},
-				],
-				accent_color: 0x00ff00,
-			};
-
-			expect(new ContainerBuilder(containerWithTextDisplay).toJSON()).toEqual(containerWithTextDisplay);
-			expect(new ContainerBuilder(containerWithSeparatorData).toJSON()).toEqual(containerWithSeparatorData);
-			expect(() => createComponentBuilder({ type: ComponentType.Container, components: [] })).not.toThrowError();
-		});
-
-		test('GIVEN valid builder options THEN valid JSON output is given 2', () => {
-			const textDisplay = new TextDisplayBuilder().setContent('test').setId(123);
-			const separator = new SeparatorBuilder().setId(1_234).setSpacing(SeparatorSpacingSize.Small).setDivider(false);
-
-			expect(new ContainerBuilder().addTextDisplayComponents(textDisplay).toJSON()).toEqual(containerWithTextDisplay);
-			expect(new ContainerBuilder().addSeparatorComponents(separator).toJSON()).toEqual(
-				containerWithSeparatorDataNoColor,
-			);
-			expect(new ContainerBuilder().addTextDisplayComponents([textDisplay]).toJSON()).toEqual(containerWithTextDisplay);
-			expect(new ContainerBuilder().addSeparatorComponents([separator]).toJSON()).toEqual(
-				containerWithSeparatorDataNoColor,
-			);
-		});
-
-		test('GIVEN valid accent color THEN valid JSON output is given', () => {
-			expect(
-				new ContainerBuilder({
-					components: [
-						{
-							type: ComponentType.TextDisplay,
-							content: 'test',
-						},
-					],
-				})
-					.setAccentColor([255, 0, 255])
-					.toJSON(),
-			).toEqual({
-				type: ComponentType.Container,
-				components: [
-					{
-						type: ComponentType.TextDisplay,
-						content: 'test',
-					},
-				],
-				accent_color: 0xff00ff,
-			});
-			expect(
-				new ContainerBuilder({
-					components: [
-						{
-							type: ComponentType.TextDisplay,
-							content: 'test',
-						},
-					],
-				})
-					.setAccentColor(0xff00ff)
-					.toJSON(),
-			).toEqual({
-				type: ComponentType.Container,
-				components: [
-					{
-						type: ComponentType.TextDisplay,
-						content: 'test',
-					},
-				],
-				accent_color: 0xff00ff,
-			});
-			expect(
-				new ContainerBuilder({
-					components: [
-						{
-							type: ComponentType.TextDisplay,
-							content: 'test',
-						},
-					],
-				})
-					.setAccentColor([255, 0, 255])
-					.clearAccentColor()
-					.toJSON(),
-			).toEqual({
-				type: ComponentType.Container,
-				components: [
-					{
-						type: ComponentType.TextDisplay,
-						content: 'test',
-					},
-				],
-			});
-			expect(new ContainerBuilder(containerWithSeparatorData).clearAccentColor().toJSON()).toEqual(
-				containerWithSeparatorDataNoColor,
-			);
-		});
-
-		test('GIVEN valid method parameters THEN valid JSON is given', () => {
-			expect(
-				new ContainerBuilder()
-					.addTextDisplayComponents(new TextDisplayBuilder().setId(3).clearId().setContent('test'))
-					.setSpoiler()
-					.toJSON(),
-			).toEqual({
-				type: ComponentType.Container,
-				components: [
-					{
-						type: ComponentType.TextDisplay,
-						content: 'test',
-					},
-				],
-				spoiler: true,
-			});
-			expect(
-				new ContainerBuilder()
-					.addTextDisplayComponents({ type: ComponentType.TextDisplay, content: 'test' })
-					.setSpoiler(false)
-					.setId(5)
-					.toJSON(),
-			).toEqual({
-				type: ComponentType.Container,
-				components: [
-					{
-						type: ComponentType.TextDisplay,
-						content: 'test',
-					},
-				],
-				spoiler: false,
-				id: 5,
-			});
-		});
-	});
-});

packages/builders/__tests__/components/v2/file.test.ts

@@ -1,44 +0,0 @@
-import { ComponentType } from 'discord-api-types/v10';
-import { describe, expect, test } from 'vitest';
-import { FileBuilder } from '../../../src/components/v2/File';
-
-const dummy = {
-	type: ComponentType.File as const,
-	file: { url: 'attachment://owo.png' },
-};
-
-describe('File', () => {
-	describe('File url', () => {
-		test('GIVEN a file with a pre-defined url THEN return valid toJSON data', () => {
-			const file = new FileBuilder({ file: { url: 'attachment://owo.png' } });
-			expect(file.toJSON()).toEqual({ ...dummy, file: { url: 'attachment://owo.png' } });
-		});
-
-		test('GIVEN a file using File#setURL THEN return valid toJSON data', () => {
-			const file = new FileBuilder();
-			file.setURL('attachment://uwu.png');
-
-			expect(file.toJSON()).toEqual({ ...dummy, file: { url: 'attachment://uwu.png' } });
-		});
-
-		test('GIVEN a file with an invalid url THEN throws error', () => {
-			const file = new FileBuilder();
-
-			expect(() => file.setURL('https://google.com')).toThrowError();
-		});
-	});
-
-	describe('File spoiler', () => {
-		test('GIVEN a file with a pre-defined spoiler status THEN return valid toJSON data', () => {
-			const file = new FileBuilder({ ...dummy, spoiler: true });
-			expect(file.toJSON()).toEqual({ ...dummy, spoiler: true });
-		});
-
-		test('GIVEN a file using File#setSpoiler THEN return valid toJSON data', () => {
-			const file = new FileBuilder({ ...dummy });
-			file.setSpoiler(false);
-
-			expect(file.toJSON()).toEqual({ ...dummy, spoiler: false });
-		});
-	});
-});

packages/builders/__tests__/components/v2/mediagallery.test.ts

@@ -1,150 +0,0 @@
-import { type APIMediaGalleryItem, type APIMediaGalleryComponent, ComponentType } from 'discord-api-types/v10';
-import { describe, test, expect } from 'vitest';
-import { createComponentBuilder } from '../../../src/components/Components.js';
-import { MediaGalleryBuilder } from '../../../src/components/v2/MediaGallery.js';
-import { MediaGalleryItemBuilder } from '../../../src/components/v2/MediaGalleryItem.js';
-
-const galleryHttpsDisplay: APIMediaGalleryComponent = {
-	type: ComponentType.MediaGallery,
-	items: [
-		{
-			description: 'test',
-			spoiler: false,
-			media: { url: 'https://discord.com/logo.png' },
-		},
-	],
-};
-
-const galleryAttachmentData: APIMediaGalleryComponent = {
-	type: ComponentType.MediaGallery,
-	items: [
-		{
-			media: { url: 'attachment://file.png' },
-		},
-	],
-	id: 123,
-};
-
-describe('Media Gallery Components', () => {
-	describe('Assertion Tests', () => {
-		test('GIVEN an empty media gallery THEN throws error', () => {
-			const gallery = new MediaGalleryBuilder();
-			expect(() => gallery.toJSON()).toThrow();
-		});
-
-		test('GIVEN valid items THEN do not throw', () => {
-			expect(() => new MediaGalleryBuilder().addItems(new MediaGalleryItemBuilder())).not.toThrowError();
-			expect(() => new MediaGalleryBuilder().spliceItems(0, 0, new MediaGalleryItemBuilder())).not.toThrowError();
-			expect(() => new MediaGalleryBuilder().addItems([new MediaGalleryItemBuilder()])).not.toThrowError();
-			expect(() => new MediaGalleryBuilder().spliceItems(0, 0, [new MediaGalleryItemBuilder()])).not.toThrowError();
-		});
-
-		test('GIVEN valid JSON input THEN valid JSON output is given', () => {
-			const mediaGalleryData: APIMediaGalleryComponent = {
-				type: ComponentType.MediaGallery,
-				items: [
-					{
-						media: { url: 'attachment://file.png' },
-						description: 'test',
-						spoiler: false,
-					},
-					{
-						media: { url: 'https://discord.js.org/logo.jpg' },
-						spoiler: true,
-					},
-				],
-				id: 1_234,
-			};
-
-			expect(new MediaGalleryBuilder(mediaGalleryData).toJSON()).toEqual(mediaGalleryData);
-			expect(() => createComponentBuilder({ type: ComponentType.MediaGallery, items: [] })).not.toThrowError();
-		});
-
-		test('GIVEN valid builder options THEN valid JSON output is given', () => {
-			const galleryHttpsDisplay: APIMediaGalleryComponent = {
-				type: ComponentType.MediaGallery,
-				items: [
-					{
-						description: 'test',
-						spoiler: false,
-						media: { url: 'https://discord.com/logo.png' },
-					},
-				],
-			};
-
-			const galleryAttachmentData: APIMediaGalleryComponent = {
-				type: ComponentType.MediaGallery,
-				items: [
-					{
-						media: { url: 'attachment://file.png' },
-					},
-				],
-				id: 123,
-			};
-
-			expect(new MediaGalleryBuilder(galleryHttpsDisplay).toJSON()).toEqual(galleryHttpsDisplay);
-			expect(new MediaGalleryBuilder(galleryAttachmentData).toJSON()).toEqual(galleryAttachmentData);
-			expect(() => createComponentBuilder({ type: ComponentType.MediaGallery, items: [] })).not.toThrowError();
-		});
-
-		test('GIVEN valid builder options THEN valid JSON output is given 2', () => {
-			const item1 = new MediaGalleryItemBuilder()
-				.setDescription('test')
-				.setSpoiler(false)
-				.setURL('https://discord.com/logo.png');
-			const item2 = new MediaGalleryItemBuilder().setURL('attachment://file.png');
-
-			expect(new MediaGalleryBuilder().addItems(item1).toJSON()).toEqual(galleryHttpsDisplay);
-			expect(new MediaGalleryBuilder().addItems(item2).setId(123).toJSON()).toEqual(galleryAttachmentData);
-			expect(new MediaGalleryBuilder().addItems([item1]).toJSON()).toEqual(galleryHttpsDisplay);
-			expect(new MediaGalleryBuilder().addItems([item2]).setId(123).toJSON()).toEqual(galleryAttachmentData);
-		});
-
-		test('GIVEN valid JSON options THEN valid JSON output is given 2', () => {
-			const item1: APIMediaGalleryItem = {
-				description: 'test',
-				spoiler: false,
-				media: { url: 'https://discord.com/logo.png' },
-			};
-			const item2 = {
-				media: { url: 'attachment://file.png' },
-			};
-
-			expect(new MediaGalleryBuilder().addItems(item1).toJSON()).toEqual(galleryHttpsDisplay);
-			expect(new MediaGalleryBuilder().addItems(item2).setId(123).toJSON()).toEqual(galleryAttachmentData);
-			expect(new MediaGalleryBuilder().addItems([item1]).toJSON()).toEqual(galleryHttpsDisplay);
-			expect(new MediaGalleryBuilder().addItems([item2]).setId(123).toJSON()).toEqual(galleryAttachmentData);
-		});
-
-		test('GIVEN valid builder callback THEN valid JSON output is given', () => {
-			const item1 = new MediaGalleryItemBuilder()
-				.setDescription('test')
-				.setSpoiler(false)
-				.setURL('https://discord.com/logo.png');
-			const item2 = new MediaGalleryItemBuilder().setURL('attachment://file.png');
-
-			expect(
-				new MediaGalleryBuilder()
-					.addItems((item) => item.setDescription('test').setSpoiler(false).setURL('https://discord.com/logo.png'))
-					.toJSON(),
-			).toEqual(galleryHttpsDisplay);
-			expect(
-				new MediaGalleryBuilder()
-					.spliceItems(0, 0, (item) => item.setURL('attachment://file.png'))
-					.setId(123)
-					.toJSON(),
-			).toEqual(galleryAttachmentData);
-			expect(
-				new MediaGalleryBuilder()
-					.addItems([(item) => item.setDescription('test').setSpoiler(false).setURL('https://discord.com/logo.png')])
-					.toJSON(),
-			).toEqual(galleryHttpsDisplay);
-			expect(
-				new MediaGalleryBuilder()
-					.spliceItems(0, 0, [(item) => item.setDescription('test').clearDescription().setURL('attachment://file.png')])
-					.setId(123)
-					.toJSON(),
-			).toEqual(galleryAttachmentData);
-		});
-	});
-});

packages/builders/__tests__/components/v2/section.test.ts

@@ -1,191 +0,0 @@
-import { type APISectionComponent, ButtonStyle, ComponentType } from 'discord-api-types/v10';
-import { describe, test, expect } from 'vitest';
-import { createComponentBuilder } from '../../../src/components/Components.js';
-import { ButtonBuilder } from '../../../src/components/button/Button.js';
-import { SectionBuilder } from '../../../src/components/v2/Section.js';
-import { TextDisplayBuilder } from '../../../src/components/v2/TextDisplay.js';
-import { ThumbnailBuilder } from '../../../src/components/v2/Thumbnail.js';
-
-const sectionWithButtonData: APISectionComponent = {
-	type: ComponentType.Section,
-	components: [
-		{
-			type: ComponentType.TextDisplay,
-			content: 'test',
-		},
-	],
-	accessory: {
-		type: ComponentType.Button,
-		label: 'test',
-		custom_id: '123',
-		style: ButtonStyle.Primary,
-	},
-};
-
-const sectionWithThumbnailData: APISectionComponent = {
-	type: ComponentType.Section,
-	components: [
-		{
-			type: ComponentType.TextDisplay,
-			content: 'test',
-		},
-	],
-	accessory: {
-		type: ComponentType.Thumbnail,
-		media: { url: 'attachment://file.png' },
-		spoiler: true,
-		description: 'test',
-	},
-};
-
-describe('Section Components', () => {
-	describe('Assertion Tests', () => {
-		test('GIVEN valid components THEN do not throw', () => {
-			expect(() => new SectionBuilder().addTextDisplayComponents(new TextDisplayBuilder())).not.toThrowError();
-			expect(() => new SectionBuilder().spliceTextDisplayComponents(0, 0, new TextDisplayBuilder())).not.toThrowError();
-			expect(() => new SectionBuilder().addTextDisplayComponents([new TextDisplayBuilder()])).not.toThrowError();
-			expect(() =>
-				new SectionBuilder().spliceTextDisplayComponents(0, 0, [new TextDisplayBuilder()]),
-			).not.toThrowError();
-		});
-
-		test('GIVEN valid JSON input THEN valid JSON output is given', () => {
-			const sectionData: APISectionComponent = {
-				type: ComponentType.Section,
-				components: [
-					{
-						type: ComponentType.TextDisplay,
-						content: 'test',
-						id: 123,
-					},
-					{
-						type: ComponentType.TextDisplay,
-						content: 'test',
-					},
-					{
-						type: ComponentType.TextDisplay,
-						content: 'test',
-					},
-				],
-				accessory: {
-					type: ComponentType.Thumbnail,
-					media: { url: 'attachment://file.png' },
-				},
-			};
-
-			expect(new SectionBuilder(sectionData).toJSON()).toEqual(sectionData);
-			expect(() =>
-				createComponentBuilder({
-					type: ComponentType.Section,
-					components: [],
-					accessory: { type: ComponentType.Thumbnail, media: { url: 'https://discord.com/logo.png' } },
-				}),
-			).not.toThrowError();
-		});
-
-		test('GIVEN valid builder options THEN valid JSON output is given', () => {
-			const sectionWithButtonData: APISectionComponent = {
-				type: ComponentType.Section,
-				components: [
-					{
-						type: ComponentType.TextDisplay,
-						content: 'test',
-					},
-				],
-				accessory: {
-					type: ComponentType.Button,
-					label: 'test',
-					custom_id: '123',
-					style: ButtonStyle.Primary,
-				},
-			};
-
-			const sectionWithThumbnailData: APISectionComponent = {
-				type: ComponentType.Section,
-				components: [
-					{
-						type: ComponentType.TextDisplay,
-						content: 'test',
-					},
-				],
-				accessory: {
-					type: ComponentType.Thumbnail,
-					media: { url: 'attachment://file.png' },
-					spoiler: true,
-					description: 'test',
-				},
-			};
-
-			expect(new SectionBuilder(sectionWithButtonData).toJSON()).toEqual(sectionWithButtonData);
-			expect(new SectionBuilder(sectionWithThumbnailData).toJSON()).toEqual(sectionWithThumbnailData);
-			expect(() =>
-				createComponentBuilder({
-					type: ComponentType.Section,
-					components: [],
-					accessory: {
-						type: ComponentType.Button,
-						label: 'test',
-						custom_id: '123',
-						style: ButtonStyle.Primary,
-					},
-				}),
-			).not.toThrowError();
-		});
-
-		test('GIVEN valid builder options THEN valid JSON output is given 2', () => {
-			const button = new ButtonBuilder().setLabel('test').setStyle(ButtonStyle.Primary).setCustomId('123');
-			const thumbnail = new ThumbnailBuilder().setDescription('test').setSpoiler().setURL('attachment://file.png');
-			const textDisplay = new TextDisplayBuilder().setContent('test');
-
-			expect(new SectionBuilder().addTextDisplayComponents(textDisplay).setButtonAccessory(button).toJSON()).toEqual(
-				sectionWithButtonData,
-			);
-			expect(
-				new SectionBuilder().addTextDisplayComponents(textDisplay).setThumbnailAccessory(thumbnail).toJSON(),
-			).toEqual(sectionWithThumbnailData);
-			expect(
-				new SectionBuilder()
-					.addTextDisplayComponents([textDisplay])
-					.setButtonAccessory((button) => button.setLabel('test').setStyle(ButtonStyle.Primary).setCustomId('123'))
-					.toJSON(),
-			).toEqual(sectionWithButtonData);
-			expect(
-				new SectionBuilder()
-					.addTextDisplayComponents([textDisplay])
-					.setThumbnailAccessory((thumbnail) =>
-						thumbnail.setDescription('test').setSpoiler().setURL('attachment://file.png'),
-					)
-					.toJSON(),
-			).toEqual(sectionWithThumbnailData);
-		});
-
-		test('GIVEN valid builder callback THEN valid JSON output is given', () => {
-			const button = new ButtonBuilder().setLabel('test').setStyle(ButtonStyle.Primary).setCustomId('123');
-
-			expect(
-				new SectionBuilder()
-					.addTextDisplayComponents((textDisplay) => textDisplay.setContent('test'))
-					.setButtonAccessory(button)
-					.toJSON(),
-			).toEqual(sectionWithButtonData);
-			expect(
-				new SectionBuilder()
-					.spliceTextDisplayComponents(0, 0, (textDisplay) => textDisplay.setContent('test'))
-					.setButtonAccessory(button)
-					.toJSON(),
-			).toEqual(sectionWithButtonData);
-			expect(
-				new SectionBuilder()
-					.addTextDisplayComponents([(textDisplay) => textDisplay.setContent('test')])
-					.setButtonAccessory(button)
-					.toJSON(),
-			).toEqual(sectionWithButtonData);
-			expect(
-				new SectionBuilder()
-					.spliceTextDisplayComponents(0, 0, [(textDisplay) => textDisplay.setContent('test')])
-					.setButtonAccessory(button)
-					.toJSON(),
-			).toEqual(sectionWithButtonData);
-		});
-	});
-});

packages/builders/__tests__/components/v2/separator.test.ts

@@ -1,35 +0,0 @@
-import { ComponentType, SeparatorSpacingSize } from 'discord-api-types/v10';
-import { describe, expect, test } from 'vitest';
-import { SeparatorBuilder } from '../../../src/components/v2/Separator';
-
-describe('Separator', () => {
-	describe('Divider', () => {
-		test('GIVEN a separator with a pre-defined divider THEN return valid toJSON data', () => {
-			const separator = new SeparatorBuilder({ divider: true });
-			expect(separator.toJSON()).toEqual({ type: ComponentType.Separator, divider: true });
-		});
-
-		test('GIVEN a separator with a set divider THEN return valid toJSON data', () => {
-			const separator = new SeparatorBuilder().setDivider(false);
-			expect(separator.toJSON()).toEqual({ type: ComponentType.Separator, divider: false });
-		});
-	});
-
-	describe('Spacing', () => {
-		test('GIVEN a separator with a pre-defined spacing THEN return valid toJSON data', () => {
-			const separator = new SeparatorBuilder({ spacing: SeparatorSpacingSize.Small });
-			expect(separator.toJSON()).toEqual({ type: ComponentType.Separator, spacing: SeparatorSpacingSize.Small });
-		});
-
-		test('GIVEN a separator with a set spacing THEN return valid toJSON data', () => {
-			const separator = new SeparatorBuilder().setSpacing(SeparatorSpacingSize.Large);
-			expect(separator.toJSON()).toEqual({ type: ComponentType.Separator, spacing: SeparatorSpacingSize.Large });
-		});
-
-		test('GIVEN a separator with a set spacing THEN clear spacing THEN return valid toJSON data', () => {
-			const separator = new SeparatorBuilder({ spacing: SeparatorSpacingSize.Small });
-			separator.clearSpacing();
-			expect(separator.toJSON()).toEqual({ type: ComponentType.Separator });
-		});
-	});
-});

packages/builders/__tests__/components/v2/textDisplay.test.ts

@@ -1,23 +0,0 @@
-import { ComponentType } from 'discord-api-types/v10';
-import { describe, expect, test } from 'vitest';
-import { TextDisplayBuilder } from '../../../src/components/v2/TextDisplay';
-
-describe('TextDisplay', () => {
-	describe('TextDisplay content', () => {
-		test('GIVEN a text display with a pre-defined content THEN return valid toJSON data', () => {
-			const textDisplay = new TextDisplayBuilder({ content: 'foo' });
-			expect(textDisplay.toJSON()).toEqual({ type: ComponentType.TextDisplay, content: 'foo' });
-		});
-
-		test('GIVEN a text display with a set content THEN return valid toJSON data', () => {
-			const textDisplay = new TextDisplayBuilder().setContent('foo');
-			expect(textDisplay.toJSON()).toEqual({ type: ComponentType.TextDisplay, content: 'foo' });
-		});
-
-		test('GIVEN a text display with a pre-defined content THEN overwritten content THEN return valid toJSON data', () => {
-			const textDisplay = new TextDisplayBuilder({ content: 'foo' });
-			textDisplay.setContent('bar');
-			expect(textDisplay.toJSON()).toEqual({ type: ComponentType.TextDisplay, content: 'bar' });
-		});
-	});
-});

packages/builders/__tests__/components/v2/thumbnail.test.ts

@@ -1,69 +0,0 @@
-import { ComponentType } from 'discord-api-types/v10';
-import { describe, expect, test } from 'vitest';
-import { ThumbnailBuilder } from '../../../src/components/v2/Thumbnail';
-
-const dummy = {
-	type: ComponentType.Thumbnail as const,
-	media: { url: 'https://google.com' },
-};
-
-describe('Thumbnail', () => {
-	describe('Thumbnail url', () => {
-		test('GIVEN a thumbnail with a pre-defined url THEN return valid toJSON data', () => {
-			const thumbnail = new ThumbnailBuilder({ media: { url: 'https://google.com' } });
-			expect(thumbnail.toJSON()).toEqual({ type: ComponentType.Thumbnail, media: { url: 'https://google.com' } });
-		});
-
-		test('GIVEN a thumbnail with a set url THEN return valid toJSON data', () => {
-			const thumbnail = new ThumbnailBuilder().setURL('https://google.com');
-			expect(thumbnail.toJSON()).toEqual({ type: ComponentType.Thumbnail, media: { url: 'https://google.com' } });
-		});
-
-		test.each(['owo', 'discord://user'])('GIVEN a thumbnail with an invalid URL (%s) THEN throws error', (input) => {
-			const thumbnail = new ThumbnailBuilder();
-
-			expect(() => thumbnail.setURL(input)).toThrowError();
-		});
-	});
-
-	describe('Thumbnail description', () => {
-		test('GIVEN a thumbnail with a pre-defined description THEN return valid toJSON data', () => {
-			const thumbnail = new ThumbnailBuilder({ ...dummy, description: 'foo' });
-			expect(thumbnail.toJSON()).toEqual({ ...dummy, description: 'foo' });
-		});
-
-		test('GIVEN a thumbnail with a set description THEN return valid toJSON data', () => {
-			const thumbnail = new ThumbnailBuilder({ ...dummy });
-			thumbnail.setDescription('foo');
-
-			expect(thumbnail.toJSON()).toEqual({ ...dummy, description: 'foo' });
-		});
-
-		test('GIVEN a thumbnail with a pre-defined description THEN unset description THEN return valid toJSON data', () => {
-			const thumbnail = new ThumbnailBuilder({ description: 'foo', ...dummy });
-			thumbnail.clearDescription();
-
-			expect(thumbnail.toJSON()).toEqual({ ...dummy });
-		});
-
-		test('GIVEN a thumbnail with an invalid description THEN throws error', () => {
-			const thumbnail = new ThumbnailBuilder();
-
-			expect(() => thumbnail.setDescription('a'.repeat(1_025))).toThrowError();
-		});
-	});
-
-	describe('Thumbnail spoiler', () => {
-		test('GIVEN a thumbnail with a pre-defined spoiler status THEN return valid toJSON data', () => {
-			const thumbnail = new ThumbnailBuilder({ ...dummy, spoiler: true });
-			expect(thumbnail.toJSON()).toEqual({ ...dummy, spoiler: true });
-		});
-
-		test('GIVEN a thumbnail with a set spoiler status THEN return valid toJSON data', () => {
-			const thumbnail = new ThumbnailBuilder({ ...dummy });
-			thumbnail.setSpoiler(false);
-
-			expect(thumbnail.toJSON()).toEqual({ ...dummy, spoiler: false });
-		});
-	});
-});

packages/builders/__tests__/interactions/ContextMenuCommands.test.ts

@@ -16,8 +16,8 @@ describe('Context Menu Commands', () => {
 			// Too short of a name
 			expect(() => ContextMenuCommandAssertions.validateName('')).toThrowError();
 
-			// This should be fine, even with trailing and leading spaces (API trims it).
-			expect(() => ContextMenuCommandAssertions.validateName(' 🩵 ABC 123 $%^& ')).not.toThrowError();
+			// Invalid characters used
+			expect(() => ContextMenuCommandAssertions.validateName('ABC123$%^&')).toThrowError();
 
 			// Too long of a name
 			expect(() =>
@@ -60,6 +60,8 @@ describe('Context Menu Commands', () => {
 			});
 
 			test('GIVEN invalid name THEN throw error', () => {
+				expect(() => getBuilder().setName('$$$')).toThrowError();
+
 				expect(() => getBuilder().setName(' ')).toThrowError();
 			});
 
@@ -164,7 +166,7 @@ describe('Context Menu Commands', () => {
 		});
 
 		describe('integration types', () => {
-			test('GIVEN a builder with valid integraton types THEN does not throw an error', () => {
+			test('GIVEN a builder with valid integration types THEN does not throw an error', () => {
 				expect(() =>
 					getBuilder().setIntegrationTypes([
 						ApplicationIntegrationType.GuildInstall,

packages/builders/__tests__/messages/embed.test.ts

@@ -324,16 +324,12 @@ describe('Embed', () => {
 		test('GIVEN an embed using Embed#addFields THEN returns valid toJSON data', () => {
 			const embed = new EmbedBuilder();
 			embed.addFields({ name: 'foo', value: 'bar' });
-			embed.addFields([
-				{ name: 'foo', value: 'bar' },
-				{ name: '', value: '' },
-			]);
+			embed.addFields([{ name: 'foo', value: 'bar' }]);
 
 			expect(embed.toJSON()).toStrictEqual({
 				fields: [
 					{ name: 'foo', value: 'bar' },
 					{ name: 'foo', value: 'bar' },
-					{ name: '', value: '' },
 				],
 			});
 		});
@@ -385,24 +381,38 @@ describe('Embed', () => {
 			expect(() => embed.setFields(Array.from({ length: 26 }, () => ({ name: 'foo', value: 'bar' })))).toThrowError();
 		});
 
-		test('GIVEN invalid field amount THEN throws error', () => {
-			const embed = new EmbedBuilder();
+		describe('GIVEN invalid field amount THEN throws error', () => {
+			test('1', () => {
+				const embed = new EmbedBuilder();
 
-			expect(() =>
-				embed.addFields(...Array.from({ length: 26 }, () => ({ name: 'foo', value: 'bar' }))),
-			).toThrowError();
+				expect(() =>
+					embed.addFields(...Array.from({ length: 26 }, () => ({ name: 'foo', value: 'bar' }))),
+				).toThrowError();
+			});
 		});
 
-		test('GIVEN invalid field name length THEN throws error', () => {
-			const embed = new EmbedBuilder();
+		describe('GIVEN invalid field name THEN throws error', () => {
+			test('2', () => {
+				const embed = new EmbedBuilder();
 
-			expect(() => embed.addFields({ name: 'a'.repeat(257), value: 'bar' })).toThrowError();
+				expect(() => embed.addFields({ name: '', value: 'bar' })).toThrowError();
+			});
 		});
 
-		test('GIVEN invalid field value length THEN throws error', () => {
-			const embed = new EmbedBuilder();
+		describe('GIVEN invalid field name length THEN throws error', () => {
+			test('3', () => {
+				const embed = new EmbedBuilder();
 
-			expect(() => embed.addFields({ name: '', value: 'a'.repeat(1_025) })).toThrowError();
+				expect(() => embed.addFields({ name: 'a'.repeat(257), value: 'bar' })).toThrowError();
+			});
+		});
+
+		describe('GIVEN invalid field value length THEN throws error', () => {
+			test('4', () => {
+				const embed = new EmbedBuilder();
+
+				expect(() => embed.addFields({ name: '', value: 'a'.repeat(1_025) })).toThrowError();
+			});
 		});
 	});
 });

packages/builders/cliff.toml

@@ -30,8 +30,10 @@ body = """
 			{{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}]({{ self::remote_url() }}/commit/{{ commit.id }}))\
 			{% if commit.github.username %} by @{{ commit.github.username }}{%- endif %}\
 		{% if commit.breaking %}\
-			{% for breakingChange in commit.footers %}\
-				\n{% raw %}  {% endraw %}- **{{ breakingChange.token }}{{ breakingChange.separator }}** {{ breakingChange.value }}\
+			{% for footer in commit.footers %}\
+				{% if footer.breaking %}\
+					\n{% raw %}  {% endraw %}- **{{ footer.token }}{{ footer.separator }}** {{ footer.value }}\
+				{% endif %}\
 			{% endfor %}\
 		{% endif %}\
 	{% endfor %}

packages/builders/package.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package.json",
 	"name": "@discordjs/builders",
-	"version": "1.12.2",
+	"version": "1.9.0",
 	"description": "A set of builders that you can use when creating your bot",
 	"scripts": {
 		"test": "vitest run",
@@ -68,7 +68,7 @@
 		"@discordjs/formatters": "workspace:^",
 		"@discordjs/util": "workspace:^",
 		"@sapphire/shapeshift": "^4.0.0",
-		"discord-api-types": "^0.38.26",
+		"discord-api-types": "^0.37.114",
 		"fast-deep-equal": "^3.1.3",
 		"ts-mixer": "^6.0.4",
 		"tslib": "^2.6.3"
@@ -91,7 +91,7 @@
 		"vitest": "^2.0.5"
 	},
 	"engines": {
-		"node": ">=16.11.0"
+		"node": ">=18"
 	},
 	"publishConfig": {
 		"access": "public",

packages/builders/src/components/ActionRow.ts

@@ -3,9 +3,9 @@
 import {
 	type APIActionRowComponent,
 	ComponentType,
-	type APIComponentInMessageActionRow,
-	type APIComponentInModalActionRow,
-	type APIComponentInActionRow,
+	type APIMessageActionRowComponent,
+	type APIModalActionRowComponent,
+	type APIActionRowComponentTypes,
 } from 'discord-api-types/v10';
 import { normalizeArray, type RestOrArray } from '../util/normalizeArray.js';
 import { ComponentBuilder } from './Component.js';
@@ -18,6 +18,13 @@ import type { StringSelectMenuBuilder } from './selectMenu/StringSelectMenu.js';
 import type { UserSelectMenuBuilder } from './selectMenu/UserSelectMenu.js';
 import type { TextInputBuilder } from './textInput/TextInput.js';
 
+/**
+ * The builders that may be used for messages.
+ */
+export type MessageComponentBuilder =
+	| ActionRowBuilder<MessageActionRowComponentBuilder>
+	| MessageActionRowComponentBuilder;
+
 /**
  * The builders that may be used for modals.
  */
@@ -50,7 +57,7 @@ export type AnyComponentBuilder = MessageActionRowComponentBuilder | ModalAction
  * @typeParam ComponentType - The types of components this action row holds
  */
 export class ActionRowBuilder<ComponentType extends AnyComponentBuilder> extends ComponentBuilder<
-	APIActionRowComponent<APIComponentInMessageActionRow | APIComponentInModalActionRow>
+	APIActionRowComponent<APIMessageActionRowComponent | APIModalActionRowComponent>
 > {
 	/**
 	 * The components within this action row.
@@ -91,7 +98,7 @@ export class ActionRowBuilder<ComponentType extends AnyComponentBuilder> extends
 	 * 	.addComponents(button2, button3);
 	 * ```
 	 */
-	public constructor({ components, ...data }: Partial<APIActionRowComponent<APIComponentInActionRow>> = {}) {
+	public constructor({ components, ...data }: Partial<APIActionRowComponent<APIActionRowComponentTypes>> = {}) {
 		super({ type: ComponentType.ActionRow, ...data });
 		this.components = (components?.map((component) => createComponentBuilder(component)) ?? []) as ComponentType[];
 	}

packages/builders/src/components/Assertions.ts

@@ -3,13 +3,6 @@ import { ButtonStyle, ChannelType, type APIMessageComponentEmoji } from 'discord
 import { isValidationEnabled } from '../util/validation.js';
 import { StringSelectMenuOptionBuilder } from './selectMenu/StringSelectMenuOption.js';
 
-export const idValidator = s
-	.number()
-	.safeInt()
-	.greaterThanOrEqual(1)
-	.lessThan(4_294_967_296) // 2^32 - 1
-	.setValidationEnabled(isValidationEnabled);
-
 export const customIdValidator = s
 	.string()
 	.lengthGreaterThanOrEqual(1)

packages/builders/src/components/Component.ts

@@ -1,22 +1,15 @@
 import type { JSONEncodable } from '@discordjs/util';
 import type {
 	APIActionRowComponent,
-	APIComponentInActionRow,
+	APIActionRowComponentTypes,
 	APIBaseComponent,
 	ComponentType,
-	APIMessageComponent,
-	APIModalComponent,
 } from 'discord-api-types/v10';
-import { idValidator } from './Assertions';
 
 /**
  * Any action row component data represented as an object.
  */
-export type AnyAPIActionRowComponent =
-	| APIActionRowComponent<APIComponentInActionRow>
-	| APIComponentInActionRow
-	| APIMessageComponent
-	| APIModalComponent;
+export type AnyAPIActionRowComponent = APIActionRowComponent<APIActionRowComponentTypes> | APIActionRowComponentTypes;
 
 /**
  * The base component builder that contains common symbols for all sorts of components.
@@ -49,22 +42,4 @@ export abstract class ComponentBuilder<
 	public constructor(data: Partial<DataType>) {
 		this.data = data;
 	}
-
-	/**
-	 * Sets the id (not the custom id) for this component.
-	 *
-	 * @param id - The id for this component
-	 */
-	public setId(id: number) {
-		this.data.id = idValidator.parse(id);
-		return this;
-	}
-
-	/**
-	 * Clears the id of this component, defaulting to a default incremented id.
-	 */
-	public clearId() {
-		this.data.id = undefined;
-		return this;
-	}
 }

packages/builders/src/components/Components.ts

@@ -1,41 +1,18 @@
-import type { JSONEncodable } from '@discordjs/util';
 import { ComponentType, type APIMessageComponent, type APIModalComponent } from 'discord-api-types/v10';
 import {
 	ActionRowBuilder,
-	type MessageActionRowComponentBuilder,
 	type AnyComponentBuilder,
+	type MessageComponentBuilder,
 	type ModalComponentBuilder,
 } from './ActionRow.js';
 import { ComponentBuilder } from './Component.js';
 import { ButtonBuilder } from './button/Button.js';
-import { LabelBuilder } from './label/Label.js';
 import { ChannelSelectMenuBuilder } from './selectMenu/ChannelSelectMenu.js';
 import { MentionableSelectMenuBuilder } from './selectMenu/MentionableSelectMenu.js';
 import { RoleSelectMenuBuilder } from './selectMenu/RoleSelectMenu.js';
 import { StringSelectMenuBuilder } from './selectMenu/StringSelectMenu.js';
 import { UserSelectMenuBuilder } from './selectMenu/UserSelectMenu.js';
 import { TextInputBuilder } from './textInput/TextInput.js';
-import { ContainerBuilder } from './v2/Container.js';
-import { FileBuilder } from './v2/File.js';
-import { MediaGalleryBuilder } from './v2/MediaGallery.js';
-import { SectionBuilder } from './v2/Section.js';
-import { SeparatorBuilder } from './v2/Separator.js';
-import { TextDisplayBuilder } from './v2/TextDisplay.js';
-import { ThumbnailBuilder } from './v2/Thumbnail.js';
-
-/**
- * The builders that may be used for messages.
- */
-export type MessageComponentBuilder =
-	| ActionRowBuilder<MessageActionRowComponentBuilder>
-	| ContainerBuilder
-	| FileBuilder
-	| MediaGalleryBuilder
-	| MessageActionRowComponentBuilder
-	| SectionBuilder
-	| SeparatorBuilder
-	| TextDisplayBuilder
-	| ThumbnailBuilder;
 
 /**
  * Components here are mapped to their respective builder.
@@ -73,38 +50,6 @@ export interface MappedComponentTypes {
 	 * The channel select component type is associated with a {@link ChannelSelectMenuBuilder}.
 	 */
 	[ComponentType.ChannelSelect]: ChannelSelectMenuBuilder;
-	/**
-	 * The file component type is associated with a {@link FileBuilder}.
-	 */
-	[ComponentType.File]: FileBuilder;
-	/**
-	 * The separator component type is associated with a {@link SeparatorBuilder}.
-	 */
-	[ComponentType.Separator]: SeparatorBuilder;
-	/**
-	 * The container component type is associated with a {@link ContainerBuilder}.
-	 */
-	[ComponentType.Container]: ContainerBuilder;
-	/**
-	 * The text display component type is associated with a {@link TextDisplayBuilder}.
-	 */
-	[ComponentType.TextDisplay]: TextDisplayBuilder;
-	/**
-	 * The thumbnail component type is associated with a {@link ThumbnailBuilder}.
-	 */
-	[ComponentType.Thumbnail]: ThumbnailBuilder;
-	/**
-	 * The section component type is associated with a {@link SectionBuilder}.
-	 */
-	[ComponentType.Section]: SectionBuilder;
-	/**
-	 * The media gallery component type is associated with a {@link MediaGalleryBuilder}.
-	 */
-	[ComponentType.MediaGallery]: MediaGalleryBuilder;
-	/**
-	 * The label component type is associated with a {@link LabelBuilder}.
-	 */
-	[ComponentType.Label]: LabelBuilder;
 }
 
 /**
@@ -152,46 +97,8 @@ export function createComponentBuilder(
 			return new MentionableSelectMenuBuilder(data);
 		case ComponentType.ChannelSelect:
 			return new ChannelSelectMenuBuilder(data);
-		case ComponentType.File:
-			return new FileBuilder(data);
-		case ComponentType.Container:
-			return new ContainerBuilder(data);
-		case ComponentType.Section:
-			return new SectionBuilder(data);
-		case ComponentType.Separator:
-			return new SeparatorBuilder(data);
-		case ComponentType.TextDisplay:
-			return new TextDisplayBuilder(data);
-		case ComponentType.Thumbnail:
-			return new ThumbnailBuilder(data);
-		case ComponentType.MediaGallery:
-			return new MediaGalleryBuilder(data);
-		case ComponentType.Label:
-			return new LabelBuilder(data);
 		default:
 			// @ts-expect-error This case can still occur if we get a newer unsupported component type
 			throw new Error(`Cannot properly serialize component type: ${data.type}`);
 	}
 }
-
-function isBuilder<Builder extends JSONEncodable<any>>(
-	builder: unknown,
-	Constructor: new () => Builder,
-): builder is Builder {
-	return builder instanceof Constructor;
-}
-
-export function resolveBuilder<ComponentType extends Record<PropertyKey, any>, Builder extends JSONEncodable<any>>(
-	builder: Builder | ComponentType | ((builder: Builder) => Builder),
-	Constructor: new (data?: ComponentType) => Builder,
-) {
-	if (isBuilder(builder, Constructor)) {
-		return builder;
-	}
-
-	if (typeof builder === 'function') {
-		return builder(new Constructor());
-	}
-
-	return new Constructor(builder);
-}

packages/builders/src/components/label/Assertions.ts

@@ -1,29 +0,0 @@
-import { s } from '@sapphire/shapeshift';
-import { ComponentType } from 'discord-api-types/v10';
-import { isValidationEnabled } from '../../util/validation.js';
-import { idValidator } from '../Assertions.js';
-import {
-	selectMenuChannelPredicate,
-	selectMenuMentionablePredicate,
-	selectMenuRolePredicate,
-	selectMenuStringPredicate,
-	selectMenuUserPredicate,
-} from '../selectMenu/Assertions.js';
-import { textInputPredicate } from '../textInput/Assertions.js';
-
-export const labelPredicate = s
-	.object({
-		id: idValidator.optional(),
-		type: s.literal(ComponentType.Label),
-		label: s.string().lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(45),
-		description: s.string().lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(100).optional(),
-		component: s.union([
-			textInputPredicate,
-			selectMenuUserPredicate,
-			selectMenuRolePredicate,
-			selectMenuMentionablePredicate,
-			selectMenuChannelPredicate,
-			selectMenuStringPredicate,
-		]),
-	})
-	.setValidationEnabled(isValidationEnabled);

packages/builders/src/components/label/Label.ts

@@ -1,198 +0,0 @@
-import type {
-	APIChannelSelectComponent,
-	APILabelComponent,
-	APIMentionableSelectComponent,
-	APIRoleSelectComponent,
-	APIStringSelectComponent,
-	APITextInputComponent,
-	APIUserSelectComponent,
-} from 'discord-api-types/v10';
-import { ComponentType } from 'discord-api-types/v10';
-import { ComponentBuilder } from '../Component.js';
-import { createComponentBuilder, resolveBuilder } from '../Components.js';
-import { ChannelSelectMenuBuilder } from '../selectMenu/ChannelSelectMenu.js';
-import { MentionableSelectMenuBuilder } from '../selectMenu/MentionableSelectMenu.js';
-import { RoleSelectMenuBuilder } from '../selectMenu/RoleSelectMenu.js';
-import { StringSelectMenuBuilder } from '../selectMenu/StringSelectMenu.js';
-import { UserSelectMenuBuilder } from '../selectMenu/UserSelectMenu.js';
-import { TextInputBuilder } from '../textInput/TextInput.js';
-import { labelPredicate } from './Assertions.js';
-
-export interface LabelBuilderData extends Partial<Omit<APILabelComponent, 'component'>> {
-	component?:
-		| ChannelSelectMenuBuilder
-		| MentionableSelectMenuBuilder
-		| RoleSelectMenuBuilder
-		| StringSelectMenuBuilder
-		| TextInputBuilder
-		| UserSelectMenuBuilder;
-}
-
-/**
- * A builder that creates API-compatible JSON data for labels.
- */
-export class LabelBuilder extends ComponentBuilder<LabelBuilderData> {
-	/**
-	 * @internal
-	 */
-	public override readonly data: LabelBuilderData;
-
-	/**
-	 * Creates a new label.
-	 *
-	 * @param data - The API data to create this label with
-	 * @example
-	 * Creating a label from an API data object:
-	 * ```ts
-	 * const label = new LabelBuilder({
-	 * 	label: "label",
-	 * 	component,
-	 * });
-	 * ```
-	 * @example
-	 * Creating a label using setters and API data:
-	 * ```ts
-	 * const label = new LabelBuilder({
-	 * 	label: 'label',
-	 * 	component,
-	 * }).setLabel('new text');
-	 * ```
-	 */
-	public constructor(data: Partial<APILabelComponent> = {}) {
-		super({ type: ComponentType.Label });
-
-		const { component, ...rest } = data;
-
-		this.data = {
-			...rest,
-			component: component ? createComponentBuilder(component) : undefined,
-			type: ComponentType.Label,
-		};
-	}
-
-	/**
-	 * Sets the label for this label.
-	 *
-	 * @param label - The label to use
-	 */
-	public setLabel(label: string) {
-		this.data.label = label;
-		return this;
-	}
-
-	/**
-	 * Sets the description for this label.
-	 *
-	 * @param description - The description to use
-	 */
-	public setDescription(description: string) {
-		this.data.description = description;
-		return this;
-	}
-
-	/**
-	 * Clears the description for this label.
-	 */
-	public clearDescription() {
-		this.data.description = undefined;
-		return this;
-	}
-
-	/**
-	 * Sets a string select menu component to this label.
-	 *
-	 * @param input - A function that returns a component builder or an already built builder
-	 */
-	public setStringSelectMenuComponent(
-		input:
-			| APIStringSelectComponent
-			| StringSelectMenuBuilder
-			| ((builder: StringSelectMenuBuilder) => StringSelectMenuBuilder),
-	): this {
-		this.data.component = resolveBuilder(input, StringSelectMenuBuilder);
-		return this;
-	}
-
-	/**
-	 * Sets a user select menu component to this label.
-	 *
-	 * @param input - A function that returns a component builder or an already built builder
-	 */
-	public setUserSelectMenuComponent(
-		input: APIUserSelectComponent | UserSelectMenuBuilder | ((builder: UserSelectMenuBuilder) => UserSelectMenuBuilder),
-	): this {
-		this.data.component = resolveBuilder(input, UserSelectMenuBuilder);
-		return this;
-	}
-
-	/**
-	 * Sets a role select menu component to this label.
-	 *
-	 * @param input - A function that returns a component builder or an already built builder
-	 */
-	public setRoleSelectMenuComponent(
-		input: APIRoleSelectComponent | RoleSelectMenuBuilder | ((builder: RoleSelectMenuBuilder) => RoleSelectMenuBuilder),
-	): this {
-		this.data.component = resolveBuilder(input, RoleSelectMenuBuilder);
-		return this;
-	}
-
-	/**
-	 * Sets a mentionable select menu component to this label.
-	 *
-	 * @param input - A function that returns a component builder or an already built builder
-	 */
-	public setMentionableSelectMenuComponent(
-		input:
-			| APIMentionableSelectComponent
-			| MentionableSelectMenuBuilder
-			| ((builder: MentionableSelectMenuBuilder) => MentionableSelectMenuBuilder),
-	): this {
-		this.data.component = resolveBuilder(input, MentionableSelectMenuBuilder);
-		return this;
-	}
-
-	/**
-	 * Sets a channel select menu component to this label.
-	 *
-	 * @param input - A function that returns a component builder or an already built builder
-	 */
-	public setChannelSelectMenuComponent(
-		input:
-			| APIChannelSelectComponent
-			| ChannelSelectMenuBuilder
-			| ((builder: ChannelSelectMenuBuilder) => ChannelSelectMenuBuilder),
-	): this {
-		this.data.component = resolveBuilder(input, ChannelSelectMenuBuilder);
-		return this;
-	}
-
-	/**
-	 * Sets a text input component to this label.
-	 *
-	 * @param input - A function that returns a component builder or an already built builder
-	 */
-	public setTextInputComponent(
-		input: APITextInputComponent | TextInputBuilder | ((builder: TextInputBuilder) => TextInputBuilder),
-	): this {
-		this.data.component = resolveBuilder(input, TextInputBuilder);
-		return this;
-	}
-
-	/**
-	 * {@inheritDoc ComponentBuilder.toJSON}
-	 */
-	public override toJSON(): APILabelComponent {
-		const { component, ...rest } = this.data;
-
-		const data = {
-			...rest,
-			// The label predicate validates the component.
-			component: component?.toJSON(),
-		};
-
-		labelPredicate.parse(data);
-
-		return data as APILabelComponent;
-	}
-}

packages/builders/src/components/selectMenu/Assertions.ts

@@ -1,92 +0,0 @@
-import { Result, s } from '@sapphire/shapeshift';
-import { ChannelType, ComponentType, SelectMenuDefaultValueType } from 'discord-api-types/v10';
-import { isValidationEnabled } from '../../util/validation.js';
-import { customIdValidator, emojiValidator, idValidator } from '../Assertions.js';
-import { labelValidator } from '../textInput/Assertions.js';
-
-const selectMenuBasePredicate = s.object({
-	id: idValidator.optional(),
-	placeholder: s.string().lengthLessThanOrEqual(150).optional(),
-	min_values: s.number().greaterThanOrEqual(0).lessThanOrEqual(25).optional(),
-	max_values: s.number().greaterThanOrEqual(0).lessThanOrEqual(25).optional(),
-	custom_id: customIdValidator,
-	disabled: s.boolean().optional(),
-});
-
-export const selectMenuChannelPredicate = selectMenuBasePredicate
-	.extend({
-		type: s.literal(ComponentType.ChannelSelect),
-		channel_types: s.nativeEnum(ChannelType).array().optional(),
-		default_values: s
-			.object({ id: s.string(), type: s.literal(SelectMenuDefaultValueType.Channel) })
-			.array()
-			.lengthLessThanOrEqual(25)
-			.optional(),
-	})
-	.setValidationEnabled(isValidationEnabled);
-
-export const selectMenuMentionablePredicate = selectMenuBasePredicate
-	.extend({
-		type: s.literal(ComponentType.MentionableSelect),
-		default_values: s
-			.object({
-				id: s.string(),
-				type: s.union([s.literal(SelectMenuDefaultValueType.Role), s.literal(SelectMenuDefaultValueType.User)]),
-			})
-			.array()
-			.lengthLessThanOrEqual(25)
-			.optional(),
-	})
-	.setValidationEnabled(isValidationEnabled);
-
-export const selectMenuRolePredicate = selectMenuBasePredicate
-	.extend({
-		type: s.literal(ComponentType.RoleSelect),
-		default_values: s
-			.object({ id: s.string(), type: s.literal(SelectMenuDefaultValueType.Role) })
-			.array()
-			.lengthLessThanOrEqual(25)
-			.optional(),
-	})
-	.setValidationEnabled(isValidationEnabled);
-
-export const selectMenuUserPredicate = selectMenuBasePredicate
-	.extend({
-		type: s.literal(ComponentType.UserSelect),
-		default_values: s
-			.object({ id: s.string(), type: s.literal(SelectMenuDefaultValueType.User) })
-			.array()
-			.lengthLessThanOrEqual(25)
-			.optional(),
-	})
-	.setValidationEnabled(isValidationEnabled);
-
-export const selectMenuStringOptionPredicate = s
-	.object({
-		label: labelValidator,
-		value: s.string().lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(100),
-		description: s.string().lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(100).optional(),
-		emoji: emojiValidator.optional(),
-		default: s.boolean().optional(),
-	})
-	.setValidationEnabled(isValidationEnabled);
-
-export const selectMenuStringPredicate = selectMenuBasePredicate
-	.extend({
-		type: s.literal(ComponentType.StringSelect),
-		options: selectMenuStringOptionPredicate.array().lengthGreaterThanOrEqual(1).lengthLessThanOrEqual(25),
-	})
-	.reshape((value) => {
-		if (value.min_values !== undefined && value.options.length < value.min_values) {
-			return Result.err(new RangeError(`The number of options must be greater than or equal to min_values`));
-		}
-
-		if (value.min_values !== undefined && value.max_values !== undefined && value.min_values > value.max_values) {
-			return Result.err(
-				new RangeError(`The maximum amount of options must be greater than or equal to the minimum amount of options`),
-			);
-		}
-
-		return Result.ok(value);
-	})
-	.setValidationEnabled(isValidationEnabled);

packages/builders/src/components/selectMenu/BaseSelectMenu.ts

@@ -1,7 +1,6 @@
 import type { APISelectMenuComponent } from 'discord-api-types/v10';
 import { customIdValidator, disabledValidator, minMaxValidator, placeholderValidator } from '../Assertions.js';
 import { ComponentBuilder } from '../Component.js';
-import { requiredValidator } from '../textInput/Assertions.js';
 
 /**
  * The base select menu builder that contains common symbols for select menu builders.
@@ -61,17 +60,6 @@ export abstract class BaseSelectMenuBuilder<
 		return this;
 	}
 
-	/**
-	 * Sets whether this select menu is required.
-	 *
-	 * @remarks Only for use in modals.
-	 * @param required - Whether this select menu is required
-	 */
-	public setRequired(required = true) {
-		this.data.required = requiredValidator.parse(required);
-		return this;
-	}
-
 	/**
 	 * {@inheritDoc ComponentBuilder.toJSON}
 	 */

packages/builders/src/components/textInput/Assertions.ts

@@ -1,9 +1,9 @@
 import { s } from '@sapphire/shapeshift';
-import { ComponentType, TextInputStyle } from 'discord-api-types/v10';
+import { TextInputStyle } from 'discord-api-types/v10';
 import { isValidationEnabled } from '../../util/validation.js';
-import { customIdValidator, idValidator } from '../Assertions.js';
+import { customIdValidator } from '../Assertions.js';
 
-export const textInputStyleValidator = s.nativeEnum(TextInputStyle).setValidationEnabled(isValidationEnabled);
+export const textInputStyleValidator = s.nativeEnum(TextInputStyle);
 export const minLengthValidator = s
 	.number()
 	.int()
@@ -16,7 +16,7 @@ export const maxLengthValidator = s
 	.greaterThanOrEqual(1)
 	.lessThanOrEqual(4_000)
 	.setValidationEnabled(isValidationEnabled);
-export const requiredValidator = s.boolean().setValidationEnabled(isValidationEnabled);
+export const requiredValidator = s.boolean();
 export const valueValidator = s.string().lengthLessThanOrEqual(4_000).setValidationEnabled(isValidationEnabled);
 export const placeholderValidator = s.string().lengthLessThanOrEqual(100).setValidationEnabled(isValidationEnabled);
 export const labelValidator = s
@@ -25,21 +25,8 @@ export const labelValidator = s
 	.lengthLessThanOrEqual(45)
 	.setValidationEnabled(isValidationEnabled);
 
-export const textInputPredicate = s
-	.object({
-		type: s.literal(ComponentType.TextInput),
-		custom_id: customIdValidator,
-		style: textInputStyleValidator,
-		id: idValidator.optional(),
-		min_length: minLengthValidator.optional(),
-		max_length: maxLengthValidator.optional(),
-		placeholder: placeholderValidator.optional(),
-		value: valueValidator.optional(),
-		required: requiredValidator.optional(),
-	})
-	.setValidationEnabled(isValidationEnabled);
-
-export function validateRequiredParameters(customId?: string, style?: TextInputStyle) {
+export function validateRequiredParameters(customId?: string, style?: TextInputStyle, label?: string) {
 	customIdValidator.parse(customId);
 	textInputStyleValidator.parse(style);
+	labelValidator.parse(label);
 }

packages/builders/src/components/textInput/TextInput.ts

@@ -30,7 +30,7 @@ export class TextInputBuilder
 	 * ```ts
 	 * const textInput = new TextInputBuilder({
 	 * 	custom_id: 'a cool text input',
-	 * 	placeholder: 'Type something',
+	 * 	label: 'Type something',
 	 * 	style: TextInputStyle.Short,
 	 * });
 	 * ```
@@ -38,7 +38,7 @@ export class TextInputBuilder
 	 * Creating a text input using setters and API data:
 	 * ```ts
 	 * const textInput = new TextInputBuilder({
-	 * 	placeholder: 'Type something else',
+	 * 	label: 'Type something else',
 	 * })
 	 * 	.setCustomId('woah')
 	 * 	.setStyle(TextInputStyle.Paragraph);
@@ -62,7 +62,6 @@ export class TextInputBuilder
 	 * Sets the label for this text input.
 	 *
 	 * @param label - The label to use
-	 * @deprecated Use a label builder to create a label (and optionally a description) instead.
 	 */
 	public setLabel(label: string) {
 		this.data.label = labelValidator.parse(label);
@@ -133,7 +132,7 @@ export class TextInputBuilder
 	 * {@inheritDoc ComponentBuilder.toJSON}
 	 */
 	public toJSON(): APITextInputComponent {
-		validateRequiredParameters(this.data.custom_id, this.data.style);
+		validateRequiredParameters(this.data.custom_id, this.data.style, this.data.label);
 
 		return {
 			...this.data,

packages/builders/src/components/v2/Assertions.ts

@@ -1,72 +0,0 @@
-import { s } from '@sapphire/shapeshift';
-import { SeparatorSpacingSize } from 'discord-api-types/v10';
-import { colorPredicate } from '../../messages/embed/Assertions';
-import { isValidationEnabled } from '../../util/validation';
-import { ComponentBuilder } from '../Component';
-import { ButtonBuilder } from '../button/Button';
-import type { ContainerComponentBuilder } from './Container';
-import type { MediaGalleryItemBuilder } from './MediaGalleryItem';
-import type { TextDisplayBuilder } from './TextDisplay';
-import { ThumbnailBuilder } from './Thumbnail';
-
-export const unfurledMediaItemPredicate = s
-	.object({
-		url: s
-			.string()
-			.url(
-				{ allowedProtocols: ['http:', 'https:', 'attachment:'] },
-				{ message: 'Invalid protocol for media URL. Must be http:, https:, or attachment:' },
-			),
-	})
-	.setValidationEnabled(isValidationEnabled);
-
-export const descriptionPredicate = s
-	.string()
-	.lengthGreaterThanOrEqual(1)
-	.lengthLessThanOrEqual(1_024)
-	.setValidationEnabled(isValidationEnabled);
-
-export const filePredicate = s
-	.object({
-		url: s
-			.string()
-			.url({ allowedProtocols: ['attachment:'] }, { message: 'Invalid protocol for file URL. Must be attachment:' }),
-	})
-	.setValidationEnabled(isValidationEnabled);
-
-export const spoilerPredicate = s.boolean();
-
-export const dividerPredicate = s.boolean();
-
-export const spacingPredicate = s.nativeEnum(SeparatorSpacingSize);
-
-export const textDisplayContentPredicate = s
-	.string()
-	.lengthGreaterThanOrEqual(1)
-	.lengthLessThanOrEqual(4_000)
-	.setValidationEnabled(isValidationEnabled);
-
-export const accessoryPredicate = s
-	.instance(ButtonBuilder)
-	.or(s.instance(ThumbnailBuilder))
-	.setValidationEnabled(isValidationEnabled);
-
-export const containerColorPredicate = colorPredicate.nullish();
-
-export function assertReturnOfBuilder<ReturnType extends MediaGalleryItemBuilder | TextDisplayBuilder>(
-	input: unknown,
-	ExpectedInstanceOf: new () => ReturnType,
-): asserts input is ReturnType {
-	s.instance(ExpectedInstanceOf).setValidationEnabled(isValidationEnabled).parse(input);
-}
-
-export function validateComponentArray<
-	ReturnType extends ContainerComponentBuilder | MediaGalleryItemBuilder = ContainerComponentBuilder,
->(input: unknown, min: number, max: number, ExpectedInstanceOf?: new () => ReturnType): asserts input is ReturnType[] {
-	(ExpectedInstanceOf ? s.instance(ExpectedInstanceOf) : s.instance(ComponentBuilder))
-		.array()
-		.lengthGreaterThanOrEqual(min)
-		.lengthLessThanOrEqual(max)
-		.setValidationEnabled(isValidationEnabled)
-		.parse(input);
-}

packages/builders/src/components/v2/Container.ts

@@ -1,239 +0,0 @@
-/* eslint-disable jsdoc/check-param-names */
-
-import type {
-	APIActionRowComponent,
-	APIComponentInContainer,
-	APIComponentInMessageActionRow,
-	APIContainerComponent,
-	APIFileComponent,
-	APIMediaGalleryComponent,
-	APISectionComponent,
-	APISeparatorComponent,
-	APITextDisplayComponent,
-} from 'discord-api-types/v10';
-import { ComponentType } from 'discord-api-types/v10';
-import type { RGBTuple } from '../../index.js';
-import { MediaGalleryBuilder, SectionBuilder } from '../../index.js';
-import { normalizeArray, type RestOrArray } from '../../util/normalizeArray.js';
-import type { AnyComponentBuilder, MessageActionRowComponentBuilder } from '../ActionRow.js';
-import { ActionRowBuilder } from '../ActionRow.js';
-import { ComponentBuilder } from '../Component.js';
-import { createComponentBuilder, resolveBuilder } from '../Components.js';
-import { containerColorPredicate, spoilerPredicate } from './Assertions.js';
-import { FileBuilder } from './File.js';
-import { SeparatorBuilder } from './Separator.js';
-import { TextDisplayBuilder } from './TextDisplay.js';
-
-/**
- * The builders that may be used within a container.
- */
-export type ContainerComponentBuilder =
-	| ActionRowBuilder<AnyComponentBuilder>
-	| FileBuilder
-	| MediaGalleryBuilder
-	| SectionBuilder
-	| SeparatorBuilder
-	| TextDisplayBuilder;
-
-/**
- * A builder that creates API-compatible JSON data for a container.
- */
-export class ContainerBuilder extends ComponentBuilder<APIContainerComponent> {
-	/**
-	 * The components within this container.
-	 */
-	public readonly components: ContainerComponentBuilder[];
-
-	/**
-	 * Creates a new container from API data.
-	 *
-	 * @param data - The API data to create this container with
-	 * @example
-	 * Creating a container from an API data object:
-	 * ```ts
-	 * const container = new ContainerBuilder({
-	 * 	components: [
-	 * 		{
-	 * 			content: "Some text here",
-	 * 			type: ComponentType.TextDisplay,
-	 * 		},
-	 * 	],
-	 * });
-	 * ```
-	 * @example
-	 * Creating a container using setters and API data:
-	 * ```ts
-	 * const container = new ContainerBuilder({
-	 * 	components: [
-	 * 		{
-	 * 			content: "# Heading",
-	 * 			type: ComponentType.TextDisplay,
-	 * 		},
-	 * 	],
-	 * })
-	 * 	.addComponents(separator, section);
-	 * ```
-	 */
-	public constructor({ components, ...data }: Partial<APIContainerComponent> = {}) {
-		super({ type: ComponentType.Container, ...data });
-		this.components = (components?.map((component) => createComponentBuilder(component)) ??
-			[]) as ContainerComponentBuilder[];
-	}
-
-	/**
-	 * Sets the accent color of this container.
-	 *
-	 * @param color - The color to use
-	 */
-	public setAccentColor(color?: RGBTuple | number): this {
-		// Data assertions
-		containerColorPredicate.parse(color);
-
-		if (Array.isArray(color)) {
-			const [red, green, blue] = color;
-			this.data.accent_color = (red << 16) + (green << 8) + blue;
-			return this;
-		}
-
-		this.data.accent_color = color;
-		return this;
-	}
-
-	/**
-	 * Clears the accent color of this container.
-	 */
-	public clearAccentColor() {
-		this.data.accent_color = undefined;
-		return this;
-	}
-
-	/**
-	 * Adds action row components to this container.
-	 *
-	 * @param components - The action row components to add
-	 */
-	public addActionRowComponents<ComponentType extends MessageActionRowComponentBuilder>(
-		...components: RestOrArray<
-			| ActionRowBuilder<ComponentType>
-			| APIActionRowComponent<APIComponentInMessageActionRow>
-			| ((builder: ActionRowBuilder<ComponentType>) => ActionRowBuilder<ComponentType>)
-		>
-	) {
-		this.components.push(
-			...normalizeArray(components).map((component) => resolveBuilder(component, ActionRowBuilder<ComponentType>)),
-		);
-		return this;
-	}
-
-	/**
-	 * Adds file components to this container.
-	 *
-	 * @param components - The file components to add
-	 */
-	public addFileComponents(
-		...components: RestOrArray<APIFileComponent | FileBuilder | ((builder: FileBuilder) => FileBuilder)>
-	) {
-		this.components.push(...normalizeArray(components).map((component) => resolveBuilder(component, FileBuilder)));
-		return this;
-	}
-
-	/**
-	 * Adds media gallery components to this container.
-	 *
-	 * @param components - The media gallery components to add
-	 */
-	public addMediaGalleryComponents(
-		...components: RestOrArray<
-			APIMediaGalleryComponent | MediaGalleryBuilder | ((builder: MediaGalleryBuilder) => MediaGalleryBuilder)
-		>
-	) {
-		this.components.push(
-			...normalizeArray(components).map((component) => resolveBuilder(component, MediaGalleryBuilder)),
-		);
-		return this;
-	}
-
-	/**
-	 * Adds section components to this container.
-	 *
-	 * @param components - The section components to add
-	 */
-	public addSectionComponents(
-		...components: RestOrArray<APISectionComponent | SectionBuilder | ((builder: SectionBuilder) => SectionBuilder)>
-	) {
-		this.components.push(...normalizeArray(components).map((component) => resolveBuilder(component, SectionBuilder)));
-		return this;
-	}
-
-	/**
-	 * Adds separator components to this container.
-	 *
-	 * @param components - The separator components to add
-	 */
-	public addSeparatorComponents(
-		...components: RestOrArray<
-			APISeparatorComponent | SeparatorBuilder | ((builder: SeparatorBuilder) => SeparatorBuilder)
-		>
-	) {
-		this.components.push(...normalizeArray(components).map((component) => resolveBuilder(component, SeparatorBuilder)));
-		return this;
-	}
-
-	/**
-	 * Adds text display components to this container.
-	 *
-	 * @param components - The text display components to add
-	 */
-	public addTextDisplayComponents(
-		...components: RestOrArray<
-			APITextDisplayComponent | TextDisplayBuilder | ((builder: TextDisplayBuilder) => TextDisplayBuilder)
-		>
-	) {
-		this.components.push(
-			...normalizeArray(components).map((component) => resolveBuilder(component, TextDisplayBuilder)),
-		);
-		return this;
-	}
-
-	/**
-	 * Removes, replaces, or inserts components for this container.
-	 *
-	 * @param index - The index to start removing, replacing or inserting components
-	 * @param deleteCount - The amount of components to remove
-	 * @param components - The components to set
-	 */
-	public spliceComponents(
-		index: number,
-		deleteCount: number,
-		...components: RestOrArray<APIComponentInContainer | ContainerComponentBuilder>
-	) {
-		this.components.splice(
-			index,
-			deleteCount,
-			...normalizeArray(components).map((component) =>
-				component instanceof ComponentBuilder ? component : createComponentBuilder(component),
-			),
-		);
-		return this;
-	}
-
-	/**
-	 * Sets the spoiler status of this container.
-	 *
-	 * @param spoiler - The spoiler status to use
-	 */
-	public setSpoiler(spoiler = true) {
-		this.data.spoiler = spoilerPredicate.parse(spoiler);
-		return this;
-	}
-
-	/**
-	 * {@inheritDoc ComponentBuilder.toJSON}
-	 */
-	public toJSON(): APIContainerComponent {
-		return {
-			...this.data,
-			components: this.components.map((component) => component.toJSON()),
-		} as APIContainerComponent;
-	}
-}

packages/builders/src/components/v2/File.ts

@@ -1,63 +0,0 @@
-import { ComponentType, type APIFileComponent } from 'discord-api-types/v10';
-import { ComponentBuilder } from '../Component';
-import { filePredicate, spoilerPredicate } from './Assertions';
-
-export class FileBuilder extends ComponentBuilder<APIFileComponent> {
-	/**
-	 * Creates a new file from API data.
-	 *
-	 * @param data - The API data to create this file with
-	 * @example
-	 * Creating a file from an API data object:
-	 * ```ts
-	 * const file = new FileBuilder({
-	 * 	spoiler: true,
-	 * 	file: {
-	 * 		url: 'attachment://file.png',
-	 * 	},
-	 * });
-	 * ```
-	 * @example
-	 * Creating a file using setters and API data:
-	 * ```ts
-	 * const file = new FileBuilder({
-	 * 	file: {
-	 * 		url: 'attachment://image.jpg',
-	 * 	},
-	 * })
-	 * 	.setSpoiler(false);
-	 * ```
-	 */
-	public constructor(data: Partial<APIFileComponent> = {}) {
-		super({ type: ComponentType.File, ...data, file: data.file ? { url: data.file.url } : undefined });
-	}
-
-	/**
-	 * Sets the spoiler status of this file.
-	 *
-	 * @param spoiler - The spoiler status to use
-	 */
-	public setSpoiler(spoiler = true) {
-		this.data.spoiler = spoilerPredicate.parse(spoiler);
-		return this;
-	}
-
-	/**
-	 * Sets the media URL of this file.
-	 *
-	 * @param url - The URL to use
-	 */
-	public setURL(url: string) {
-		this.data.file = filePredicate.parse({ url });
-		return this;
-	}
-
-	/**
-	 * {@inheritDoc ComponentBuilder.toJSON}
-	 */
-	public override toJSON(): APIFileComponent {
-		filePredicate.parse(this.data.file);
-
-		return { ...this.data, file: { ...this.data.file } } as APIFileComponent;
-	}
-}

packages/builders/src/components/v2/MediaGallery.ts

@@ -1,117 +0,0 @@
-/* eslint-disable jsdoc/check-param-names */
-
-import type { APIMediaGalleryComponent, APIMediaGalleryItem } from 'discord-api-types/v10';
-import { ComponentType } from 'discord-api-types/v10';
-import { normalizeArray, type RestOrArray } from '../../util/normalizeArray.js';
-import { ComponentBuilder } from '../Component.js';
-import { resolveBuilder } from '../Components.js';
-import { assertReturnOfBuilder, validateComponentArray } from './Assertions.js';
-import { MediaGalleryItemBuilder } from './MediaGalleryItem.js';
-
-/**
- * A builder that creates API-compatible JSON data for a container.
- */
-export class MediaGalleryBuilder extends ComponentBuilder<APIMediaGalleryComponent> {
-	/**
-	 * The components within this container.
-	 */
-	public readonly items: MediaGalleryItemBuilder[];
-
-	/**
-	 * Creates a new media gallery from API data.
-	 *
-	 * @param data - The API data to create this media gallery with
-	 * @example
-	 * Creating a media gallery from an API data object:
-	 * ```ts
-	 * const mediaGallery = new MediaGalleryBuilder({
-	 * 	items: [
-	 * 		{
-	 * 			description: "Some text here",
-	 * 			media: {
-	 * 				url: 'https://cdn.discordapp.com/embed/avatars/2.png',
-	 * 			},
-	 * 		},
-	 * 	],
-	 * });
-	 * ```
-	 * @example
-	 * Creating a media gallery using setters and API data:
-	 * ```ts
-	 * const mediaGallery = new MediaGalleryBuilder({
-	 * 	items: [
-	 * 		{
-	 * 			description: "alt text",
-	 * 			media: {
-	 * 				url: 'https://cdn.discordapp.com/embed/avatars/5.png',
-	 * 			},
-	 * 		},
-	 * 	],
-	 * })
-	 * 	.addItems(item2, item3);
-	 * ```
-	 */
-	public constructor({ items, ...data }: Partial<APIMediaGalleryComponent> = {}) {
-		super({ type: ComponentType.MediaGallery, ...data });
-		this.items = items?.map((item) => new MediaGalleryItemBuilder(item)) ?? [];
-	}
-
-	/**
-	 * Adds items to this media gallery.
-	 *
-	 * @param items - The items to add
-	 */
-	public addItems(
-		...items: RestOrArray<
-			APIMediaGalleryItem | MediaGalleryItemBuilder | ((builder: MediaGalleryItemBuilder) => MediaGalleryItemBuilder)
-		>
-	) {
-		this.items.push(
-			...normalizeArray(items).map((input) => {
-				const result = resolveBuilder(input, MediaGalleryItemBuilder);
-
-				assertReturnOfBuilder(result, MediaGalleryItemBuilder);
-				return result;
-			}),
-		);
-		return this;
-	}
-
-	/**
-	 * Removes, replaces, or inserts media gallery items for this media gallery.
-	 *
-	 * @param index - The index to start removing, replacing or inserting items
-	 * @param deleteCount - The amount of items to remove
-	 * @param items - The items to insert
-	 */
-	public spliceItems(
-		index: number,
-		deleteCount: number,
-		...items: RestOrArray<
-			APIMediaGalleryItem | MediaGalleryItemBuilder | ((builder: MediaGalleryItemBuilder) => MediaGalleryItemBuilder)
-		>
-	) {
-		this.items.splice(
-			index,
-			deleteCount,
-			...normalizeArray(items).map((input) => {
-				const result = resolveBuilder(input, MediaGalleryItemBuilder);
-
-				assertReturnOfBuilder(result, MediaGalleryItemBuilder);
-				return result;
-			}),
-		);
-		return this;
-	}
-
-	/**
-	 * {@inheritDoc ComponentBuilder.toJSON}
-	 */
-	public toJSON(): APIMediaGalleryComponent {
-		validateComponentArray(this.items, 1, 10, MediaGalleryItemBuilder);
-		return {
-			...this.data,
-			items: this.items.map((item) => item.toJSON()),
-		} as APIMediaGalleryComponent;
-	}
-}

packages/builders/src/components/v2/MediaGalleryItem.ts

@@ -1,90 +0,0 @@
-import type { JSONEncodable } from '@discordjs/util';
-import type { APIMediaGalleryItem } from 'discord-api-types/v10';
-import { descriptionPredicate, spoilerPredicate, unfurledMediaItemPredicate } from './Assertions';
-
-export class MediaGalleryItemBuilder implements JSONEncodable<APIMediaGalleryItem> {
-	/**
-	 * The API data associated with this media gallery item.
-	 */
-	public readonly data: Partial<APIMediaGalleryItem>;
-
-	/**
-	 * Creates a new media gallery item from API data.
-	 *
-	 * @param data - The API data to create this media gallery item with
-	 * @example
-	 * Creating a media gallery item from an API data object:
-	 * ```ts
-	 * const item = new MediaGalleryItemBuilder({
-	 * 	description: "Some text here",
-	 * 	media: {
-	 * 		url: 'https://cdn.discordapp.com/embed/avatars/2.png',
-	 * 	},
-	 * });
-	 * ```
-	 * @example
-	 * Creating a media gallery item using setters and API data:
-	 * ```ts
-	 * const item = new MediaGalleryItemBuilder({
-	 * 	media: {
-	 * 		url: 'https://cdn.discordapp.com/embed/avatars/5.png',
-	 * 	},
-	 * })
-	 * 	.setDescription("alt text");
-	 * ```
-	 */
-	public constructor(data: Partial<APIMediaGalleryItem> = {}) {
-		this.data = data;
-	}
-
-	/**
-	 * Sets the description of this media gallery item.
-	 *
-	 * @param description - The description to use
-	 */
-	public setDescription(description: string) {
-		this.data.description = descriptionPredicate.parse(description);
-		return this;
-	}
-
-	/**
-	 * Clears the description of this media gallery item.
-	 */
-	public clearDescription() {
-		this.data.description = undefined;
-		return this;
-	}
-
-	/**
-	 * Sets the spoiler status of this media gallery item.
-	 *
-	 * @param spoiler - The spoiler status to use
-	 */
-	public setSpoiler(spoiler = true) {
-		this.data.spoiler = spoilerPredicate.parse(spoiler);
-		return this;
-	}
-
-	/**
-	 * Sets the media URL of this media gallery item.
-	 *
-	 * @param url - The URL to use
-	 */
-	public setURL(url: string) {
-		this.data.media = unfurledMediaItemPredicate.parse({ url });
-		return this;
-	}
-
-	/**
-	 * Serializes this builder to API-compatible JSON data.
-	 *
-	 * @remarks
-	 * This method runs validations on the data before serializing it.
-	 * As such, it may throw an error if the data is invalid.
-	 */
-	public toJSON(): APIMediaGalleryItem {
-		unfurledMediaItemPredicate.parse(this.data.media);
-
-		return { ...this.data } as APIMediaGalleryItem;
-	}
-}

packages/builders/src/components/v2/Section.ts

@@ -1,153 +0,0 @@
-/* eslint-disable jsdoc/check-param-names */
-
-import type {
-	APIButtonComponent,
-	APISectionComponent,
-	APITextDisplayComponent,
-	APIThumbnailComponent,
-} from 'discord-api-types/v10';
-import { ComponentType } from 'discord-api-types/v10';
-import { ButtonBuilder, ThumbnailBuilder } from '../../index.js';
-import { normalizeArray, type RestOrArray } from '../../util/normalizeArray.js';
-import { ComponentBuilder } from '../Component.js';
-import { createComponentBuilder, resolveBuilder } from '../Components.js';
-import { accessoryPredicate, assertReturnOfBuilder, validateComponentArray } from './Assertions.js';
-import { TextDisplayBuilder } from './TextDisplay.js';
-
-/**
- * A builder that creates API-compatible JSON data for a section.
- */
-export class SectionBuilder extends ComponentBuilder<APISectionComponent> {
-	/**
-	 * The components within this section.
-	 */
-	public readonly components: ComponentBuilder[];
-
-	/**
-	 * The accessory of this section.
-	 */
-	public readonly accessory?: ButtonBuilder | ThumbnailBuilder;
-
-	/**
-	 * Creates a new section from API data.
-	 *
-	 * @param data - The API data to create this section with
-	 * @example
-	 * Creating a section from an API data object:
-	 * ```ts
-	 * const section = new SectionBuilder({
-	 * 	components: [
-	 * 		{
-	 * 			content: "Some text here",
-	 * 			type: ComponentType.TextDisplay,
-	 * 		},
-	 * 	],
-	 *  accessory: {
-	 *      media: {
-	 *          url: 'https://cdn.discordapp.com/embed/avatars/3.png',
-	 *      },
-	 *  }
-	 * });
-	 * ```
-	 * @example
-	 * Creating a section using setters and API data:
-	 * ```ts
-	 * const section = new SectionBuilder({
-	 * 	components: [
-	 * 		{
-	 * 			content: "# Heading",
-	 * 			type: ComponentType.TextDisplay,
-	 * 		},
-	 * 	],
-	 * })
-	 * 	.setPrimaryButtonAccessory(button);
-	 * ```
-	 */
-	public constructor({ components, accessory, ...data }: Partial<APISectionComponent> = {}) {
-		super({ type: ComponentType.Section, ...data });
-		this.components = (components?.map((component) => createComponentBuilder(component)) ?? []) as ComponentBuilder[];
-		this.accessory = accessory ? createComponentBuilder(accessory) : undefined;
-	}
-
-	/**
-	 * Sets the accessory of this section to a button.
-	 *
-	 * @param accessory - The accessory to use
-	 */
-	public setButtonAccessory(
-		accessory: APIButtonComponent | ButtonBuilder | ((builder: ButtonBuilder) => ButtonBuilder),
-	): this {
-		Reflect.set(this, 'accessory', accessoryPredicate.parse(resolveBuilder(accessory, ButtonBuilder)));
-		return this;
-	}
-
-	/**
-	 * Sets the accessory of this section to a thumbnail.
-	 *
-	 * @param accessory - The accessory to use
-	 */
-	public setThumbnailAccessory(
-		accessory: APIThumbnailComponent | ThumbnailBuilder | ((builder: ThumbnailBuilder) => ThumbnailBuilder),
-	): this {
-		Reflect.set(this, 'accessory', accessoryPredicate.parse(resolveBuilder(accessory, ThumbnailBuilder)));
-		return this;
-	}
-
-	/**
-	 * Adds text display components to this section.
-	 *
-	 * @param components - The text display components to add
-	 */
-	public addTextDisplayComponents(
-		...components: RestOrArray<TextDisplayBuilder | ((builder: TextDisplayBuilder) => TextDisplayBuilder)>
-	) {
-		this.components.push(
-			...normalizeArray(components).map((input) => {
-				const result = resolveBuilder(input, TextDisplayBuilder);
-
-				assertReturnOfBuilder(result, TextDisplayBuilder);
-				return result;
-			}),
-		);
-		return this;
-	}
-
-	/**
-	 * Removes, replaces, or inserts text display components for this section.
-	 *
-	 * @param index - The index to start removing, replacing or inserting text display components
-	 * @param deleteCount - The amount of text display components to remove
-	 * @param components - The text display components to insert
-	 */
-	public spliceTextDisplayComponents(
-		index: number,
-		deleteCount: number,
-		...components: RestOrArray<
-			APITextDisplayComponent | TextDisplayBuilder | ((builder: TextDisplayBuilder) => TextDisplayBuilder)
-		>
-	) {
-		this.components.splice(
-			index,
-			deleteCount,
-			...normalizeArray(components).map((input) => {
-				const result = resolveBuilder(input, TextDisplayBuilder);
-
-				assertReturnOfBuilder(result, TextDisplayBuilder);
-				return result;
-			}),
-		);
-		return this;
-	}
-
-	/**
-	 * {@inheritDoc ComponentBuilder.toJSON}
-	 */
-	public toJSON(): APISectionComponent {
-		validateComponentArray(this.components, 1, 3, TextDisplayBuilder);
-		return {
-			...this.data,
-			components: this.components.map((component) => component.toJSON()),
-			accessory: accessoryPredicate.parse(this.accessory).toJSON(),
-		} as APISectionComponent;
-	}
-}

packages/builders/src/components/v2/Separator.ts

@@ -1,69 +0,0 @@
-import type { SeparatorSpacingSize, APISeparatorComponent } from 'discord-api-types/v10';
-import { ComponentType } from 'discord-api-types/v10';
-import { ComponentBuilder } from '../Component';
-import { dividerPredicate, spacingPredicate } from './Assertions';
-
-export class SeparatorBuilder extends ComponentBuilder<APISeparatorComponent> {
-	/**
-	 * Creates a new separator from API data.
-	 *
-	 * @param data - The API data to create this separator with
-	 * @example
-	 * Creating a separator from an API data object:
-	 * ```ts
-	 * const separator = new SeparatorBuilder({
-	 * 	spacing: SeparatorSpacingSize.Small,
-	 *  divider: true,
-	 * });
-	 * ```
-	 * @example
-	 * Creating a separator using setters and API data:
-	 * ```ts
-	 * const separator = new SeparatorBuilder({
-	 * 	spacing: SeparatorSpacingSize.Large,
-	 * })
-	 * 	.setDivider(false);
-	 * ```
-	 */
-	public constructor(data: Partial<APISeparatorComponent> = {}) {
-		super({
-			type: ComponentType.Separator,
-			...data,
-		});
-	}
-
-	/**
-	 * Sets whether this separator should show a divider line.
-	 *
-	 * @param divider - Whether to show a divider line
-	 */
-	public setDivider(divider = true) {
-		this.data.divider = dividerPredicate.parse(divider);
-		return this;
-	}
-
-	/**
-	 * Sets the spacing of this separator.
-	 *
-	 * @param spacing - The spacing to use
-	 */
-	public setSpacing(spacing: SeparatorSpacingSize) {
-		this.data.spacing = spacingPredicate.parse(spacing);
-		return this;
-	}
-
-	/**
-	 * Clears the spacing of this separator.
-	 */
-	public clearSpacing() {
-		this.data.spacing = undefined;
-		return this;
-	}
-
-	/**
-	 * {@inheritDoc ComponentBuilder.toJSON}
-	 */
-	public override toJSON(): APISeparatorComponent {
-		return { ...this.data } as APISeparatorComponent;
-	}
-}

packages/builders/src/components/v2/TextDisplay.ts

@@ -1,52 +0,0 @@
-import type { APITextDisplayComponent } from 'discord-api-types/v10';
-import { ComponentType } from 'discord-api-types/v10';
-import { ComponentBuilder } from '../Component';
-import { textDisplayContentPredicate } from './Assertions';
-
-export class TextDisplayBuilder extends ComponentBuilder<APITextDisplayComponent> {
-	/**
-	 * Creates a new text display from API data.
-	 *
-	 * @param data - The API data to create this text display with
-	 * @example
-	 * Creating a text display from an API data object:
-	 * ```ts
-	 * const textDisplay = new TextDisplayBuilder({
-	 * 	content: 'some text',
-	 * });
-	 * ```
-	 * @example
-	 * Creating a text display using setters and API data:
-	 * ```ts
-	 * const textDisplay = new TextDisplayBuilder({
-	 * 	content: 'old text',
-	 * })
-	 * 	.setContent('new text');
-	 * ```
-	 */
-	public constructor(data: Partial<APITextDisplayComponent> = {}) {
-		super({
-			type: ComponentType.TextDisplay,
-			...data,
-		});
-	}
-
-	/**
-	 * Sets the text of this text display.
-	 *
-	 * @param content - The text to use
-	 */
-	public setContent(content: string) {
-		this.data.content = textDisplayContentPredicate.parse(content);
-		return this;
-	}
-
-	/**
-	 * {@inheritDoc ComponentBuilder.toJSON}
-	 */
-	public override toJSON(): APITextDisplayComponent {
-		textDisplayContentPredicate.parse(this.data.content);
-
-		return { ...this.data } as APITextDisplayComponent;
-	}
-}

packages/builders/src/components/v2/Thumbnail.ts

@@ -1,86 +0,0 @@
-import type { APIThumbnailComponent } from 'discord-api-types/v10';
-import { ComponentType } from 'discord-api-types/v10';
-import { ComponentBuilder } from '../Component';
-import { descriptionPredicate, spoilerPredicate, unfurledMediaItemPredicate } from './Assertions';
-
-export class ThumbnailBuilder extends ComponentBuilder<APIThumbnailComponent> {
-	/**
-	 * Creates a new thumbnail from API data.
-	 *
-	 * @param data - The API data to create this thumbnail with
-	 * @example
-	 * Creating a thumbnail from an API data object:
-	 * ```ts
-	 * const thumbnail = new ThumbnailBuilder({
-	 * 	description: 'some text',
-	 *  media: {
-	 *      url: 'https://cdn.discordapp.com/embed/avatars/4.png',
-	 *  },
-	 * });
-	 * ```
-	 * @example
-	 * Creating a thumbnail using setters and API data:
-	 * ```ts
-	 * const thumbnail = new ThumbnailBuilder({
-	 * 	media: {
-	 *      url: 'attachment://image.png',
-	 *  },
-	 * })
-	 * 	.setDescription('alt text');
-	 * ```
-	 */
-	public constructor(data: Partial<APIThumbnailComponent> = {}) {
-		super({
-			type: ComponentType.Thumbnail,
-			...data,
-			media: data.media ? { url: data.media.url } : undefined,
-		});
-	}
-
-	/**
-	 * Sets the description of this thumbnail.
-	 *
-	 * @param description - The description to use
-	 */
-	public setDescription(description: string) {
-		this.data.description = descriptionPredicate.parse(description);
-		return this;
-	}
-
-	/**
-	 * Clears the description of this thumbnail.
-	 */
-	public clearDescription() {
-		this.data.description = undefined;
-		return this;
-	}
-
-	/**
-	 * Sets the spoiler status of this thumbnail.
-	 *
-	 * @param spoiler - The spoiler status to use
-	 */
-	public setSpoiler(spoiler = true) {
-		this.data.spoiler = spoilerPredicate.parse(spoiler);
-		return this;
-	}
-
-	/**
-	 * Sets the media URL of this thumbnail.
-	 *
-	 * @param url - The URL to use
-	 */
-	public setURL(url: string) {
-		this.data.media = unfurledMediaItemPredicate.parse({ url });
-		return this;
-	}
-
-	/**
-	 * {@inheritdoc ComponentBuilder.toJSON}
-	 */
-	public override toJSON(): APIThumbnailComponent {
-		unfurledMediaItemPredicate.parse(this.data.media);
-
-		return { ...this.data } as APIThumbnailComponent;
-	}
-}

packages/builders/src/index.ts

@@ -34,19 +34,6 @@ export {
 export * from './components/selectMenu/StringSelectMenuOption.js';
 export * from './components/selectMenu/UserSelectMenu.js';
 
-export * from './components/label/Label.js';
-export * as LabelAssertions from './components/label/Assertions.js';
-
-export * as ComponentsV2Assertions from './components/v2/Assertions.js';
-export * from './components/v2/Container.js';
-export * from './components/v2/File.js';
-export * from './components/v2/MediaGallery.js';
-export * from './components/v2/MediaGalleryItem.js';
-export * from './components/v2/Section.js';
-export * from './components/v2/Separator.js';
-export * from './components/v2/TextDisplay.js';
-export * from './components/v2/Thumbnail.js';
-
 export * as SlashCommandAssertions from './interactions/slashCommands/Assertions.js';
 export * from './interactions/slashCommands/SlashCommandBuilder.js';
 export * from './interactions/slashCommands/SlashCommandSubcommands.js';

packages/builders/src/interactions/contextMenuCommands/Assertions.ts

@@ -7,7 +7,8 @@ const namePredicate = s
 	.string()
 	.lengthGreaterThanOrEqual(1)
 	.lengthLessThanOrEqual(32)
-	.regex(/\S/)
+	// eslint-disable-next-line prefer-named-capture-group
+	.regex(/^( *[\p{P}\p{L}\p{N}\p{sc=Devanagari}\p{sc=Thai}]+ *)+$/u)
 	.setValidationEnabled(isValidationEnabled);
 const typePredicate = s
 	.union([s.literal(ApplicationCommandType.User), s.literal(ApplicationCommandType.Message)])

packages/builders/src/interactions/modals/Assertions.ts

@@ -1,8 +1,6 @@
 import { s } from '@sapphire/shapeshift';
 import { ActionRowBuilder, type ModalActionRowComponentBuilder } from '../../components/ActionRow.js';
 import { customIdValidator } from '../../components/Assertions.js';
-import { LabelBuilder } from '../../components/label/Label.js';
-import { TextDisplayBuilder } from '../../components/v2/TextDisplay.js';
 import { isValidationEnabled } from '../../util/validation.js';
 
 export const titleValidator = s
@@ -11,7 +9,7 @@ export const titleValidator = s
 	.lengthLessThanOrEqual(45)
 	.setValidationEnabled(isValidationEnabled);
 export const componentsValidator = s
-	.union([s.instance(ActionRowBuilder), s.instance(LabelBuilder), s.instance(TextDisplayBuilder)])
+	.instance(ActionRowBuilder)
 	.array()
 	.lengthGreaterThanOrEqual(1)
 	.setValidationEnabled(isValidationEnabled);
@@ -19,7 +17,7 @@ export const componentsValidator = s
 export function validateRequiredParameters(
 	customId?: string,
 	title?: string,
-	components?: (ActionRowBuilder<ModalActionRowComponentBuilder> | LabelBuilder | TextDisplayBuilder)[],
+	components?: ActionRowBuilder<ModalActionRowComponentBuilder>[],
 ) {
 	customIdValidator.parse(customId);
 	titleValidator.parse(title);

packages/builders/src/interactions/modals/Modal.ts

@@ -2,20 +2,13 @@
 
 import type { JSONEncodable } from '@discordjs/util';
 import type {
-	APITextInputComponent,
 	APIActionRowComponent,
-	APIComponentInModalActionRow,
-	APILabelComponent,
+	APIModalActionRowComponent,
 	APIModalInteractionResponseCallbackData,
-	APITextDisplayComponent,
 } from 'discord-api-types/v10';
-import { ComponentType } from 'discord-api-types/v10';
 import { ActionRowBuilder, type ModalActionRowComponentBuilder } from '../../components/ActionRow.js';
 import { customIdValidator } from '../../components/Assertions.js';
-import { createComponentBuilder, resolveBuilder } from '../../components/Components.js';
-import { LabelBuilder } from '../../components/label/Label.js';
-import { TextInputBuilder } from '../../components/textInput/TextInput.js';
-import { TextDisplayBuilder } from '../../components/v2/TextDisplay.js';
+import { createComponentBuilder } from '../../components/Components.js';
 import { normalizeArray, type RestOrArray } from '../../util/normalizeArray.js';
 import { titleValidator, validateRequiredParameters } from './Assertions.js';
 
@@ -31,8 +24,7 @@ export class ModalBuilder implements JSONEncodable<APIModalInteractionResponseCa
 	/**
 	 * The components within this modal.
 	 */
-	public readonly components: (ActionRowBuilder<ModalActionRowComponentBuilder> | LabelBuilder | TextDisplayBuilder)[] =
-		[];
+	public readonly components: ActionRowBuilder<ModalActionRowComponentBuilder>[] = [];
 
 	/**
 	 * Creates a new modal from API data.
@@ -41,10 +33,8 @@ export class ModalBuilder implements JSONEncodable<APIModalInteractionResponseCa
 	 */
 	public constructor({ components, ...data }: Partial<APIModalInteractionResponseCallbackData> = {}) {
 		this.data = { ...data };
-		this.components = (components?.map((component) => createComponentBuilder(component)) ?? []) as (
-			| ActionRowBuilder<ModalActionRowComponentBuilder>
-			| LabelBuilder
-		)[];
+		this.components = (components?.map((component) => createComponentBuilder(component)) ??
+			[]) as ActionRowBuilder<ModalActionRowComponentBuilder>[];
 	}
 
 	/**
@@ -71,182 +61,28 @@ export class ModalBuilder implements JSONEncodable<APIModalInteractionResponseCa
 	 * Adds components to this modal.
 	 *
 	 * @param components - The components to add
-	 * @deprecated Use {@link ModalBuilder.addLabelComponents} or {@link ModalBuilder.addTextDisplayComponents} instead
 	 */
 	public addComponents(
 		...components: RestOrArray<
-			| ActionRowBuilder<ModalActionRowComponentBuilder>
-			| APIActionRowComponent<APIComponentInModalActionRow>
-			| APILabelComponent
-			| APITextDisplayComponent
-			| APITextInputComponent
-			| LabelBuilder
-			| TextDisplayBuilder
-			| TextInputBuilder
+			ActionRowBuilder<ModalActionRowComponentBuilder> | APIActionRowComponent<APIModalActionRowComponent>
 		>
 	) {
 		this.components.push(
-			...normalizeArray(components).map((component, idx) => {
-				if (
-					component instanceof ActionRowBuilder ||
-					component instanceof LabelBuilder ||
-					component instanceof TextDisplayBuilder
-				) {
-					return component;
-				}
-
-				// Deprecated support
-				if (component instanceof TextInputBuilder) {
-					return new ActionRowBuilder<ModalActionRowComponentBuilder>().addComponents(component);
-				}
-
-				if ('type' in component) {
-					if (component.type === ComponentType.ActionRow) {
-						return new ActionRowBuilder<ModalActionRowComponentBuilder>(component);
-					}
-
-					if (component.type === ComponentType.Label) {
-						return new LabelBuilder(component);
-					}
-
-					if (component.type === ComponentType.TextDisplay) {
-						return new TextDisplayBuilder(component);
-					}
-
-					// Deprecated, should go in a label component
-					if (component.type === ComponentType.TextInput) {
-						return new ActionRowBuilder<ModalActionRowComponentBuilder>().addComponents(
-							new TextInputBuilder(component),
-						);
-					}
-				}
-
-				throw new TypeError(`Invalid component passed in ModalBuilder.addComponents at index ${idx}!`);
-			}),
+			...normalizeArray(components).map((component) =>
+				component instanceof ActionRowBuilder
+					? component
+					: new ActionRowBuilder<ModalActionRowComponentBuilder>(component),
+			),
 		);
 		return this;
 	}
 
-	/**
-	 * Adds label components to this modal.
-	 *
-	 * @param components - The components to add
-	 */
-	public addLabelComponents(
-		...components: RestOrArray<APILabelComponent | LabelBuilder | ((builder: LabelBuilder) => LabelBuilder)>
-	) {
-		const normalized = normalizeArray(components);
-		const resolved = normalized.map((label) => resolveBuilder(label, LabelBuilder));
-
-		this.components.push(...resolved);
-
-		return this;
-	}
-
-	/**
-	 * Adds text display components to this modal.
-	 *
-	 * @param components - The components to add
-	 */
-	public addTextDisplayComponents(
-		...components: RestOrArray<
-			APITextDisplayComponent | TextDisplayBuilder | ((builder: TextDisplayBuilder) => TextDisplayBuilder)
-		>
-	) {
-		const normalized = normalizeArray(components);
-		const resolved = normalized.map((row) => resolveBuilder(row, TextDisplayBuilder));
-
-		this.components.push(...resolved);
-
-		return this;
-	}
-
-	/**
-	 * Adds action rows to this modal.
-	 *
-	 * @param components - The components to add
-	 * @deprecated Use {@link ModalBuilder.addLabelComponents} instead
-	 */
-	public addActionRowComponents(
-		...components: RestOrArray<
-			| ActionRowBuilder<ModalActionRowComponentBuilder>
-			| APIActionRowComponent<APIComponentInModalActionRow>
-			| ((
-					builder: ActionRowBuilder<ModalActionRowComponentBuilder>,
-			  ) => ActionRowBuilder<ModalActionRowComponentBuilder>)
-		>
-	) {
-		const normalized = normalizeArray(components);
-		const resolved = normalized.map((row) => resolveBuilder(row, ActionRowBuilder<ModalActionRowComponentBuilder>));
-
-		this.components.push(...resolved);
-
-		return this;
-	}
-
-	/**
-	 * Sets the labels for this modal.
-	 *
-	 * @param components - The components to set
-	 */
-	public setLabelComponents(
-		...components: RestOrArray<APILabelComponent | LabelBuilder | ((builder: LabelBuilder) => LabelBuilder)>
-	) {
-		const normalized = normalizeArray(components);
-		this.spliceLabelComponents(0, this.components.length, ...normalized);
-
-		return this;
-	}
-
-	/**
-	 * Removes, replaces, or inserts labels for this modal.
-	 *
-	 * @remarks
-	 * This method behaves similarly
-	 * to {@link https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array/splice | Array.prototype.splice()}.
-	 * The maximum amount of labels that can be added is 5.
-	 *
-	 * It's useful for modifying and adjusting order of the already-existing labels of a modal.
-	 * @example
-	 * Remove the first label:
-	 * ```ts
-	 * modal.spliceLabelComponents(0, 1);
-	 * ```
-	 * @example
-	 * Remove the first n labels:
-	 * ```ts
-	 * const n = 4;
-	 * modal.spliceLabelComponents(0, n);
-	 * ```
-	 * @example
-	 * Remove the last label:
-	 * ```ts
-	 * modal.spliceLabelComponents(-1, 1);
-	 * ```
-	 * @param index - The index to start at
-	 * @param deleteCount - The number of labels to remove
-	 * @param labels - The replacing label objects
-	 */
-	public spliceLabelComponents(
-		index: number,
-		deleteCount: number,
-		...labels: (APILabelComponent | LabelBuilder | ((builder: LabelBuilder) => LabelBuilder))[]
-	): this {
-		const resolved = labels.map((label) => resolveBuilder(label, LabelBuilder));
-		this.components.splice(index, deleteCount, ...resolved);
-
-		return this;
-	}
-
 	/**
 	 * Sets components for this modal.
 	 *
 	 * @param components - The components to set
-	 * @deprecated Use {@link ModalBuilder.setLabelComponents} instead
 	 */
-	public setComponents(
-		...components: RestOrArray<ActionRowBuilder<ModalActionRowComponentBuilder> | LabelBuilder | TextDisplayBuilder>
-	) {
+	public setComponents(...components: RestOrArray<ActionRowBuilder<ModalActionRowComponentBuilder>>) {
 		this.components.splice(0, this.components.length, ...normalizeArray(components));
 		return this;
 	}

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

@@ -2,9 +2,17 @@ import { s } from '@sapphire/shapeshift';
 import type { APIEmbedField } from 'discord-api-types/v10';
 import { isValidationEnabled } from '../../util/validation.js';
 
-export const fieldNamePredicate = s.string().lengthLessThanOrEqual(256).setValidationEnabled(isValidationEnabled);
+export const fieldNamePredicate = s
+	.string()
+	.lengthGreaterThanOrEqual(1)
+	.lengthLessThanOrEqual(256)
+	.setValidationEnabled(isValidationEnabled);
 
-export const fieldValuePredicate = s.string().lengthLessThanOrEqual(1_024).setValidationEnabled(isValidationEnabled);
+export const fieldValuePredicate = s
+	.string()
+	.lengthGreaterThanOrEqual(1)
+	.lengthLessThanOrEqual(1_024)
+	.setValidationEnabled(isValidationEnabled);
 
 export const fieldInlinePredicate = s.boolean().optional();
 
@@ -24,10 +32,7 @@ export function validateFieldLength(amountAdding: number, fields?: APIEmbedField
 	fieldLengthPredicate.parse((fields?.length ?? 0) + amountAdding);
 }
 
-export const authorNamePredicate = fieldNamePredicate
-	.lengthGreaterThanOrEqual(1)
-	.nullable()
-	.setValidationEnabled(isValidationEnabled);
+export const authorNamePredicate = fieldNamePredicate.nullable().setValidationEnabled(isValidationEnabled);
 
 export const imageURLPredicate = s
 	.string()
@@ -91,7 +96,4 @@ export const embedFooterPredicate = s
 
 export const timestampPredicate = s.union([s.number(), s.date()]).nullable().setValidationEnabled(isValidationEnabled);
 
-export const titlePredicate = fieldNamePredicate
-	.lengthGreaterThanOrEqual(1)
-	.nullable()
-	.setValidationEnabled(isValidationEnabled);
+export const titlePredicate = fieldNamePredicate.nullable().setValidationEnabled(isValidationEnabled);

packages/collection/cliff.toml

@@ -30,8 +30,10 @@ body = """
 			{{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}]({{ self::remote_url() }}/commit/{{ commit.id }}))\
 			{% if commit.github.username %} by @{{ commit.github.username }}{%- endif %}\
 		{% if commit.breaking %}\
-			{% for breakingChange in commit.footers %}\
-				\n{% raw %}  {% endraw %}- **{{ breakingChange.token }}{{ breakingChange.separator }}** {{ breakingChange.value }}\
+			{% for footer in commit.footers %}\
+				{% if footer.breaking %}\
+					\n{% raw %}  {% endraw %}- **{{ footer.token }}{{ footer.separator }}** {{ footer.value }}\
+				{% endif %}\
 			{% endfor %}\
 		{% endif %}\
 	{% endfor %}

packages/core/README.md

@@ -23,7 +23,7 @@
 
 ## Installation
 
-**Node.js 18 or newer is required.**
+**Node.js 20 or newer is required.**
 
 ```sh
 npm install @discordjs/core

packages/core/api-extractor.json

@@ -1,6 +1,5 @@
 {
 	"extends": "../../api-extractor.json",
-	"bundledPackages": ["discord-api-types"],
 	"docModel": {
 		"projectFolderUrl": "https://github.com/discordjs/discord.js/tree/main/packages/core"
 	}

packages/core/cliff.toml

@@ -30,8 +30,10 @@ body = """
 			{{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}]({{ self::remote_url() }}/commit/{{ commit.id }}))\
 			{% if commit.github.username %} by @{{ commit.github.username }}{%- endif %}\
 		{% if commit.breaking %}\
-			{% for breakingChange in commit.footers %}\
-				\n{% raw %}  {% endraw %}- **{{ breakingChange.token }}{{ breakingChange.separator }}** {{ breakingChange.value }}\
+			{% for footer in commit.footers %}\
+				{% if footer.breaking %}\
+					\n{% raw %}  {% endraw %}- **{{ footer.token }}{{ footer.separator }}** {{ footer.value }}\
+				{% endif %}\
 			{% endfor %}\
 		{% endif %}\
 	{% endfor %}

packages/core/package.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json.schemastore.org/package.json",
 	"name": "@discordjs/core",
-	"version": "2.0.0",
+	"version": "2.0.1",
 	"description": "A thinly abstracted wrapper around the rest API, and gateway.",
 	"scripts": {
 		"test": "vitest run",
@@ -70,7 +70,7 @@
 		"@discordjs/ws": "workspace:^",
 		"@sapphire/snowflake": "^3.5.3",
 		"@vladfrangu/async_event_emitter": "^2.4.6",
-		"discord-api-types": "^0.37.119"
+		"discord-api-types": "^0.37.114"
 	},
 	"devDependencies": {
 		"@discordjs/api-extractor": "workspace:^",
@@ -90,7 +90,7 @@
 		"vitest": "^2.0.5"
 	},
 	"engines": {
-		"node": ">=18"
+		"node": ">=20"
 	},
 	"publishConfig": {
 		"access": "public",

packages/core/src/api/channel.ts

@@ -45,7 +45,7 @@ export class ChannelsAPI {
 	/**
 	 * Sends a message in a channel
 	 *
-	 * @see {@link https://discord.com/developers/docs/resources/channel#create-message}
+	 * @see {@link https://discord.com/developers/docs/resources/message#create-message}
 	 * @param channelId - The id of the channel to send the message in
 	 * @param body - The data for sending the message
 	 * @param options - The options for sending the message
@@ -65,7 +65,7 @@ export class ChannelsAPI {
 	/**
 	 * Edits a message
 	 *
-	 * @see {@link https://discord.com/developers/docs/resources/channel#edit-message}
+	 * @see {@link https://discord.com/developers/docs/resources/message#edit-message}
 	 * @param channelId - The id of the channel the message is in
 	 * @param messageId - The id of the message to edit
 	 * @param body - The data for editing the message
@@ -87,7 +87,7 @@ export class ChannelsAPI {
 	/**
 	 * Fetches the reactions for a message
 	 *
-	 * @see {@link https://discord.com/developers/docs/resources/channel#get-reactions}
+	 * @see {@link https://discord.com/developers/docs/resources/message#get-reactions}
 	 * @param channelId - The id of the channel the message is in
 	 * @param messageId - The id of the message to get the reactions for
 	 * @param emoji - The emoji to get the reactions for
@@ -110,7 +110,7 @@ export class ChannelsAPI {
 	/**
 	 * Deletes a reaction for the current user
 	 *
-	 * @see {@link https://discord.com/developers/docs/resources/channel#delete-own-reaction}
+	 * @see {@link https://discord.com/developers/docs/resources/message#delete-own-reaction}
 	 * @param channelId - The id of the channel the message is in
 	 * @param messageId - The id of the message to delete the reaction for
 	 * @param emoji - The emoji to delete the reaction for
@@ -130,7 +130,7 @@ export class ChannelsAPI {
 	/**
 	 * Deletes a reaction for a user
 	 *
-	 * @see {@link https://discord.com/developers/docs/resources/channel#delete-user-reaction}
+	 * @see {@link https://discord.com/developers/docs/resources/message#delete-user-reaction}
 	 * @param channelId - The id of the channel the message is in
 	 * @param messageId - The id of the message to delete the reaction for
 	 * @param emoji - The emoji to delete the reaction for
@@ -152,7 +152,7 @@ export class ChannelsAPI {
 	/**
 	 * Deletes all reactions for a message
 	 *
-	 * @see {@link https://discord.com/developers/docs/resources/channel#delete-all-reactions}
+	 * @see {@link https://discord.com/developers/docs/resources/message#delete-all-reactions}
 	 * @param channelId - The id of the channel the message is in
 	 * @param messageId - The id of the message to delete the reactions for
 	 * @param options - The options for deleting the reactions
@@ -168,7 +168,7 @@ export class ChannelsAPI {
 	/**
 	 * Deletes all reactions of an emoji for a message
 	 *
-	 * @see {@link https://discord.com/developers/docs/resources/channel#delete-all-reactions-for-emoji}
+	 * @see {@link https://discord.com/developers/docs/resources/message#delete-all-reactions-for-emoji}
 	 * @param channelId - The id of the channel the message is in
 	 * @param messageId - The id of the message to delete the reactions for
 	 * @param emoji - The emoji to delete the reactions for
@@ -186,7 +186,7 @@ export class ChannelsAPI {
 	/**
 	 * Adds a reaction to a message
 	 *
-	 * @see {@link https://discord.com/developers/docs/resources/channel#create-reaction}
+	 * @see {@link https://discord.com/developers/docs/resources/message#create-reaction}
 	 * @param channelId - The id of the channel the message is in
 	 * @param messageId - The id of the message to add the reaction to
 	 * @param emoji - The emoji to add the reaction with
@@ -242,7 +242,7 @@ export class ChannelsAPI {
 	/**
 	 * Fetches the messages of a channel
 	 *
-	 * @see {@link https://discord.com/developers/docs/resources/channel#get-channel-messages}
+	 * @see {@link https://discord.com/developers/docs/resources/message#get-channel-messages}
 	 * @param channelId - The id of the channel to fetch messages from
 	 * @param query - The query options for fetching messages
 	 * @param options - The options for fetching the messages
@@ -299,7 +299,7 @@ export class ChannelsAPI {
 	/**
 	 * Deletes a message
 	 *
-	 * @see {@link https://discord.com/developers/docs/resources/channel#delete-message}
+	 * @see {@link https://discord.com/developers/docs/resources/message#delete-message}
 	 * @param channelId - The id of the channel the message is in
 	 * @param messageId - The id of the message to delete
 	 * @param options - The options for deleting the message
@@ -315,7 +315,7 @@ export class ChannelsAPI {
 	/**
 	 * Bulk deletes messages
 	 *
-	 * @see {@link https://discord.com/developers/docs/resources/channel#bulk-delete-messages}
+	 * @see {@link https://discord.com/developers/docs/resources/message#bulk-delete-messages}
 	 * @param channelId - The id of the channel the messages are in
 	 * @param messageIds - The ids of the messages to delete
 	 * @param options - The options for deleting the messages
@@ -331,7 +331,7 @@ export class ChannelsAPI {
 	/**
 	 * Fetches a message
 	 *
-	 * @see {@link https://discord.com/developers/docs/resources/channel#get-channel-message}
+	 * @see {@link https://discord.com/developers/docs/resources/message#get-channel-message}
 	 * @param channelId - The id of the channel the message is in
 	 * @param messageId - The id of the message to fetch
 	 * @param options - The options for fetching the message
@@ -345,7 +345,7 @@ export class ChannelsAPI {
 	/**
 	 * Crossposts a message
 	 *
-	 * @see {@link https://discord.com/developers/docs/resources/channel#crosspost-message}
+	 * @see {@link https://discord.com/developers/docs/resources/message#crosspost-message}
 	 * @param channelId - The id of the channel the message is in
 	 * @param messageId - The id of the message to crosspost
 	 * @param options - The options for crossposting the message
@@ -452,7 +452,7 @@ export class ChannelsAPI {
 	/**
 	 * Creates a new forum post
 	 *
-	 * @see {@link https://discord.com/developers/docs/resources/channel#start-thread-in-forum-channel}
+	 * @see {@link https://discord.com/developers/docs/resources/channel#start-thread-in-forum-or-media-channel}
 	 * @param channelId - The id of the forum channel to start the thread in
 	 * @param body - The data for starting the thread
 	 * @param options - The options for starting the thread

packages/core/src/api/interactions.ts

@@ -258,7 +258,7 @@ export class InteractionsAPI {
 	 * @param interactionId - The id of the interaction
 	 * @param interactionToken - The token of the interaction
 	 * @param options - The options for sending the premium required response
-	 * @deprecated Sending a premium-style button is the new Discord behaviour.
+	 * @deprecated Sending a premium-style button is the new Discord behavior.
 	 */
 	public async sendPremiumRequired(
 		interactionId: Snowflake,

packages/create-discord-bot/cliff.toml

@@ -30,8 +30,10 @@ body = """
 			{{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}]({{ self::remote_url() }}/commit/{{ commit.id }}))\
 			{% if commit.github.username %} by @{{ commit.github.username }}{%- endif %}\
 		{% if commit.breaking %}\
-			{% for breakingChange in commit.footers %}\
-				\n{% raw %}  {% endraw %}- **{{ breakingChange.token }}{{ breakingChange.separator }}** {{ breakingChange.value }}\
+			{% for footer in commit.footers %}\
+				{% if footer.breaking %}\
+					\n{% raw %}  {% endraw %}- **{{ footer.token }}{{ footer.separator }}** {{ footer.value }}\
+				{% endif %}\
 			{% endfor %}\
 		{% endif %}\
 	{% endfor %}

packages/discord.js/CHANGELOG.md

@@ -2,6 +2,41 @@
 
 All notable changes to this project will be documented in this file.
 
+# [14.16.3](https://github.com/discordjs/discord.js/compare/14.16.2...14.16.3) - (2024-09-29)
+
+## Bug Fixes
+
+- **BaseInteraction:** Add missing props (#10517) ([6c77fee](https://github.com/discordjs/discord.js/commit/6c77fee41b1aabc243bff623debd157a4c7fad6a)) by @monbrey
+- `GuildChannel#guildId` not being patched to `undefined` (#10505) ([2adee06](https://github.com/discordjs/discord.js/commit/2adee06b6e92b7854ebb1c2bfd04940aab68dd10)) by @Qjuh
+
+## Typings
+
+- **MessageEditOptions:** Omit `poll` (#10509) ([665bf14](https://github.com/discordjs/discord.js/commit/665bf1486aec62e9528f5f7b5a6910ae6b5a6c9c)) by @TAEMBO
+
+# [14.16.2](https://github.com/discordjs/discord.js/compare/14.16.1...14.16.2) - (2024-09-12)
+
+## Bug Fixes
+
+- **ApplicationCommand:** Incorrect comparison in equals method (#10497) ([3c74aa2](https://github.com/discordjs/discord.js/commit/3c74aa204909323ff6d05991438bee2c583e838b)) by @monbrey
+- Type guard for sendable text-based channels (#10482) ([dea6840](https://github.com/discordjs/discord.js/commit/dea68400a38edb90b8b4242d64be14968943130d)) by @vladfrangu
+
+## Documentation
+
+- Update discord documentation links (#10484) ([799fa54](https://github.com/discordjs/discord.js/commit/799fa54fa4434144855be2f7a0bbac6ff8ce9d0b)) by @sdanialraza
+- **Message:** Mark `interaction` as deprecated (#10481) ([c13f18e](https://github.com/discordjs/discord.js/commit/c13f18e90eb6eb315397c095e948993856428757)) by @sdanialraza
+- **ApplicationEmojiManager:** Fix fetch example (#10480) ([4594896](https://github.com/discordjs/discord.js/commit/4594896b5404c6a34e07544951c59ff8f3657184)) by @sdanialraza
+
+## Typings
+
+- Export GroupDM helper type (#10478) ([aff772c](https://github.com/discordjs/discord.js/commit/aff772c7aa3b3de58780a94588d1f3576a434f32)) by @Qjuh
+
+# [14.16.1](https://github.com/discordjs/discord.js/compare/14.16.0...14.16.1) - (2024-09-02)
+
+## Bug Fixes
+
+- **Message:** Reacting returning undefined (#10475) ([9257a09](https://github.com/discordjs/discord.js/commit/9257a09abbf80558ed2d5d209a2f6bd2a4b3d799)) by @vladfrangu
+- **Transformers:** Pass client to recursive call (#10474) ([4810f7c](https://github.com/discordjs/discord.js/commit/4810f7c8637dacf77d0442bd84e0d579e1f1d3bd)) by @SpaceEEC
+
 # [14.16.0](https://github.com/discordjs/discord.js/compare/14.15.3...14.16.0) - (2024-09-01)
 
 ## Bug Fixes

packages/discord.js/README.md

@@ -29,7 +29,7 @@ discord.js is a powerful [Node.js](https://nodejs.org) module that allows you to
 
 ## Installation
 
-**Node.js 16.11.0 or newer is required.**
+**Node.js 18 or newer is required.**
 
 ```sh
 npm install discord.js
@@ -42,7 +42,6 @@ bun add discord.js
 
 - [zlib-sync](https://www.npmjs.com/package/zlib-sync) for WebSocket data compression and inflation (`npm install zlib-sync`)
 - [bufferutil](https://www.npmjs.com/package/bufferutil) for a much faster WebSocket connection (`npm install bufferutil`)
-- [utf-8-validate](https://www.npmjs.com/package/utf-8-validate) in combination with `bufferutil` for much faster WebSocket processing (`npm install utf-8-validate`)
 - [@discordjs/voice](https://www.npmjs.com/package/@discordjs/voice) for interacting with the Discord Voice API (`npm install @discordjs/voice`)
 
 ## Example usage

packages/discord.js/api-extractor.json

@@ -1,14 +1,6 @@
 {
   "extends": "../../api-extractor.json",
   "mainEntryPointFilePath": "<projectFolder>/typings/index.d.ts",
-  "bundledPackages": [
-    "discord-api-types",
-    "@discordjs/builders",
-    "@discordjs/formatters",
-    "@discordjs/rest",
-    "@discordjs/util",
-    "@discordjs/ws"
-  ],
   "docModel": {
     "projectFolderUrl": "https://github.com/discordjs/discord.js/tree/main/packages/discord.js"
   }

packages/discord.js/cliff.toml

@@ -30,8 +30,10 @@ body = """
 			{{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}]({{ self::remote_url() }}/commit/{{ commit.id }}))\
 			{% if commit.github.username %} by @{{ commit.github.username }}{%- endif %}\
 		{% if commit.breaking %}\
-			{% for breakingChange in commit.footers %}\
-				\n{% raw %}  {% endraw %}- **{{ breakingChange.token }}{{ breakingChange.separator }}** {{ breakingChange.value }}\
+			{% for footer in commit.footers %}\
+				{% if footer.breaking %}\
+					\n{% raw %}  {% endraw %}- **{{ footer.token }}{{ footer.separator }}** {{ footer.value }}\
+				{% endif %}\
 			{% endfor %}\
 		{% endif %}\
 	{% endfor %}
@@ -67,8 +69,7 @@ commit_parsers = [
 	{ body = ".*security", group = "Security"},
 ]
 filter_commits = true
-tag_pattern = "[0-9]*"
-skip_tags = "v[0-9]*|@discordjs*"
+tag_pattern = "^[0-9]+"
 ignore_tags = ""
 topo_order = false
 sort_commits = "newest"

packages/discord.js/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "discord.js",
-  "version": "14.16.0",
+  "version": "14.16.3",
   "description": "A powerful library for interacting with the Discord API",
   "scripts": {
     "test": "pnpm run docs:test && pnpm run test:typescript",
@@ -65,18 +65,18 @@
   "homepage": "https://discord.js.org",
   "funding": "https://github.com/discordjs/discord.js?sponsor",
   "dependencies": {
-    "@discordjs/builders": "workspace:^",
+    "@discordjs/builders": "^1.10.0",
     "@discordjs/collection": "1.5.3",
-    "@discordjs/formatters": "workspace:^",
+    "@discordjs/formatters": "^0.6.0",
     "@discordjs/rest": "workspace:^",
     "@discordjs/util": "workspace:^",
-    "@discordjs/ws": "1.1.1",
+    "@discordjs/ws": "^1.2.0",
     "@sapphire/snowflake": "3.5.3",
-    "discord-api-types": "^0.38.1",
+    "discord-api-types": "^0.37.114",
     "fast-deep-equal": "3.1.3",
     "lodash.snakecase": "4.1.1",
     "tslib": "^2.6.3",
-    "undici": "6.21.1"
+    "undici": "6.19.8"
   },
   "devDependencies": {
     "@discordjs/api-extractor": "workspace:^",
@@ -98,7 +98,7 @@
     "typescript": "~5.5.4"
   },
   "engines": {
-    "node": ">=16.11.0"
+    "node": ">=18"
   },
   "publishConfig": {
     "provenance": true

packages/discord.js/src/client/Client.js

@@ -107,20 +107,20 @@ class Client extends BaseClient {
       : null;
 
     /**
-     * All of the {@link User} objects that have been cached at any point, mapped by their ids
+     * The user manager of this client
      * @type {UserManager}
      */
     this.users = new UserManager(this);
 
     /**
-     * All of the guilds the client is currently handling, mapped by their ids -
+     * A manager of all the guilds the client is currently handling -
      * as long as sharding isn't being used, this will be *every* guild the bot is a member of
      * @type {GuildManager}
      */
     this.guilds = new GuildManager(this);
 
     /**
-     * All of the {@link BaseChannel}s that the client is currently handling, mapped by their ids -
+     * All of the {@link BaseChannel}s that the client is currently handling -
      * as long as sharding isn't being used, this will be *every* channel in *every* guild the bot
      * is a member of. Note that DM channels will not be initially cached, and thus not be present
      * in the Manager without their explicit fetching or use.
@@ -174,7 +174,7 @@ class Client extends BaseClient {
   }
 
   /**
-   * All custom emojis that the client has access to, mapped by their ids
+   * A manager of all the custom emojis that the client has access to
    * @type {BaseGuildEmojiManager}
    * @readonly
    */

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

@@ -111,6 +111,10 @@ class GenericAction {
   getThreadMember(id, manager) {
     return this.getPayload({ user_id: id }, manager, id, Partials.ThreadMember, false);
   }
+
+  spreadInjectedData(data) {
+    return Object.fromEntries(Object.getOwnPropertySymbols(data).map(symbol => [symbol, data[symbol]]));
+  }
 }
 
 module.exports = GenericAction;

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

@@ -6,7 +6,11 @@ const Events = require('../../util/Events');
 class MessageCreateAction extends Action {
   handle(data) {
     const client = this.client;
-    const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id, author: data.author });
+    const channel = this.getChannel({
+      id: data.channel_id,
+      author: data.author,
+      ...('guild_id' in data && { guild_id: data.guild_id }),
+    });
     if (channel) {
       if (!channel.isTextBased()) return {};
 

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

@@ -6,7 +6,7 @@ const Events = require('../../util/Events');
 class MessageDeleteAction extends Action {
   handle(data) {
     const client = this.client;
-    const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
+    const channel = this.getChannel({ id: data.channel_id, ...('guild_id' in data && { guild_id: data.guild_id }) });
     let message;
     if (channel) {
       if (!channel.isTextBased()) return {};

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

@@ -5,7 +5,7 @@ const Events = require('../../util/Events');
 
 class MessagePollVoteAddAction extends Action {
   handle(data) {
-    const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
+    const channel = this.getChannel({ id: data.channel_id, ...('guild_id' in data && { guild_id: data.guild_id }) });
     if (!channel?.isTextBased()) return false;
 
     const message = this.getMessage(data, channel);

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

@@ -5,7 +5,7 @@ const Events = require('../../util/Events');
 
 class MessagePollVoteRemoveAction extends Action {
   handle(data) {
-    const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
+    const channel = this.getChannel({ id: data.channel_id, ...('guild_id' in data && { guild_id: data.guild_id }) });
     if (!channel?.isTextBased()) return false;
 
     const message = this.getMessage(data, channel);

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

@@ -23,7 +23,13 @@ class MessageReactionAdd extends Action {
     if (!user) return false;
 
     // Verify channel
-    const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id, user_id: data.user_id });
+    const channel = this.getChannel({
+      id: data.channel_id,
+      ...('guild_id' in data && { guild_id: data.guild_id }),
+      user_id: data.user_id,
+      ...this.spreadInjectedData(data),
+    });
+
     if (!channel?.isTextBased()) return false;
 
     // Verify message
@@ -45,6 +51,7 @@ class MessageReactionAdd extends Action {
     /**
      * Provides additional information about altered reaction
      * @typedef {Object} MessageReactionEventDetails
+     * @property {ReactionType} type The type of the reaction
      * @property {boolean} burst Determines whether a super reaction was used
      */
     /**
@@ -54,7 +61,7 @@ class MessageReactionAdd extends Action {
      * @param {User} user The user that applied the guild or reaction emoji
      * @param {MessageReactionEventDetails} details Details of adding the reaction
      */
-    this.client.emit(Events.MessageReactionAdd, reaction, user, { burst: data.burst });
+    this.client.emit(Events.MessageReactionAdd, reaction, user, { type: data.type, burst: data.burst });
 
     return { message, reaction, user };
   }

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

@@ -19,7 +19,11 @@ class MessageReactionRemove extends Action {
     if (!user) return false;
 
     // Verify channel
-    const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id, user_id: data.user_id });
+    const channel = this.getChannel({
+      id: data.channel_id,
+      ...('guild_id' in data && { guild_id: data.guild_id }),
+      user_id: data.user_id,
+    });
     if (!channel?.isTextBased()) return false;
 
     // Verify message
@@ -37,7 +41,7 @@ class MessageReactionRemove extends Action {
      * @param {User} user The user whose emoji or reaction emoji was removed
      * @param {MessageReactionEventDetails} details Details of removing the reaction
      */
-    this.client.emit(Events.MessageReactionRemove, reaction, user, { burst: data.burst });
+    this.client.emit(Events.MessageReactionRemove, reaction, user, { type: data.type, burst: data.burst });
 
     return { message, reaction, user };
   }

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

@@ -6,7 +6,7 @@ const Events = require('../../util/Events');
 class MessageReactionRemoveAll extends Action {
   handle(data) {
     // Verify channel
-    const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
+    const channel = this.getChannel({ id: data.channel_id, ...('guild_id' in data && { guild_id: data.guild_id }) });
     if (!channel?.isTextBased()) return false;
 
     // Verify message

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

@@ -5,7 +5,7 @@ const Events = require('../../util/Events');
 
 class MessageReactionRemoveEmoji extends Action {
   handle(data) {
-    const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
+    const channel = this.getChannel({ id: data.channel_id, ...('guild_id' in data && { guild_id: data.guild_id }) });
     if (!channel?.isTextBased()) return false;
 
     const message = this.getMessage(data, channel);

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

@@ -4,7 +4,7 @@ const Action = require('./Action');
 
 class MessageUpdateAction extends Action {
   handle(data) {
-    const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
+    const channel = this.getChannel({ id: data.channel_id, ...('guild_id' in data && { guild_id: data.guild_id }) });
     if (channel) {
       if (!channel.isTextBased()) return {};
 

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

@@ -13,7 +13,7 @@ class ThreadListSyncAction extends Action {
 
     if (data.channel_ids) {
       for (const id of data.channel_ids) {
-        const channel = client.channels.resolve(id);
+        const channel = client.channels.cache.get(id);
         if (channel) this.removeStale(channel);
       }
     } else {

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

@@ -6,7 +6,7 @@ const Events = require('../../util/Events');
 
 class TypingStart extends Action {
   handle(data) {
-    const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
+    const channel = this.getChannel({ id: data.channel_id, ...('guild_id' in data && { guild_id: data.guild_id }) });
     if (!channel) return;
 
     if (!channel.isTextBased()) {

packages/discord.js/src/client/websocket/handlers/SUBSCRIPTION_CREATE.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const Events = require('../../../util/Events');
+
+module.exports = (client, { d: data }) => {
+  const subscription = client.application.subscriptions._add(data);
+
+  /**
+   * Emitted whenever a subscription is created.
+   * @event Client#subscriptionCreate
+   * @param {Subscription} subscription The subscription that was created
+   */
+  client.emit(Events.SubscriptionCreate, subscription);
+};

packages/discord.js/src/client/websocket/handlers/SUBSCRIPTION_DELETE.js

@@ -0,0 +1,16 @@
+'use strict';
+
+const Events = require('../../../util/Events');
+
+module.exports = (client, { d: data }) => {
+  const subscription = client.application.subscriptions._add(data, false);
+
+  client.application.subscriptions.cache.delete(subscription.id);
+
+  /**
+   * Emitted whenever a subscription is deleted.
+   * @event Client#subscriptionDelete
+   * @param {Subscription} subscription The subscription that was deleted
+   */
+  client.emit(Events.SubscriptionDelete, subscription);
+};

packages/discord.js/src/client/websocket/handlers/SUBSCRIPTION_UPDATE.js

@@ -0,0 +1,16 @@
+'use strict';
+
+const Events = require('../../../util/Events');
+
+module.exports = (client, { d: data }) => {
+  const oldSubscription = client.application.subscriptions.cache.get(data.id)?._clone() ?? null;
+  const newSubscription = client.application.subscriptions._add(data);
+
+  /**
+   * Emitted whenever a subscription is updated - i.e. when a user's subscription renews.
+   * @event Client#subscriptionUpdate
+   * @param {?Subscription} oldSubscription The subscription before the update
+   * @param {Subscription} newSubscription The subscription after the update
+   */
+  client.emit(Events.SubscriptionUpdate, oldSubscription, newSubscription);
+};

packages/discord.js/src/client/websocket/handlers/VOICE_CHANNEL_EFFECT_SEND.js

@@ -0,0 +1,16 @@
+'use strict';
+
+const VoiceChannelEffect = require('../../../structures/VoiceChannelEffect');
+const Events = require('../../../util/Events');
+
+module.exports = (client, { d: data }) => {
+  const guild = client.guilds.cache.get(data.guild_id);
+  if (!guild) return;
+
+  /**
+   * Emitted when someone sends an effect, such as an emoji reaction, in a voice channel the client is connected to.
+   * @event Client#voiceChannelEffectSend
+   * @param {VoiceChannelEffect} voiceChannelEffect The sent voice channel effect
+   */
+  client.emit(Events.VoiceChannelEffectSend, new VoiceChannelEffect(data, guild));
+};

packages/discord.js/src/client/websocket/handlers/index.js

@@ -53,6 +53,9 @@ const handlers = Object.fromEntries([
   ['STAGE_INSTANCE_CREATE', require('./STAGE_INSTANCE_CREATE')],
   ['STAGE_INSTANCE_DELETE', require('./STAGE_INSTANCE_DELETE')],
   ['STAGE_INSTANCE_UPDATE', require('./STAGE_INSTANCE_UPDATE')],
+  ['SUBSCRIPTION_CREATE', require('./SUBSCRIPTION_CREATE')],
+  ['SUBSCRIPTION_DELETE', require('./SUBSCRIPTION_DELETE')],
+  ['SUBSCRIPTION_UPDATE', require('./SUBSCRIPTION_UPDATE')],
   ['THREAD_CREATE', require('./THREAD_CREATE')],
   ['THREAD_DELETE', require('./THREAD_DELETE')],
   ['THREAD_LIST_SYNC', require('./THREAD_LIST_SYNC')],
@@ -61,6 +64,7 @@ const handlers = Object.fromEntries([
   ['THREAD_UPDATE', require('./THREAD_UPDATE')],
   ['TYPING_START', require('./TYPING_START')],
   ['USER_UPDATE', require('./USER_UPDATE')],
+  ['VOICE_CHANNEL_EFFECT_SEND', require('./VOICE_CHANNEL_EFFECT_SEND')],
   ['VOICE_SERVER_UPDATE', require('./VOICE_SERVER_UPDATE')],
   ['VOICE_STATE_UPDATE', require('./VOICE_STATE_UPDATE')],
   ['WEBHOOKS_UPDATE', require('./WEBHOOKS_UPDATE')],

packages/discord.js/src/index.js

@@ -85,6 +85,7 @@ exports.ReactionManager = require('./managers/ReactionManager');
 exports.ReactionUserManager = require('./managers/ReactionUserManager');
 exports.RoleManager = require('./managers/RoleManager');
 exports.StageInstanceManager = require('./managers/StageInstanceManager');
+exports.SubscriptionManager = require('./managers/SubscriptionManager').SubscriptionManager;
 exports.ThreadManager = require('./managers/ThreadManager');
 exports.ThreadMemberManager = require('./managers/ThreadMemberManager');
 exports.UserManager = require('./managers/UserManager');
@@ -146,6 +147,9 @@ exports.GuildScheduledEvent = require('./structures/GuildScheduledEvent').GuildS
 exports.GuildTemplate = require('./structures/GuildTemplate');
 exports.Integration = require('./structures/Integration');
 exports.IntegrationApplication = require('./structures/IntegrationApplication');
+exports.InteractionCallback = require('./structures/InteractionCallback');
+exports.InteractionCallbackResource = require('./structures/InteractionCallbackResource');
+exports.InteractionCallbackResponse = require('./structures/InteractionCallbackResponse');
 exports.BaseInteraction = require('./structures/BaseInteraction');
 exports.InteractionCollector = require('./structures/InteractionCollector');
 exports.InteractionResponse = require('./structures/InteractionResponse');
@@ -202,6 +206,7 @@ exports.SKU = require('./structures/SKU').SKU;
 exports.StringSelectMenuOptionBuilder = require('./structures/StringSelectMenuOptionBuilder');
 exports.StageChannel = require('./structures/StageChannel');
 exports.StageInstance = require('./structures/StageInstance').StageInstance;
+exports.Subscription = require('./structures/Subscription').Subscription;
 exports.Sticker = require('./structures/Sticker').Sticker;
 exports.StickerPack = require('./structures/StickerPack');
 exports.Team = require('./structures/Team');
@@ -215,6 +220,7 @@ exports.ThreadOnlyChannel = require('./structures/ThreadOnlyChannel');
 exports.Typing = require('./structures/Typing');
 exports.User = require('./structures/User');
 exports.UserContextMenuCommandInteraction = require('./structures/UserContextMenuCommandInteraction');
+exports.VoiceChannelEffect = require('./structures/VoiceChannelEffect');
 exports.VoiceChannel = require('./structures/VoiceChannel');
 exports.VoiceRegion = require('./structures/VoiceRegion');
 exports.VoiceState = require('./structures/VoiceState');

packages/discord.js/src/managers/ApplicationCommandManager.js

@@ -82,7 +82,7 @@ class ApplicationCommandManager extends CachedManager {
    * Options used to fetch Application Commands from Discord
    * @typedef {BaseFetchOptions} FetchApplicationCommandOptions
    * @property {Snowflake} [guildId] The guild's id to fetch commands for, for when the guild is not cached
-   * @property {LocaleString} [locale] The locale to use when fetching this command
+   * @property {Locale} [locale] The locale to use when fetching this command
    * @property {boolean} [withLocalizations] Whether to fetch all localization data
    */
 

packages/discord.js/src/managers/ApplicationEmojiManager.js

@@ -65,12 +65,12 @@ class ApplicationEmojiManager extends CachedManager {
    * @returns {Promise<ApplicationEmoji|Collection<Snowflake, ApplicationEmoji>>}
    * @example
    * // Fetch all emojis from the application
-   * message.application.emojis.fetch()
+   * application.emojis.fetch()
    *   .then(emojis => console.log(`There are ${emojis.size} emojis.`))
    *   .catch(console.error);
    * @example
    * // Fetch a single emoji
-   * message.application.emojis.fetch('222078108977594368')
+   * application.emojis.fetch('222078108977594368')
    *   .then(emoji => console.log(`The emoji name is: ${emoji.name}`))
    *   .catch(console.error);
    */

packages/discord.js/src/managers/BaseGuildEmojiManager.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const CachedManager = require('./CachedManager');
+const ApplicationEmoji = require('../structures/ApplicationEmoji');
 const GuildEmoji = require('../structures/GuildEmoji');
 const ReactionEmoji = require('../structures/ReactionEmoji');
 const { parseEmoji } = require('../util/Util');
@@ -25,7 +26,8 @@ class BaseGuildEmojiManager extends CachedManager {
    * * A Snowflake
    * * A GuildEmoji object
    * * A ReactionEmoji object
-   * @typedef {Snowflake|GuildEmoji|ReactionEmoji} EmojiResolvable
+   * * An ApplicationEmoji object
+   * @typedef {Snowflake|GuildEmoji|ReactionEmoji|ApplicationEmoji} EmojiResolvable
    */
 
   /**
@@ -34,7 +36,8 @@ class BaseGuildEmojiManager extends CachedManager {
    * @returns {?GuildEmoji}
    */
   resolve(emoji) {
-    if (emoji instanceof ReactionEmoji) return super.resolve(emoji.id);
+    if (emoji instanceof ReactionEmoji) return super.cache.get(emoji.id) ?? null;
+    if (emoji instanceof ApplicationEmoji) return super.cache.get(emoji.id) ?? null;
     return super.resolve(emoji);
   }
 
@@ -45,6 +48,7 @@ class BaseGuildEmojiManager extends CachedManager {
    */
   resolveId(emoji) {
     if (emoji instanceof ReactionEmoji) return emoji.id;
+    if (emoji instanceof ApplicationEmoji) return emoji.id;
     return super.resolveId(emoji);
   }
 
@@ -65,6 +69,7 @@ class BaseGuildEmojiManager extends CachedManager {
     const emojiResolvable = this.resolve(emoji);
     if (emojiResolvable) return emojiResolvable.identifier;
     if (emoji instanceof ReactionEmoji) return emoji.identifier;
+    if (emoji instanceof ApplicationEmoji) return emoji.identifier;
     if (typeof emoji === 'string') {
       const res = parseEmoji(emoji);
       if (res?.name.length) {

packages/discord.js/src/managers/EntitlementManager.js

@@ -37,6 +37,12 @@ class EntitlementManager extends CachedManager {
    * @typedef {SKU|Snowflake} SKUResolvable
    */
 
+  /**
+   * Options used to fetch an entitlement
+   * @typedef {BaseFetchOptions} FetchEntitlementOptions
+   * @property {EntitlementResolvable} entitlement The entitlement to fetch
+   */
+
   /**
    * Options used to fetch entitlements
    * @typedef {Object} FetchEntitlementsOptions
@@ -45,6 +51,7 @@ class EntitlementManager extends CachedManager {
    * @property {UserResolvable} [user] The user to fetch entitlements for
    * @property {SKUResolvable[]} [skus] The SKUs to fetch entitlements for
    * @property {boolean} [excludeEnded] Whether to exclude ended entitlements
+   * @property {boolean} [excludeDeleted] Whether to exclude deleted entitlements
    * @property {boolean} [cache=true] Whether to cache the fetched entitlements
    * @property {Snowflake} [before] Consider only entitlements before this entitlement id
    * @property {Snowflake} [after] Consider only entitlements after this entitlement id
@@ -53,21 +60,49 @@ class EntitlementManager extends CachedManager {
 
   /**
    * Fetches entitlements for this application
-   * @param {FetchEntitlementsOptions} [options={}] Options for fetching the entitlements
-   * @returns {Promise<Collection<Snowflake, Entitlement>>}
+   * @param {EntitlementResolvable|FetchEntitlementOptions|FetchEntitlementsOptions} [options]
+   * Options for fetching the entitlements
+   * @returns {Promise<Entitlement|Collection<Snowflake, Entitlement>>}
    */
-  async fetch({ limit, guild, user, skus, excludeEnded, cache = true, before, after } = {}) {
+  async fetch(options) {
+    if (!options) return this._fetchMany(options);
+    const { entitlement, cache, force } = options;
+    const resolvedEntitlement = this.resolveId(entitlement ?? options);
+
+    if (resolvedEntitlement) {
+      return this._fetchSingle({ entitlement: resolvedEntitlement, cache, force });
+    }
+
+    return this._fetchMany(options);
+  }
+
+  async _fetchSingle({ entitlement, cache, force = false }) {
+    if (!force) {
+      const existing = this.cache.get(entitlement);
+
+      if (existing) {
+        return existing;
+      }
+    }
+
+    const data = await this.client.rest.get(Routes.entitlement(this.client.application.id, entitlement));
+    return this._add(data, cache);
+  }
+
+  async _fetchMany({ limit, guild, user, skus, excludeEnded, excludeDeleted, cache, before, after } = {}) {
     const query = makeURLSearchParams({
       limit,
       guild_id: guild && this.client.guilds.resolveId(guild),
       user_id: user && this.client.users.resolveId(user),
       sku_ids: skus?.map(sku => resolveSKUId(sku)).join(','),
       exclude_ended: excludeEnded,
+      exclude_deleted: excludeDeleted,
       before,
       after,
     });
 
     const entitlements = await this.client.rest.get(Routes.entitlements(this.client.application.id), { query });
+
     return entitlements.reduce(
       (coll, entitlement) => coll.set(entitlement.id, this._add(entitlement, cache)),
       new Collection(),

packages/discord.js/src/managers/GuildBanManager.js

@@ -175,7 +175,7 @@ class GuildBanManager extends CachedManager {
       reason: options.reason,
     });
     if (user instanceof GuildMember) return user;
-    const _user = this.client.users.resolve(id);
+    const _user = this.client.users.cache.get(id);
     if (_user) {
       return this.guild.members.resolve(_user) ?? _user;
     }

packages/discord.js/src/managers/GuildChannelManager.js

@@ -84,7 +84,7 @@ class GuildChannelManager extends CachedManager {
    * @returns {?(GuildChannel|ThreadChannel)}
    */
   resolve(channel) {
-    if (channel instanceof ThreadChannel) return super.resolve(channel.id);
+    if (channel instanceof ThreadChannel) return super.cache.get(channel.id) ?? null;
     return super.resolve(channel);
   }
 
@@ -287,7 +287,7 @@ class GuildChannelManager extends CachedManager {
     const resolvedChannel = this.resolve(channel);
     if (!resolvedChannel) throw new DiscordjsTypeError(ErrorCodes.InvalidType, 'channel', 'GuildChannelResolvable');
 
-    const parent = options.parent && this.client.channels.resolveId(options.parent);
+    const parentId = options.parent && this.client.channels.resolveId(options.parent);
 
     if (options.position !== undefined) {
       await this.setPosition(resolvedChannel, options.position, { position: options.position, reason: options.reason });
@@ -298,8 +298,8 @@ class GuildChannelManager extends CachedManager {
     );
 
     if (options.lockPermissions) {
-      if (parent) {
-        const newParent = this.guild.channels.resolve(parent);
+      if (parentId) {
+        const newParent = this.cache.get(parentId);
         if (newParent?.type === ChannelType.GuildCategory) {
           permission_overwrites = newParent.permissionOverwrites.cache.map(overwrite =>
             PermissionOverwrites.resolve(overwrite, this.guild),
@@ -322,7 +322,7 @@ class GuildChannelManager extends CachedManager {
         user_limit: options.userLimit,
         rtc_region: options.rtcRegion,
         video_quality_mode: options.videoQualityMode,
-        parent_id: parent,
+        parent_id: parentId,
         lock_permissions: options.lockPermissions,
         rate_limit_per_user: options.rateLimitPerUser,
         default_auto_archive_duration: options.defaultAutoArchiveDuration,

packages/discord.js/src/managers/GuildMemberManager.js

@@ -55,7 +55,7 @@ class GuildMemberManager extends CachedManager {
     const memberResolvable = super.resolve(member);
     if (memberResolvable) return memberResolvable;
     const userResolvable = this.client.users.resolveId(member);
-    if (userResolvable) return super.resolve(userResolvable);
+    if (userResolvable) return super.cache.get(userResolvable) ?? null;
     return null;
   }
 
@@ -144,7 +144,7 @@ class GuildMemberManager extends CachedManager {
    */
   get me() {
     return (
-      this.resolve(this.client.user.id) ??
+      this.cache.get(this.client.user.id) ??
       (this.client.options.partials.includes(Partials.GuildMember)
         ? this._add({ user: { id: this.client.user.id } }, true)
         : null)
@@ -535,7 +535,7 @@ class GuildMemberManager extends CachedManager {
    */
   async addRole(options) {
     const { user, role, reason } = options;
-    const userId = this.guild.members.resolveId(user);
+    const userId = this.resolveId(user);
     const roleId = this.guild.roles.resolveId(role);
     await this.client.rest.put(Routes.guildMemberRole(this.guild.id, userId, roleId), { reason });
 
@@ -549,7 +549,7 @@ class GuildMemberManager extends CachedManager {
    */
   async removeRole(options) {
     const { user, role, reason } = options;
-    const userId = this.guild.members.resolveId(user);
+    const userId = this.resolveId(user);
     const roleId = this.guild.roles.resolveId(role);
     await this.client.rest.delete(Routes.guildMemberRole(this.guild.id, userId, roleId), { reason });
 

packages/discord.js/src/managers/GuildMemberRoleManager.js

@@ -101,6 +101,8 @@ class GuildMemberRoleManager extends DataManager {
 
   /**
    * Adds a role (or multiple roles) to the member.
+   *
+   * <info>Uses the idempotent PUT route for singular roles, otherwise PATCHes the underlying guild member</info>
    * @param {RoleResolvable|RoleResolvable[]|Collection<Snowflake, Role>} roleOrRoles The role or roles to add
    * @param {string} [reason] Reason for adding the role(s)
    * @returns {Promise<GuildMember>}
@@ -138,6 +140,8 @@ class GuildMemberRoleManager extends DataManager {
 
   /**
    * Removes a role (or multiple roles) from the member.
+   *
+   * <info>Uses the idempotent DELETE route for singular roles, otherwise PATCHes the underlying guild member</info>
    * @param {RoleResolvable|RoleResolvable[]|Collection<Snowflake, Role>} roleOrRoles The role or roles to remove
    * @param {string} [reason] Reason for removing the role(s)
    * @returns {Promise<GuildMember>}

packages/discord.js/src/managers/GuildScheduledEventManager.js

@@ -7,6 +7,7 @@ const CachedManager = require('./CachedManager');
 const { DiscordjsTypeError, DiscordjsError, ErrorCodes } = require('../errors');
 const { GuildScheduledEvent } = require('../structures/GuildScheduledEvent');
 const { resolveImage } = require('../util/DataResolver');
+const { _transformGuildScheduledEventRecurrenceRule } = require('../util/Transformers');
 
 /**
  * Manages API methods for GuildScheduledEvents and stores their cache.
@@ -36,6 +37,21 @@ class GuildScheduledEventManager extends CachedManager {
    * @typedef {Snowflake|GuildScheduledEvent} GuildScheduledEventResolvable
    */
 
+  /**
+   * Options for setting a recurrence rule for a guild scheduled event.
+   * @typedef {Object} GuildScheduledEventRecurrenceRuleOptions
+   * @property {DateResolvable} startAt The time the recurrence rule interval starts at
+   * @property {?DateResolvable} endAt The time the recurrence rule interval ends at
+   * @property {GuildScheduledEventRecurrenceRuleFrequency} frequency How often the event occurs
+   * @property {number} interval The spacing between the events
+   * @property {?GuildScheduledEventRecurrenceRuleWeekday[]} byWeekday The days within a week to recur on
+   * @property {?GuildScheduledEventRecurrenceRuleNWeekday[]} byNWeekday The days within a week to recur on
+   * @property {?GuildScheduledEventRecurrenceRuleMonth[]} byMonth The months to recur on
+   * @property {?number[]} byMonthDay The days within a month to recur on
+   * @property {?number[]} byYearDay The days within a year to recur on
+   * @property {?number} count The total amount of times the event is allowed to recur before stopping
+   */
+
   /**
    * Options used to create a guild scheduled event.
    * @typedef {Object} GuildScheduledEventCreateOptions
@@ -54,6 +70,8 @@ class GuildScheduledEventManager extends CachedManager {
    * <warn>This is required if `entityType` is {@link GuildScheduledEventEntityType.External}</warn>
    * @property {?(BufferResolvable|Base64Resolvable)} [image] The cover image of the guild scheduled event
    * @property {string} [reason] The reason for creating the guild scheduled event
+   * @property {GuildScheduledEventRecurrenceRuleOptions} [recurrenceRule]
+   * The recurrence rule of the guild scheduled event
    */
 
   /**
@@ -81,6 +99,7 @@ class GuildScheduledEventManager extends CachedManager {
       entityMetadata,
       reason,
       image,
+      recurrenceRule,
     } = options;
 
     let entity_metadata, channel_id;
@@ -104,6 +123,7 @@ class GuildScheduledEventManager extends CachedManager {
         entity_type: entityType,
         entity_metadata,
         image: image && (await resolveImage(image)),
+        recurrence_rule: recurrenceRule && _transformGuildScheduledEventRecurrenceRule(recurrenceRule),
       },
       reason,
     });
@@ -153,10 +173,7 @@ class GuildScheduledEventManager extends CachedManager {
 
     return data.reduce(
       (coll, rawGuildScheduledEventData) =>
-        coll.set(
-          rawGuildScheduledEventData.id,
-          this.guild.scheduledEvents._add(rawGuildScheduledEventData, options.cache),
-        ),
+        coll.set(rawGuildScheduledEventData.id, this._add(rawGuildScheduledEventData, options.cache)),
       new Collection(),
     );
   }
@@ -178,6 +195,8 @@ class GuildScheduledEventManager extends CachedManager {
    * {@link GuildScheduledEventEntityType.External}</warn>
    * @property {?(BufferResolvable|Base64Resolvable)} [image] The cover image of the guild scheduled event
    * @property {string} [reason] The reason for editing the guild scheduled event
+   * @property {?GuildScheduledEventRecurrenceRuleOptions} [recurrenceRule]
+   * The recurrence rule of the guild scheduled event
    */
 
   /**
@@ -203,6 +222,7 @@ class GuildScheduledEventManager extends CachedManager {
       entityMetadata,
       reason,
       image,
+      recurrenceRule,
     } = options;
 
     let entity_metadata;
@@ -224,6 +244,7 @@ class GuildScheduledEventManager extends CachedManager {
         status,
         image: image && (await resolveImage(image)),
         entity_metadata,
+        recurrence_rule: recurrenceRule && _transformGuildScheduledEventRecurrenceRule(recurrenceRule),
       },
       reason,
     });

packages/discord.js/src/managers/PresenceManager.js

@@ -38,8 +38,8 @@ class PresenceManager extends CachedManager {
   resolve(presence) {
     const presenceResolvable = super.resolve(presence);
     if (presenceResolvable) return presenceResolvable;
-    const UserResolvable = this.client.users.resolveId(presence);
-    return super.resolve(UserResolvable);
+    const userId = this.client.users.resolveId(presence);
+    return super.cache.get(userId) ?? null;
   }
 
   /**
@@ -50,8 +50,8 @@ class PresenceManager extends CachedManager {
   resolveId(presence) {
     const presenceResolvable = super.resolveId(presence);
     if (presenceResolvable) return presenceResolvable;
-    const userResolvable = this.client.users.resolveId(presence);
-    return this.cache.has(userResolvable) ? userResolvable : null;
+    const userId = this.client.users.resolveId(presence);
+    return this.cache.has(userId) ? userId : null;
   }
 }
 

packages/discord.js/src/managers/SubscriptionManager.js

@@ -0,0 +1,81 @@
+'use strict';
+
+const { Collection } = require('@discordjs/collection');
+const { makeURLSearchParams } = require('@discordjs/rest');
+const { Routes } = require('discord-api-types/v10');
+const CachedManager = require('./CachedManager');
+const { DiscordjsTypeError, ErrorCodes } = require('../errors/index');
+const { Subscription } = require('../structures/Subscription');
+const { resolveSKUId } = require('../util/Util');
+
+/**
+ * Manages API methods for subscriptions and stores their cache.
+ * @extends {CachedManager}
+ */
+class SubscriptionManager extends CachedManager {
+  constructor(client, iterable) {
+    super(client, Subscription, iterable);
+  }
+
+  /**
+   * The cache of this manager
+   * @type {Collection<Snowflake, Subscription>}
+   * @name SubscriptionManager#cache
+   */
+
+  /**
+   * Options used to fetch a subscription
+   * @typedef {BaseFetchOptions} FetchSubscriptionOptions
+   * @property {SKUResolvable} sku The SKU to fetch the subscription for
+   * @property {Snowflake} subscriptionId The id of the subscription to fetch
+   */
+
+  /**
+   * Options used to fetch subscriptions
+   * @typedef {Object} FetchSubscriptionsOptions
+   * @property {Snowflake} [after] Consider only subscriptions after this subscription id
+   * @property {Snowflake} [before] Consider only subscriptions before this subscription id
+   * @property {number} [limit] The maximum number of subscriptions to fetch
+   * @property {SKUResolvable} sku The SKU to fetch subscriptions for
+   * @property {UserResolvable} user The user to fetch entitlements for
+   * <warn>If both `before` and `after` are provided, only `before` is respected</warn>
+   */
+
+  /**
+   * Fetches subscriptions for this application
+   * @param {FetchSubscriptionOptions|FetchSubscriptionsOptions} [options={}] Options for fetching the subscriptions
+   * @returns {Promise<Subscription|Collection<Snowflake, Subscription>>}
+   */
+  async fetch(options = {}) {
+    if (typeof options !== 'object') throw new DiscordjsTypeError(ErrorCodes.InvalidType, 'options', 'object', true);
+
+    const { after, before, cache, limit, sku, subscriptionId, user } = options;
+
+    const skuId = resolveSKUId(sku);
+
+    if (!skuId) throw new DiscordjsTypeError(ErrorCodes.InvalidType, 'sku', 'SKUResolvable');
+
+    if (subscriptionId) {
+      const subscription = await this.client.rest.get(Routes.skuSubscription(skuId, subscriptionId));
+
+      return this._add(subscription, cache);
+    }
+
+    const query = makeURLSearchParams({
+      limit,
+      user_id: this.client.users.resolveId(user) ?? undefined,
+      sku_id: skuId,
+      before,
+      after,
+    });
+
+    const subscriptions = await this.client.rest.get(Routes.skuSubscriptions(skuId), { query });
+
+    return subscriptions.reduce(
+      (coll, subscription) => coll.set(subscription.id, this._add(subscription, cache)),
+      new Collection(),
+    );
+  }
+}
+
+exports.SubscriptionManager = SubscriptionManager;

packages/discord.js/src/managers/ThreadMemberManager.js

@@ -1,11 +1,15 @@
 'use strict';
 
+const process = require('node:process');
 const { Collection } = require('@discordjs/collection');
 const { makeURLSearchParams } = require('@discordjs/rest');
 const { Routes } = require('discord-api-types/v10');
 const CachedManager = require('./CachedManager');
 const { DiscordjsTypeError, ErrorCodes } = require('../errors');
 const ThreadMember = require('../structures/ThreadMember');
+const { emitDeprecationWarningForRemoveThreadMember } = require('../util/Util');
+
+let deprecationEmittedForAdd = false;
 
 /**
  * Manages API methods for GuildMembers and stores their cache.
@@ -53,7 +57,7 @@ class ThreadMemberManager extends CachedManager {
    * @readonly
    */
   get me() {
-    return this.resolve(this.client.user.id);
+    return this.cache.get(this.client.user.id) ?? null;
   }
 
   /**
@@ -71,8 +75,8 @@ class ThreadMemberManager extends CachedManager {
   resolve(member) {
     const memberResolvable = super.resolve(member);
     if (memberResolvable) return memberResolvable;
-    const userResolvable = this.client.users.resolveId(member);
-    if (userResolvable) return super.resolve(userResolvable);
+    const userId = this.client.users.resolveId(member);
+    if (userId) return super.cache.get(userId) ?? null;
     return null;
   }
 
@@ -92,9 +96,20 @@ class ThreadMemberManager extends CachedManager {
    * Adds a member to the thread.
    * @param {UserResolvable|'@me'} member The member to add
    * @param {string} [reason] The reason for adding this member
+   * <warn>This parameter is **deprecated**. Reasons cannot be used.</warn>
    * @returns {Promise<Snowflake>}
    */
   async add(member, reason) {
+    if (reason !== undefined && !deprecationEmittedForAdd) {
+      process.emitWarning(
+        // eslint-disable-next-line max-len
+        'The reason parameter of ThreadMemberManager#add() is deprecated as Discord does not parse them. It will be removed in the next major version.',
+        'DeprecationWarning',
+      );
+
+      deprecationEmittedForAdd = true;
+    }
+
     const id = member === '@me' ? member : this.client.users.resolveId(member);
     if (!id) throw new DiscordjsTypeError(ErrorCodes.InvalidType, 'member', 'UserResolvable');
     await this.client.rest.put(Routes.threadMembers(this.thread.id, id), { reason });
@@ -105,9 +120,14 @@ class ThreadMemberManager extends CachedManager {
    * Remove a user from the thread.
    * @param {UserResolvable|'@me'} member The member to remove
    * @param {string} [reason] The reason for removing this member from the thread
+   * <warn>This parameter is **deprecated**. Reasons cannot be used.</warn>
    * @returns {Promise<Snowflake>}
    */
   async remove(member, reason) {
+    if (reason !== undefined) {
+      emitDeprecationWarningForRemoveThreadMember(this.constructor.name);
+    }
+
     const id = member === '@me' ? member : this.client.users.resolveId(member);
     if (!id) throw new DiscordjsTypeError(ErrorCodes.InvalidType, 'member', 'UserResolvable');
     await this.client.rest.delete(Routes.threadMembers(this.thread.id, id), { reason });

packages/discord.js/src/managers/UserManager.js

@@ -7,6 +7,7 @@ const { GuildMember } = require('../structures/GuildMember');
 const { Message } = require('../structures/Message');
 const ThreadMember = require('../structures/ThreadMember');
 const User = require('../structures/User');
+const { emitDeprecationWarningForUserFetchFlags } = require('../util/Util');
 
 /**
  * Manages API methods for users and stores their cache.
@@ -100,8 +101,11 @@ class UserManager extends CachedManager {
    * @param {UserResolvable} user The UserResolvable to identify
    * @param {BaseFetchOptions} [options] Additional options for this fetch
    * @returns {Promise<UserFlagsBitField>}
+   * @deprecated <warn>This method is deprecated and will be removed in the next major version.
+   * Flags may still be retrieved via {@link UserManager#fetch}.</warn>
    */
   async fetchFlags(user, options) {
+    emitDeprecationWarningForUserFetchFlags(this.constructor.name);
     return (await this.fetch(user, options)).flags;
   }
 

packages/discord.js/src/sharding/ShardClientUtil.js

@@ -8,7 +8,7 @@ const { makeError, makePlainError } = require('../util/Util');
 
 /**
  * Helper class for sharded clients spawned as a child process/worker, such as from a {@link ShardingManager}.
- * Utilises IPC to send and receive data to/from the master process and other shards.
+ * Utilizes IPC to send and receive data to/from the master process and other shards.
  */
 class ShardClientUtil {
   constructor(client, mode) {

packages/discord.js/src/sharding/ShardingManager.js

@@ -14,7 +14,7 @@ const { fetchRecommendedShardCount } = require('../util/Util');
  * This is a utility class that makes multi-process sharding of a bot an easy and painless experience.
  * It works by spawning a self-contained {@link ChildProcess} or {@link Worker} for each individual shard, each
  * containing its own instance of your bot's {@link Client}. They all have a line of communication with the master
- * process, and there are several useful methods that utilise it in order to simplify tasks that are normally difficult
+ * process, and there are several useful methods that utilize it in order to simplify tasks that are normally difficult
  * with sharding. It can spawn a specific number of shards or the amount that Discord suggests for the bot, and takes a
  * path to your main bot script to launch for each one.
  * @extends {EventEmitter}

packages/discord.js/src/structures/ApplicationCommand.js

@@ -418,7 +418,7 @@ class ApplicationCommand extends Base {
         command.descriptionLocalizations ?? command.description_localizations ?? {},
         this.descriptionLocalizations ?? {},
       ) ||
-      !isEqual(command.integrationTypes ?? command.integration_types ?? [], this.integrationTypes ?? {}) ||
+      !isEqual(command.integrationTypes ?? command.integration_types ?? [], this.integrationTypes ?? []) ||
       !isEqual(command.contexts ?? [], this.contexts ?? [])
     ) {
       return false;

packages/discord.js/src/structures/BaseChannel.js

@@ -155,6 +155,14 @@ class BaseChannel extends Base {
     return 'availableTags' in this;
   }
 
+  /**
+   * Indicates whether this channel is sendable.
+   * @returns {boolean}
+   */
+  isSendable() {
+    return 'send' in this;
+  }
+
   toJSON(...props) {
     return super.toJSON({ createdTimestamp: true }, ...props);
   }

packages/discord.js/src/structures/BaseInteraction.js

@@ -107,6 +107,21 @@ class BaseInteraction extends Base {
       (coll, entitlement) => coll.set(entitlement.id, this.client.application.entitlements._add(entitlement)),
       new Collection(),
     );
+
+    /* eslint-disable max-len */
+    /**
+     * Mapping of installation contexts that the interaction was authorized for the related user or guild ids
+     * @type {APIAuthorizingIntegrationOwnersMap}
+     * @see {@link https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object-authorizing-integration-owners-object}
+     */
+    this.authorizingIntegrationOwners = data.authorizing_integration_owners;
+    /* eslint-enable max-len */
+
+    /**
+     * Context where the interaction was triggered from
+     * @type {?InteractionContextType}
+     */
+    this.context = data.context ?? null;
   }
 
   /**

packages/discord.js/src/structures/ClientApplication.js

@@ -9,6 +9,7 @@ const Application = require('./interfaces/Application');
 const ApplicationCommandManager = require('../managers/ApplicationCommandManager');
 const ApplicationEmojiManager = require('../managers/ApplicationEmojiManager');
 const { EntitlementManager } = require('../managers/EntitlementManager');
+const { SubscriptionManager } = require('../managers/SubscriptionManager');
 const ApplicationFlagsBitField = require('../util/ApplicationFlagsBitField');
 const { resolveImage } = require('../util/DataResolver');
 const PermissionsBitField = require('../util/PermissionsBitField');
@@ -44,6 +45,12 @@ class ClientApplication extends Application {
      * @type {EntitlementManager}
      */
     this.entitlements = new EntitlementManager(this.client);
+
+    /**
+     * The subscription manager for this application
+     * @type {SubscriptionManager}
+     */
+    this.subscriptions = new SubscriptionManager(this.client);
   }
 
   _patch(data) {
@@ -236,6 +243,36 @@ class ClientApplication extends Application {
       this.roleConnectionsVerificationURL ??= null;
     }
 
+    if ('event_webhooks_url' in data) {
+      /**
+       * This application's URL to receive event webhooks
+       * @type {?string}
+       */
+      this.eventWebhooksURL = data.event_webhooks_url;
+    } else {
+      this.eventWebhooksURL ??= null;
+    }
+
+    if ('event_webhooks_status' in data) {
+      /**
+       * This application's event webhooks status
+       * @type {?ApplicationWebhookEventStatus}
+       */
+      this.eventWebhooksStatus = data.event_webhooks_status;
+    } else {
+      this.eventWebhooksStatus ??= null;
+    }
+
+    if ('event_webhooks_types' in data) {
+      /**
+       * List of event webhooks types this application subscribes to
+       * @type {?ApplicationWebhookEventType[]}
+       */
+      this.eventWebhooksTypes = data.event_webhooks_types;
+    } else {
+      this.eventWebhooksTypes ??= null;
+    }
+
     /**
      * The owner of this OAuth application
      * @type {?(User|Team)}
@@ -277,6 +314,10 @@ class ClientApplication extends Application {
    * @property {?(BufferResolvable|Base64Resolvable)} [icon] The application's icon
    * @property {?(BufferResolvable|Base64Resolvable)} [coverImage] The application's cover image
    * @property {string} [interactionsEndpointURL] The application's interaction endpoint URL
+   * @property {string} [eventWebhooksURL] The application's event webhooks URL
+   * @property {ApplicationWebhookEventStatus.Enabled|ApplicationWebhookEventStatus.Disabled} [eventWebhooksStatus]
+   * The application's event webhooks status.
+   * @property {ApplicationWebhookEventType[]} [eventWebhooksTypes] The application's event webhooks types
    * @property {string[]} [tags] The application's tags
    */
 
@@ -294,6 +335,9 @@ class ClientApplication extends Application {
     icon,
     coverImage,
     interactionsEndpointURL,
+    eventWebhooksURL,
+    eventWebhooksStatus,
+    eventWebhooksTypes,
     tags,
   } = {}) {
     const data = await this.client.rest.patch(Routes.currentApplication(), {
@@ -306,6 +350,9 @@ class ClientApplication extends Application {
         icon: icon && (await resolveImage(icon)),
         cover_image: coverImage && (await resolveImage(coverImage)),
         interactions_endpoint_url: interactionsEndpointURL,
+        event_webhooks_url: eventWebhooksURL,
+        event_webhooks_status: eventWebhooksStatus,
+        event_webhooks_types: eventWebhooksTypes,
         tags,
       },
     });

packages/discord.js/src/structures/CommandInteraction.js

@@ -45,21 +45,6 @@ class CommandInteraction extends BaseInteraction {
      */
     this.commandGuildId = data.data.guild_id ?? null;
 
-    /* eslint-disable max-len */
-    /**
-     * Mapping of installation contexts that the interaction was authorized for the related user or guild ids
-     * @type {APIAuthorizingIntegrationOwnersMap}
-     * @see {@link https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object-authorizing-integration-owners-object}
-     */
-    this.authorizingIntegrationOwners = data.authorizing_integration_owners;
-    /* eslint-enable max-len */
-
-    /**
-     * Context where the interaction was triggered from
-     * @type {?InteractionContextType}
-     */
-    this.context = data.context ?? null;
-
     /**
      * Whether the reply to this interaction has been deferred
      * @type {boolean}

packages/discord.js/src/structures/Entitlement.js

@@ -73,10 +73,9 @@ class Entitlement extends Base {
     if ('starts_at' in data) {
       /**
        * The timestamp at which this entitlement is valid
-       * <info>This is only `null` for test entitlements</info>
        * @type {?number}
        */
-      this.startsTimestamp = Date.parse(data.starts_at);
+      this.startsTimestamp = data.starts_at ? Date.parse(data.starts_at) : null;
     } else {
       this.startsTimestamp ??= null;
     }
@@ -84,10 +83,9 @@ class Entitlement extends Base {
     if ('ends_at' in data) {
       /**
        * The timestamp at which this entitlement is no longer valid
-       * <info>This is only `null` for test entitlements</info>
        * @type {?number}
        */
-      this.endsTimestamp = Date.parse(data.ends_at);
+      this.endsTimestamp = data.ends_at ? Date.parse(data.ends_at) : null;
     } else {
       this.endsTimestamp ??= null;
     }
@@ -114,7 +112,6 @@ class Entitlement extends Base {
 
   /**
    * The start date at which this entitlement is valid
-   * <info>This is only `null` for test entitlements</info>
    * @type {?Date}
    */
   get startsAt() {
@@ -123,7 +120,6 @@ class Entitlement extends Base {
 
   /**
    * The end date at which this entitlement is no longer valid
-   * <info>This is only `null` for test entitlements</info>
    * @type {?Date}
    */
   get endsAt() {