From 85676aab0752ec7d582ebc92e73485470dc865b3 Mon Sep 17 00:00:00 2001 From: Dragory Date: Sat, 20 Apr 2019 20:43:47 +0300 Subject: [PATCH] Sanitize values in errors thrown in resolvedUser, resolvedUserLoose, and resolvedMember custom argument types --- src/customArgumentTypes.ts | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/customArgumentTypes.ts b/src/customArgumentTypes.ts index 45259ac4..47869fbf 100644 --- a/src/customArgumentTypes.ts +++ b/src/customArgumentTypes.ts @@ -1,4 +1,11 @@ -import { convertDelayStringToMS, resolveMember, resolveUser, UnknownUser } from "./utils"; +import { + convertDelayStringToMS, + deactivateMentions, + disableCodeBlocks, + resolveMember, + resolveUser, + UnknownUser, +} from "./utils"; import { CommandArgumentTypeError } from "knub"; import { Client, GuildChannel, Message } from "eris"; @@ -15,7 +22,7 @@ export const customArgumentTypes = { async resolvedUser(value, msg, bot: Client) { const result = await resolveUser(bot, value); if (result == null || result instanceof UnknownUser) { - throw new CommandArgumentTypeError(`User \`${value}\` was not found`); + throw new CommandArgumentTypeError(`User \`${disableCodeBlocks(value)}\` was not found`); } return result; }, @@ -23,7 +30,7 @@ export const customArgumentTypes = { async resolvedUserLoose(value, msg, bot: Client) { const result = await resolveUser(bot, value); if (result == null) { - throw new CommandArgumentTypeError(`Invalid user: ${value}`); + throw new CommandArgumentTypeError(`Invalid user: \`${disableCodeBlocks(value)}\``); } return result; }, @@ -33,7 +40,9 @@ export const customArgumentTypes = { const result = await resolveMember(bot, msg.channel.guild, value); if (result == null) { - throw new CommandArgumentTypeError(`Member \`${value}\` was not found or they have left the server`); + throw new CommandArgumentTypeError( + `Member \`${disableCodeBlocks(value)}\` was not found or they have left the server`, + ); } return result; },