Merge branch 'main' into docs/remove-hardcoded-locales

discordjs · Mar 7, 2025 · 19dd257 · 19dd257
2 parents 66b355c + 12638cd
commit 19dd257
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/packages/builders/__tests__/messages/embed.test.ts b/packages/builders/__tests__/messages/embed.test.ts
@@ -207,6 +207,12 @@ describe('Embed', () => {
 			expect(embed.toJSON()).toStrictEqual({ ...base, thumbnail: { url: 'https://discord.js.org/static/logo.svg' } });
 		});
 
+		test('GIVEN an embed using Embed#setThumbnail with attachment protocol THEN returns valid toJSON data', () => {
+			const embed = new EmbedBuilder();
+			embed.setThumbnail('attachment://discordjs.webp');
+			expect(embed.toJSON()).toStrictEqual({ ...base, thumbnail: { url: 'attachment://discordjs.webp' } });
+		});
+
 		test('GIVEN an embed with a pre-defined thumbnail THEN unset thumbnail THEN return valid toJSON data', () => {
 			const embed = new EmbedBuilder({ thumbnail: { url: 'https://discord.js.org/static/logo.svg' }, ...dummy });
 			embed.clearThumbnail();
@@ -228,6 +234,12 @@ describe('Embed', () => {
 			expect(embed.toJSON()).toStrictEqual({ ...base, image: { url: 'https://discord.js.org/static/logo.svg' } });
 		});
 
+		test('GIVEN an embed using Embed#setImage with attachment protocol THEN returns valid toJSON data', () => {
+			const embed = new EmbedBuilder();
+			embed.setImage('attachment://discordjs.webp');
+			expect(embed.toJSON()).toStrictEqual({ ...base, image: { url: 'attachment://discordjs.webp' } });
+		});
+
 		test('GIVEN an embed using Embed#setImage THEN returns valid toJSON data', () => {
 			const embed = new EmbedBuilder();
 			embed.setImage('https://discord.js.org/static/logo.svg');

diff --git a/packages/builders/src/messages/embed/Assertions.ts b/packages/builders/src/messages/embed/Assertions.ts
@@ -4,17 +4,17 @@ import { embedLength } from '../../util/componentUtil.js';
 
 const namePredicate = z.string().max(256);
 
-const iconURLPredicate = z
+const URLPredicate = z
 	.string()
 	.url()
-	.refine(refineURLPredicate(['http:', 'https:', 'attachment:']), {
-		message: 'Invalid protocol for icon URL. Must be http:, https:, or attachment:',
-	});
+	.refine(refineURLPredicate(['http:', 'https:']), { message: 'Invalid protocol for URL. Must be http: or https:' });
 
-const URLPredicate = z
+const URLWithAttachmentProtocolPredicate = z
 	.string()
 	.url()
-	.refine(refineURLPredicate(['http:', 'https:']), { message: 'Invalid protocol for URL. Must be http: or https:' });
+	.refine(refineURLPredicate(['http:', 'https:', 'attachment:']), {
+		message: 'Invalid protocol for URL. Must be http:, https:, or attachment:',
+	});
 
 export const embedFieldPredicate = z.object({
 	name: namePredicate,
@@ -24,13 +24,13 @@ export const embedFieldPredicate = z.object({
 
 export const embedAuthorPredicate = z.object({
 	name: namePredicate.min(1),
-	icon_url: iconURLPredicate.optional(),
+	icon_url: URLWithAttachmentProtocolPredicate.optional(),
 	url: URLPredicate.optional(),
 });
 
 export const embedFooterPredicate = z.object({
 	text: z.string().min(1).max(2_048),
-	icon_url: iconURLPredicate.optional(),
+	icon_url: URLWithAttachmentProtocolPredicate.optional(),
 });
 
 export const embedPredicate = z
@@ -41,8 +41,8 @@ export const embedPredicate = z
 		timestamp: z.string().optional(),
 		color: z.number().int().min(0).max(0xffffff).optional(),
 		footer: embedFooterPredicate.optional(),
-		image: z.object({ url: URLPredicate }).optional(),
-		thumbnail: z.object({ url: URLPredicate }).optional(),
+		image: z.object({ url: URLWithAttachmentProtocolPredicate }).optional(),
+		thumbnail: z.object({ url: URLWithAttachmentProtocolPredicate }).optional(),
 		author: embedAuthorPredicate.optional(),
 		fields: z.array(embedFieldPredicate).max(25).optional(),
 	})

diff --git a/packages/discord.js/src/managers/GuildMemberManager.js b/packages/discord.js/src/managers/GuildMemberManager.js
@@ -223,7 +223,7 @@ class GuildMemberManager extends CachedManager {
     query: initialQuery,
     time = 120e3,
     nonce = DiscordSnowflake.generate().toString(),
-  }) {
+  } = {}) {
     if (nonce.length > 32) throw new DiscordjsRangeError(ErrorCodes.MemberFetchNonceLength);
 
     const query = initialQuery || (!users ? '' : undefined);