Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(CommandInteraction): change options type from Collection to array #6139

Merged
merged 1 commit into from Jul 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions typings/index.d.ts
Expand Up @@ -416,7 +416,6 @@ export class CommandInteraction extends Interaction {
public reply(options: InteractionReplyOptions & { fetchReply: true }): Promise<Message | APIMessage>;
public reply(options: string | MessagePayload | InteractionReplyOptions): Promise<void>;
private transformOption(option: unknown, resolved: unknown): CommandInteractionOption;
private _createOptionsCollection(options: unknown, resolved: unknown): Collection<string, CommandInteractionOption>;
}

export class CommandInteractionOptionResolver {
Expand Down Expand Up @@ -3024,7 +3023,7 @@ export interface CommandInteractionOption {
name: string;
type: ApplicationCommandOptionType;
value?: string | number | boolean;
options?: Collection<string, CommandInteractionOption>;
options?: CommandInteractionOption[];
user?: User;
member?: GuildMember | APIInteractionDataResolvedGuildMember;
channel?: GuildChannel | APIInteractionDataResolvedChannel;
Expand Down
24 changes: 24 additions & 0 deletions typings/index.ts
Expand Up @@ -8,6 +8,9 @@ import {
ClientApplication,
ClientUser,
Collection,
CommandInteraction,
CommandInteractionOption,
CommandInteractionOptionResolver,
Constants,
DMChannel,
Guild,
Expand Down Expand Up @@ -646,4 +649,25 @@ client.on('messageReactionAdd', async reaction => {

// Test interactions
declare const interaction: Interaction;
declare const booleanValue: boolean;
if (interaction.inGuild()) assertType<Snowflake>(interaction.guildId);

client.on('interactionCreate', async interaction => {
if (interaction.isCommand()) {
assertType<CommandInteraction>(interaction);
assertType<CommandInteractionOptionResolver>(interaction.options);

const optionalOption = interaction.options.get('name');
const requiredOption = interaction.options.get('name', true);
assertType<CommandInteractionOption | null>(optionalOption);
assertType<CommandInteractionOption>(requiredOption);
assertType<CommandInteractionOption[] | undefined>(requiredOption.options);

assertType<string | null>(interaction.options.getString('name', booleanValue));
assertType<string | null>(interaction.options.getString('name', false));
assertType<string>(interaction.options.getString('name', true));

assertType<string>(interaction.options.getSubCommand());
assertType<string>(interaction.options.getSubCommandGroup());
}
});