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

Fix issues with long reasons in !ban/softban/kick. Display an error if a ban/softban/kick command fails.

Browse source
This commit is contained in:
Miikka Virtanen 2019-08-14 10:53:35 +03:00
parent 8d8343543d
commit 328ec379c5
1 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/plugins/ModActions.ts
View file

@ -788,7 +788,12 @@ export class ModActionsPlugin extends ZeppelinPlugin<TConfigSchema> {
// Kick the user
this.serverLogs.ignoreLog(LogType.MEMBER_KICK, memberToKick.id);
this.ignoreEvent(IgnoredEventType.Kick, memberToKick.id);
memberToKick.kick(reason);
try {
await memberToKick.kick();
} catch (e) {
msg.channel.create(errorMessage("Failed to kick the user"));
return;
}
// Create a case for this action
const casesPlugin = this.getPlugin<CasesPlugin>("cases");
@ -872,10 +877,15 @@ export class ModActionsPlugin extends ZeppelinPlugin<TConfigSchema> {
});
}
// Ban the user
// (Try to) ban the user
this.serverLogs.ignoreLog(LogType.MEMBER_BAN, memberToBan.id);
this.ignoreEvent(IgnoredEventType.Ban, memberToBan.id);
memberToBan.ban(1, reason);
try {
await memberToBan.ban(1);
} catch (e) {
msg.channel.create(errorMessage("Failed to ban the user"));
return;
}
// Create a case for this action
const casesPlugin = this.getPlugin<CasesPlugin>("cases");
@ -949,8 +959,19 @@ export class ModActionsPlugin extends ZeppelinPlugin<TConfigSchema> {
this.ignoreEvent(IgnoredEventType.Ban, memberToSoftban.id);
this.ignoreEvent(IgnoredEventType.Unban, memberToSoftban.id);
await memberToSoftban.ban(1, reason);
await this.guild.unbanMember(memberToSoftban.id);
try {
await memberToSoftban.ban(1);
} catch (e) {
msg.channel.create(errorMessage("Failed to softban the user"));
return;
}
try {
await this.guild.unbanMember(memberToSoftban.id);
} catch (e) {
msg.channel.create(errorMessage("Failed to unban the user after softbanning them"));
return;
}
// Create a case for this action
const casesPlugin = this.getPlugin<CasesPlugin>("cases");
@ -1068,7 +1089,7 @@ export class ModActionsPlugin extends ZeppelinPlugin<TConfigSchema> {
this.serverLogs.ignoreLog(LogType.MEMBER_BAN, user.id);
try {
await this.guild.banMember(user.id, 1, reason);
await this.guild.banMember(user.id, 1);
} catch (e) {
this.sendErrorMessage(msg.channel, "Failed to forceban member");
return;