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

made the nickname argument not required on nickname command

Browse source 
check if user has a nickname before resetting on nickname reset
This commit is contained in:
Almeida 2021-05-05 19:13:01 +01:00 • committed by almeidx
parent 0ec5e37286
commit a616f0f254
No known key found for this signature in database
GPG key ID: 8558FBFF849BD664
2 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
backend/src/plugins/Utility/commands/NicknameCmd.ts
View file

@ -11,7 +11,7 @@ export const NicknameCmd = utilityCmd({
signature: { signature: {
member: ct.resolvedMember(), member: ct.resolvedMember(),
nickname: ct.string({ catchAll: true }), nickname: ct.string({ catchAll: true, required: false }),
}, },
async run({ message: msg, args, pluginData }) { async run({ message: msg, args, pluginData }) {
@ -20,8 +20,13 @@ export const NicknameCmd = utilityCmd({
return; return;
} }
const nicknameLength = [...args.nickname].length; if (!args.nickname && !args.member.nickname) {
if (nicknameLength < 2 || nicknameLength > 32) { msg.channel.send(errorMessage("User does not have a nickname"));
return;
}
const nicknameLength = args.nickname && [...args.nickname].length;
if (typeof nicknameLength === "number" && (nicknameLength < 2 || nicknameLength > 32)) {
msg.channel.send(errorMessage("Nickname must be between 2 and 32 characters long")); msg.channel.send(errorMessage("Nickname must be between 2 and 32 characters long"));
return; return;
} }
@ -29,18 +34,20 @@ export const NicknameCmd = utilityCmd({
const oldNickname = args.member.nickname || "<none>"; const oldNickname = args.member.nickname || "<none>";
try { try {
await args.member.edit({ await args.member.setNickname(args.nickname ?? null);
nick: args.nickname,
});
} catch { } catch {
msg.channel.send(errorMessage("Failed to change nickname")); msg.channel.send(errorMessage("Failed to change nickname"));
return; return;
} }
sendSuccessMessage( if (args.nickname) {
pluginData, sendSuccessMessage(
msg.channel, pluginData,
`Changed nickname of <@!${args.member.id}> from **${oldNickname}** to **${args.nickname}**`, msg.channel,
); `Changed nickname of <@!${args.member.id}> from **${oldNickname}** to **${args.nickname}**`,
);
} else {
sendSuccessMessage(pluginData, msg.channel, `The nickname of <@!${args.member.id}> has been reset`);
}
}, },
}); });

9
backend/src/plugins/Utility/commands/NicknameResetCmd.ts
View file

@ -19,10 +19,13 @@ export const NicknameResetCmd = utilityCmd({
return; return;
} }
if (!args.member.nickname) {
msg.channel.send(errorMessage("User does not have a nickname"));
return;
}
try { try {
await args.member.edit({ await args.member.setNickname("");
nick: "",
});
} catch { } catch {
msg.channel.send(errorMessage("Failed to reset nickname")); msg.channel.send(errorMessage("Failed to reset nickname"));
return; return;