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

removed unused exception parameter

Browse source
This commit is contained in:
Almeida 2021-05-07 18:15:33 +01:00 • committed by almeidx
parent b54df47d82
commit 4187886cff
No known key found for this signature in database
GPG key ID: 8558FBFF849BD664
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,9 +39,17 @@ export const NicknameCmd = utilityCmd({
const oldNickname = args.member.nickname || "<none>"; const oldNickname = args.member.nickname || "<none>";
try { try {
<<<<<<< HEAD
await args.member.setNickname(args.nickname ?? null); await args.member.setNickname(args.nickname ?? null);
} catch { } catch {
msg.channel.send(errorMessage("Failed to change nickname")); msg.channel.send(errorMessage("Failed to change nickname"));
=======
await args.member.edit({
nick: args.nickname,
});
} catch {
msg.channel.createMessage(errorMessage("Failed to change nickname"));
>>>>>>> 1ad3f4dd (removed unused exception parameter)
return; return;
} }

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

@ -19,13 +19,8 @@ export const NicknameResetCmd = utilityCmd({
return; return;
} }
<<<<<<< HEAD
if (!args.member.nickname) { if (!args.member.nickname) {
msg.channel.send(errorMessage("User does not have a nickname")); msg.channel.send(errorMessage("User does not have a nickname"));
=======
if (!args.member.nick) {
msg.channel.createMessage(errorMessage(`<@!${args.member.id}> does not have a nickname`));
>>>>>>> 67f0227a (the commmand now sends the nickname of the member when a nickname isnt provided)
return; return;
} }