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

Fully tested, also check if we can before asking for reason

Browse source
This commit is contained in:
Nils Blömeke 2019-06-17 18:25:17 +02:00
parent 2d18939a6e
commit 3f85ed69cb
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/plugins/ModActions.ts
View file

@ -1066,6 +1066,15 @@ export class ModActionsPlugin extends ZeppelinPlugin<IModActionsPluginConfig> {
return;
}
// Verify we can act on each of the users specified
for (const userId of args.userIds) {
const member = this.guild.members.get(userId); // TODO: Get members on demand?
if (member && !this.canActOn(msg.member, member)) {
this.sendErrorMessage(msg.channel, "Cannot massban one or more users: insufficient permissions");
return;
}
}
// Ask for ban reason (cleaner this way instead of trying to cram it into the args)
msg.channel.createMessage("Ban reason? `cancel` to cancel");
const banReasonReply = await waitForReply(this.bot, msg.channel as TextChannel, msg.author.id);
@ -1076,15 +1085,6 @@ export class ModActionsPlugin extends ZeppelinPlugin<IModActionsPluginConfig> {
const banReason = this.formatReasonWithAttachments(banReasonReply.content, msg.attachments);
// Verify we can act on each of the users specified
for (const userId of args.userIds) {
const member = this.guild.members.get(userId); // TODO: Get members on demand?
if (member && !this.canActOn(msg.member, member)) {
this.sendErrorMessage(msg.channel, "Cannot massban one or more users: insufficient permissions");
return;
}
}
// Ignore automatic ban cases and logs for these users
// We'll create our own cases below and post a single "mass banned" log instead
args.userIds.forEach(userId => {
@ -1148,6 +1148,15 @@ export class ModActionsPlugin extends ZeppelinPlugin<IModActionsPluginConfig> {
return;
}
// Verify we can act upon all users
for (const userId of args.userIds) {
const member = this.guild.members.get(userId);
if (member && !this.canActOn(msg.member, member)) {
this.sendErrorMessage(msg.channel, "Cannot massmute one or more users: insufficient permissions");
return;
}
}
// Ask for mute reason
msg.channel.createMessage("Mute reason? `cancel` to cancel");
const muteReasonReceived = await waitForReply(this.bot, msg.channel as TextChannel, msg.author.id);
@ -1162,15 +1171,6 @@ export class ModActionsPlugin extends ZeppelinPlugin<IModActionsPluginConfig> {
const muteReason = this.formatReasonWithAttachments(muteReasonReceived.content, msg.attachments);
// Verify we can act upon all users
for (const userId of args.userIds) {
const member = this.guild.members.get(userId);
if (member && !this.canActOn(msg.member, member)) {
this.sendErrorMessage(msg.channel, "Cannot massmute one or more users: insufficient permissions");
return;
}
}
// Ignore automatic mute cases and logs for these users
// We'll create our own cases below and post a single "mass muted" log instead
args.userIds.forEach(userId => {