StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

counters: fix user parsing for !counter view, fix other signature parsing weirdnesses

Browse source
This commit is contained in:
Dragory 2021-02-13 22:43:03 +02:00
parent 91fde47c97
commit a18b093419
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
backend/src/plugins/Counters/commands/ViewCounterCmd.ts
View file

@ -7,18 +7,16 @@ import { TextChannel, User } from "eris";
import { resolveUser, UnknownUser } from "../../../utils";
export const ViewCounterCmd = guildCommand<CountersPluginType>()({
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<CountersPluginType>()({
},
{
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<CountersPluginType>()({
}
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<CountersPluginType>()({
}
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<CountersPluginType>()({
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}`);
}
},
});