StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-03-16 14:11:50 +00:00
Code Releases Activity

Sanitize values in errors thrown in resolvedUser, resolvedUserLoose, and resolvedMember custom argument types

Browse source
This commit is contained in:
Dragory 2019-04-20 20:43:47 +03:00
parent c38c2cc904
commit 85676aab07
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/customArgumentTypes.ts
View file

@ -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 { CommandArgumentTypeError } from "knub";
import { Client, GuildChannel, Message } from "eris"; import { Client, GuildChannel, Message } from "eris";
@ -15,7 +22,7 @@ export const customArgumentTypes = {
async resolvedUser(value, msg, bot: Client) { async resolvedUser(value, msg, bot: Client) {
const result = await resolveUser(bot, value); const result = await resolveUser(bot, value);
if (result == null || result instanceof UnknownUser) { 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; return result;
}, },
@ -23,7 +30,7 @@ export const customArgumentTypes = {
async resolvedUserLoose(value, msg, bot: Client) { async resolvedUserLoose(value, msg, bot: Client) {
const result = await resolveUser(bot, value); const result = await resolveUser(bot, value);
if (result == null) { if (result == null) {
throw new CommandArgumentTypeError(`Invalid user: ${value}`); throw new CommandArgumentTypeError(`Invalid user: \`${disableCodeBlocks(value)}\``);
} }
return result; return result;
}, },
@ -33,7 +40,9 @@ export const customArgumentTypes = {
const result = await resolveMember(bot, msg.channel.guild, value); const result = await resolveMember(bot, msg.channel.guild, value);
if (result == null) { 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; return result;
}, },