diff --git a/backend/src/plugins/Counters/commands/ViewCounterCmd.ts b/backend/src/plugins/Counters/commands/ViewCounterCmd.ts index 96184ba0..9c98d32a 100644 --- a/backend/src/plugins/Counters/commands/ViewCounterCmd.ts +++ b/backend/src/plugins/Counters/commands/ViewCounterCmd.ts @@ -7,18 +7,16 @@ import { TextChannel, User } from "eris"; import { resolveUser, UnknownUser } from "../../../utils"; export const ViewCounterCmd = guildCommand()({ - trigger: ["counters view", "counter view", "viewcounter"], + trigger: ["counters view", "counter view", "viewcounter", "counter"], permission: "can_view", signature: [ { counterName: ct.string(), - user: ct.resolvedUserLoose(), - channel: ct.textChannel(), }, { counterName: ct.string(), - user: ct.resolvedUserLoose(), + user: ct.resolvedUser(), }, { counterName: ct.string(), @@ -26,11 +24,13 @@ export const ViewCounterCmd = guildCommand()({ }, { counterName: ct.string(), - user: ct.resolvedUserLoose(), channel: ct.textChannel(), + user: ct.resolvedUser(), }, { counterName: ct.string(), + user: ct.resolvedUser(), + channel: ct.textChannel(), }, ], @@ -44,7 +44,7 @@ export const ViewCounterCmd = guildCommand()({ } if (counter.can_view === false) { - sendErrorMessage(pluginData, message.channel, `Missing permissions to view this counter's values`); + sendErrorMessage(pluginData, message.channel, `Missing permissions to view this counter's value`); return; } @@ -86,7 +86,7 @@ export const ViewCounterCmd = guildCommand()({ } const potentialUser = await resolveUser(pluginData.client, reply.content); - if (!potentialUser) { + if (!potentialUser || potentialUser instanceof UnknownUser) { sendErrorMessage(pluginData, message.channel, "Unknown user, cancelling"); return; } @@ -99,13 +99,13 @@ export const ViewCounterCmd = guildCommand()({ const counterName = counter.name || args.counterName; if (channel && user) { - message.channel.createMessage(`${counterName} for <@!${user.id}> in <#${channel.id}> is ${finalValue}`); + message.channel.createMessage(`**${counterName}** for <@!${user.id}> in <#${channel.id}> is ${finalValue}`); } else if (channel) { - message.channel.createMessage(`${counterName} in <#${channel.id}> is ${finalValue}`); + message.channel.createMessage(`**${counterName}** in <#${channel.id}> is ${finalValue}`); } else if (user) { - message.channel.createMessage(`${counterName} for <@!${user.id}> is ${finalValue}`); + message.channel.createMessage(`**${counterName}** for <@!${user.id}> is ${finalValue}`); } else { - message.channel.createMessage(`${counterName} is ${finalValue}`); + message.channel.createMessage(`**${counterName}** is ${finalValue}`); } }, });