chore: make requested changes

discordjs · Apr 9, 2022 · 0a330f6 · 0a330f6
1 parent 2d025a3
commit 0a330f6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/packages/builders/src/interactions/slashCommands/Assertions.ts b/packages/builders/src/interactions/slashCommands/Assertions.ts
@@ -1,5 +1,5 @@
 import is from '@sindresorhus/is';
-import { type APIApplicationCommandOptionChoice, Locale, type LocaleString } from 'discord-api-types/v10';
+import { type APIApplicationCommandOptionChoice, Locale } from 'discord-api-types/v10';
 import { s } from '@sapphire/shapeshift';
 import type { ApplicationCommandOptionBase } from './mixins/ApplicationCommandOptionBase';
 import type { ToAPIApplicationCommandOptions } from './SlashCommandBuilder';
@@ -22,8 +22,8 @@ export function validateDescription(description: unknown): asserts description i
 }
 
 const maxArrayLengthPredicate = s.unknown.array.lengthLe(25);
-export function validateLocale(locale: unknown): asserts locale is LocaleString {
-	localePredicate.parse(locale);
+export function validateLocale(locale: unknown) {
+	return localePredicate.parse(locale);
 }
 
 export function validateMaxOptionsLength(options: unknown): asserts options is ToAPIApplicationCommandOptions[] {

diff --git a/packages/builders/src/interactions/slashCommands/SlashCommandBuilder.ts b/packages/builders/src/interactions/slashCommands/SlashCommandBuilder.ts
@@ -1,6 +1,6 @@
 import type {
 	APIApplicationCommandOption,
-	LocaleString,
+	LocalizationMap,
 	RESTPostAPIApplicationCommandsJSONBody,
 } from 'discord-api-types/v10';
 import { mix } from 'ts-mixer';
@@ -24,7 +24,7 @@ export class SlashCommandBuilder {
 	/**
 	 * The localized names for this command
 	 */
-	public readonly name_localizations?: Partial<Record<LocaleString, string>> = undefined;
+	public readonly name_localizations?: LocalizationMap;
 
 	/**
 	 * The description of this slash command
@@ -34,7 +34,7 @@ export class SlashCommandBuilder {
 	/**
 	 * The localized descriptions for this command
 	 */
-	public readonly description_localizations?: Partial<Record<LocaleString, string>> = undefined;
+	public readonly description_localizations?: LocalizationMap;
 
 	/**
 	 * The options of this slash command

diff --git a/packages/builders/src/interactions/slashCommands/mixins/NameAndDescription.ts b/packages/builders/src/interactions/slashCommands/mixins/NameAndDescription.ts
@@ -47,16 +47,14 @@ export class SharedNameAndDescription {
 			Reflect.set(this, 'name_localizations', {});
 		}
 
-		validateLocale(locale);
-
 		if (localizedName === null) {
 			this.name_localizations![locale] = null;
 			return this;
 		}
 
 		validateName(localizedName);
 
-		this.name_localizations![locale] = localizedName;
+		this.name_localizations![validateLocale(locale)] = localizedName;
 		return this;
 	}
 
@@ -87,16 +85,14 @@ export class SharedNameAndDescription {
 			Reflect.set(this, 'description_localizations', {});
 		}
 
-		validateLocale(locale);
-
 		if (localizedDescription === null) {
 			this.description_localizations![locale] = null;
 			return this;
 		}
 
 		validateDescription(localizedDescription);
 
-		this.description_localizations![locale] = localizedDescription;
+		this.description_localizations![validateLocale(locale)] = localizedDescription;
 		return this;
 	}