mirror of
https://github.com/ZeppelinBot/Zeppelin.git
synced 2025-03-16 22:21:51 +00:00
Made mass action reason part of the slash command options
This commit is contained in:
parent
4d8b6b5cd7
commit
91025d8569
19 changed files with 213 additions and 88 deletions
|
@ -11,7 +11,7 @@ const opts = [
|
||||||
slashOptions.user({ name: "mod", description: "The moderator to add this case as", required: false }),
|
slashOptions.user({ name: "mod", description: "The moderator to add this case as", required: false }),
|
||||||
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
||||||
name: "attachment",
|
name: "attachment",
|
||||||
description: "An attachment to add to the reason of the case",
|
description: "An attachment to add to the reason",
|
||||||
}),
|
}),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ const opts = [
|
||||||
}),
|
}),
|
||||||
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
||||||
name: "attachment",
|
name: "attachment",
|
||||||
description: "An attachment to add to the reason of the ban",
|
description: "An attachment to add to the reason",
|
||||||
}),
|
}),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ const opts = [
|
||||||
slashOptions.user({ name: "mod", description: "The moderator to ban as", required: false }),
|
slashOptions.user({ name: "mod", description: "The moderator to ban as", required: false }),
|
||||||
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
||||||
name: "attachment",
|
name: "attachment",
|
||||||
description: "An attachment to add to the reason of the ban",
|
description: "An attachment to add to the reason",
|
||||||
}),
|
}),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@ const opts = [
|
||||||
}),
|
}),
|
||||||
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
||||||
name: "attachment",
|
name: "attachment",
|
||||||
description: "An attachment to add to the reason of the mute",
|
description: "An attachment to add to the reason",
|
||||||
}),
|
}),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ const opts = [
|
||||||
slashOptions.user({ name: "mod", description: "The moderator to unmute as", required: false }),
|
slashOptions.user({ name: "mod", description: "The moderator to unmute as", required: false }),
|
||||||
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
||||||
name: "attachment",
|
name: "attachment",
|
||||||
description: "An attachment to add to the reason of the unmute",
|
description: "An attachment to add to the reason",
|
||||||
}),
|
}),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ const opts = [
|
||||||
}),
|
}),
|
||||||
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
||||||
name: "attachment",
|
name: "attachment",
|
||||||
description: "An attachment to add to the reason of the kick",
|
description: "An attachment to add to the reason",
|
||||||
}),
|
}),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
|
import { waitForReply } from "knub/helpers";
|
||||||
import { commandTypeHelpers as ct } from "../../../../commandTypes";
|
import { commandTypeHelpers as ct } from "../../../../commandTypes";
|
||||||
|
import { getContextChannel, sendContextResponse } from "../../../../pluginUtils";
|
||||||
|
import { CommonPlugin } from "../../../Common/CommonPlugin";
|
||||||
import { actualMassBanCmd } from "../../functions/actualCommands/actualMassBanCmd";
|
import { actualMassBanCmd } from "../../functions/actualCommands/actualMassBanCmd";
|
||||||
import { modActionsMsgCmd } from "../../types";
|
import { modActionsMsgCmd } from "../../types";
|
||||||
|
|
||||||
|
@ -14,6 +17,17 @@ export const MassBanMsgCmd = modActionsMsgCmd({
|
||||||
],
|
],
|
||||||
|
|
||||||
async run({ pluginData, message: msg, args }) {
|
async run({ pluginData, message: msg, args }) {
|
||||||
actualMassBanCmd(pluginData, msg, args.userIds, msg.member);
|
// Ask for ban reason (cleaner this way instead of trying to cram it into the args)
|
||||||
|
sendContextResponse(msg, "Ban reason? `cancel` to cancel");
|
||||||
|
const banReasonReply = await waitForReply(pluginData.client, await getContextChannel(msg), msg.author.id);
|
||||||
|
|
||||||
|
if (!banReasonReply || !banReasonReply.content || banReasonReply.content.toLowerCase().trim() === "cancel") {
|
||||||
|
pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "Cancelled");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
actualMassBanCmd(pluginData, msg, args.userIds, msg.member, banReasonReply.content, [
|
||||||
|
...banReasonReply.attachments.values(),
|
||||||
|
]);
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,5 +1,16 @@
|
||||||
import { slashOptions } from "knub";
|
import { slashOptions } from "knub";
|
||||||
|
import { generateAttachmentSlashOptions, retrieveMultipleOptions } from "../../../../utils/multipleSlashOptions";
|
||||||
|
import { CommonPlugin } from "../../../Common/CommonPlugin";
|
||||||
import { actualMassBanCmd } from "../../functions/actualCommands/actualMassBanCmd";
|
import { actualMassBanCmd } from "../../functions/actualCommands/actualMassBanCmd";
|
||||||
|
import { NUMBER_ATTACHMENTS_CASE_CREATION } from "../constants";
|
||||||
|
|
||||||
|
const opts = [
|
||||||
|
slashOptions.string({ name: "reason", description: "The reason", required: false }),
|
||||||
|
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
||||||
|
name: "attachment",
|
||||||
|
description: "An attachment to add to the reason",
|
||||||
|
}),
|
||||||
|
];
|
||||||
|
|
||||||
export const MassBanSlashCmd = {
|
export const MassBanSlashCmd = {
|
||||||
name: "massban",
|
name: "massban",
|
||||||
|
@ -7,9 +18,30 @@ export const MassBanSlashCmd = {
|
||||||
description: "Mass-ban a list of user IDs",
|
description: "Mass-ban a list of user IDs",
|
||||||
allowDms: false,
|
allowDms: false,
|
||||||
|
|
||||||
signature: [slashOptions.string({ name: "user-ids", description: "The list of user IDs to ban", required: true })],
|
signature: [
|
||||||
|
slashOptions.string({ name: "user-ids", description: "The list of user IDs to ban", required: true }),
|
||||||
|
|
||||||
|
...opts,
|
||||||
|
],
|
||||||
|
|
||||||
async run({ interaction, options, pluginData }) {
|
async run({ interaction, options, pluginData }) {
|
||||||
actualMassBanCmd(pluginData, interaction, options["user-ids"].split(/[\s,\r\n]+/), interaction.member);
|
const attachments = retrieveMultipleOptions(NUMBER_ATTACHMENTS_CASE_CREATION, options, "attachment");
|
||||||
|
|
||||||
|
if ((!options.reason || options.reason.trim() === "") && attachments.length < 1) {
|
||||||
|
pluginData
|
||||||
|
.getPlugin(CommonPlugin)
|
||||||
|
.sendErrorMessage(interaction, "Text or attachment required", undefined, undefined, true);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
actualMassBanCmd(
|
||||||
|
pluginData,
|
||||||
|
interaction,
|
||||||
|
options["user-ids"].split(/[\s,\r\n]+/),
|
||||||
|
interaction.member,
|
||||||
|
options.reason || "",
|
||||||
|
attachments,
|
||||||
|
);
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
|
import { waitForReply } from "knub/helpers";
|
||||||
import { commandTypeHelpers as ct } from "../../../../commandTypes";
|
import { commandTypeHelpers as ct } from "../../../../commandTypes";
|
||||||
|
import { getContextChannel, sendContextResponse } from "../../../../pluginUtils";
|
||||||
|
import { CommonPlugin } from "../../../Common/CommonPlugin";
|
||||||
import { actualMassMuteCmd } from "../../functions/actualCommands/actualMassMuteCmd";
|
import { actualMassMuteCmd } from "../../functions/actualCommands/actualMassMuteCmd";
|
||||||
import { modActionsMsgCmd } from "../../types";
|
import { modActionsMsgCmd } from "../../types";
|
||||||
|
|
||||||
|
@ -14,6 +17,20 @@ export const MassMuteMsgCmd = modActionsMsgCmd({
|
||||||
],
|
],
|
||||||
|
|
||||||
async run({ pluginData, message: msg, args }) {
|
async run({ pluginData, message: msg, args }) {
|
||||||
actualMassMuteCmd(pluginData, msg, args.userIds, msg.member);
|
// Ask for mute reason
|
||||||
|
sendContextResponse(msg, "Mute reason? `cancel` to cancel");
|
||||||
|
const muteReasonReceived = await waitForReply(pluginData.client, await getContextChannel(msg), msg.author.id);
|
||||||
|
if (
|
||||||
|
!muteReasonReceived ||
|
||||||
|
!muteReasonReceived.content ||
|
||||||
|
muteReasonReceived.content.toLowerCase().trim() === "cancel"
|
||||||
|
) {
|
||||||
|
pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "Cancelled");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
actualMassMuteCmd(pluginData, msg, args.userIds, msg.member, muteReasonReceived.content, [
|
||||||
|
...muteReasonReceived.attachments.values(),
|
||||||
|
]);
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,5 +1,16 @@
|
||||||
import { slashOptions } from "knub";
|
import { slashOptions } from "knub";
|
||||||
|
import { generateAttachmentSlashOptions, retrieveMultipleOptions } from "../../../../utils/multipleSlashOptions";
|
||||||
|
import { CommonPlugin } from "../../../Common/CommonPlugin";
|
||||||
import { actualMassMuteCmd } from "../../functions/actualCommands/actualMassMuteCmd";
|
import { actualMassMuteCmd } from "../../functions/actualCommands/actualMassMuteCmd";
|
||||||
|
import { NUMBER_ATTACHMENTS_CASE_CREATION } from "../constants";
|
||||||
|
|
||||||
|
const opts = [
|
||||||
|
slashOptions.string({ name: "reason", description: "The reason", required: false }),
|
||||||
|
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
||||||
|
name: "attachment",
|
||||||
|
description: "An attachment to add to the reason",
|
||||||
|
}),
|
||||||
|
];
|
||||||
|
|
||||||
export const MassMuteSlashSlashCmd = {
|
export const MassMuteSlashSlashCmd = {
|
||||||
name: "massmute",
|
name: "massmute",
|
||||||
|
@ -7,9 +18,30 @@ export const MassMuteSlashSlashCmd = {
|
||||||
description: "Mass-mute a list of user IDs",
|
description: "Mass-mute a list of user IDs",
|
||||||
allowDms: false,
|
allowDms: false,
|
||||||
|
|
||||||
signature: [slashOptions.string({ name: "user-ids", description: "The list of user IDs to mute", required: true })],
|
signature: [
|
||||||
|
slashOptions.string({ name: "user-ids", description: "The list of user IDs to mute", required: true }),
|
||||||
|
|
||||||
|
...opts,
|
||||||
|
],
|
||||||
|
|
||||||
async run({ interaction, options, pluginData }) {
|
async run({ interaction, options, pluginData }) {
|
||||||
actualMassMuteCmd(pluginData, interaction, options["user-ids"].split(/[\s,\r\n]+/), interaction.member);
|
const attachments = retrieveMultipleOptions(NUMBER_ATTACHMENTS_CASE_CREATION, options, "attachment");
|
||||||
|
|
||||||
|
if ((!options.reason || options.reason.trim() === "") && attachments.length < 1) {
|
||||||
|
pluginData
|
||||||
|
.getPlugin(CommonPlugin)
|
||||||
|
.sendErrorMessage(interaction, "Text or attachment required", undefined, undefined, true);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
actualMassMuteCmd(
|
||||||
|
pluginData,
|
||||||
|
interaction,
|
||||||
|
options["user-ids"].split(/[\s,\r\n]+/),
|
||||||
|
interaction.member,
|
||||||
|
options.reason || "",
|
||||||
|
attachments,
|
||||||
|
);
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
|
import { waitForReply } from "knub/helpers";
|
||||||
import { commandTypeHelpers as ct } from "../../../../commandTypes";
|
import { commandTypeHelpers as ct } from "../../../../commandTypes";
|
||||||
import { actualMassBanCmd } from "../../functions/actualCommands/actualMassBanCmd";
|
import { getContextChannel, sendContextResponse } from "../../../../pluginUtils";
|
||||||
|
import { CommonPlugin } from "../../../Common/CommonPlugin";
|
||||||
|
import { actualMassUnbanCmd } from "../../functions/actualCommands/actualMassUnbanCmd";
|
||||||
import { modActionsMsgCmd } from "../../types";
|
import { modActionsMsgCmd } from "../../types";
|
||||||
|
|
||||||
export const MassUnbanMsgCmd = modActionsMsgCmd({
|
export const MassUnbanMsgCmd = modActionsMsgCmd({
|
||||||
|
@ -14,6 +17,16 @@ export const MassUnbanMsgCmd = modActionsMsgCmd({
|
||||||
],
|
],
|
||||||
|
|
||||||
async run({ pluginData, message: msg, args }) {
|
async run({ pluginData, message: msg, args }) {
|
||||||
actualMassBanCmd(pluginData, msg, args.userIds, msg.member);
|
// Ask for unban reason (cleaner this way instead of trying to cram it into the args)
|
||||||
|
sendContextResponse(msg, "Unban reason? `cancel` to cancel");
|
||||||
|
const unbanReasonReply = await waitForReply(pluginData.client, await getContextChannel(msg), msg.author.id);
|
||||||
|
if (!unbanReasonReply || !unbanReasonReply.content || unbanReasonReply.content.toLowerCase().trim() === "cancel") {
|
||||||
|
pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "Cancelled");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
actualMassUnbanCmd(pluginData, msg, args.userIds, msg.member, unbanReasonReply.content, [
|
||||||
|
...unbanReasonReply.attachments.values(),
|
||||||
|
]);
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,5 +1,16 @@
|
||||||
import { slashOptions } from "knub";
|
import { slashOptions } from "knub";
|
||||||
|
import { generateAttachmentSlashOptions, retrieveMultipleOptions } from "../../../../utils/multipleSlashOptions";
|
||||||
|
import { CommonPlugin } from "../../../Common/CommonPlugin";
|
||||||
import { actualMassUnbanCmd } from "../../functions/actualCommands/actualMassUnbanCmd";
|
import { actualMassUnbanCmd } from "../../functions/actualCommands/actualMassUnbanCmd";
|
||||||
|
import { NUMBER_ATTACHMENTS_CASE_CREATION } from "../constants";
|
||||||
|
|
||||||
|
const opts = [
|
||||||
|
slashOptions.string({ name: "reason", description: "The reason", required: false }),
|
||||||
|
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
||||||
|
name: "attachment",
|
||||||
|
description: "An attachment to add to the reason",
|
||||||
|
}),
|
||||||
|
];
|
||||||
|
|
||||||
export const MassUnbanSlashCmd = {
|
export const MassUnbanSlashCmd = {
|
||||||
name: "massunban",
|
name: "massunban",
|
||||||
|
@ -7,9 +18,30 @@ export const MassUnbanSlashCmd = {
|
||||||
description: "Mass-unban a list of user IDs",
|
description: "Mass-unban a list of user IDs",
|
||||||
allowDms: false,
|
allowDms: false,
|
||||||
|
|
||||||
signature: [slashOptions.string({ name: "user-ids", description: "The list of user IDs to unban", required: true })],
|
signature: [
|
||||||
|
slashOptions.string({ name: "user-ids", description: "The list of user IDs to unban", required: true }),
|
||||||
|
|
||||||
|
...opts,
|
||||||
|
],
|
||||||
|
|
||||||
async run({ interaction, options, pluginData }) {
|
async run({ interaction, options, pluginData }) {
|
||||||
actualMassUnbanCmd(pluginData, interaction, options["user-ids"].split(/[\s,\r\n]+/), interaction.member);
|
const attachments = retrieveMultipleOptions(NUMBER_ATTACHMENTS_CASE_CREATION, options, "attachment");
|
||||||
|
|
||||||
|
if ((!options.reason || options.reason.trim() === "") && attachments.length < 1) {
|
||||||
|
pluginData
|
||||||
|
.getPlugin(CommonPlugin)
|
||||||
|
.sendErrorMessage(interaction, "Text or attachment required", undefined, undefined, true);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
actualMassUnbanCmd(
|
||||||
|
pluginData,
|
||||||
|
interaction,
|
||||||
|
options["user-ids"].split(/[\s,\r\n]+/),
|
||||||
|
interaction.member,
|
||||||
|
options.reason || "",
|
||||||
|
attachments,
|
||||||
|
);
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
@ -31,7 +31,7 @@ const opts = [
|
||||||
}),
|
}),
|
||||||
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
||||||
name: "attachment",
|
name: "attachment",
|
||||||
description: "An attachment to add to the reason of the mute",
|
description: "An attachment to add to the reason",
|
||||||
}),
|
}),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ const opts = [
|
||||||
slashOptions.user({ name: "mod", description: "The moderator to unban as", required: false }),
|
slashOptions.user({ name: "mod", description: "The moderator to unban as", required: false }),
|
||||||
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
||||||
name: "attachment",
|
name: "attachment",
|
||||||
description: "An attachment to add to the reason of the unban",
|
description: "An attachment to add to the reason",
|
||||||
}),
|
}),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ const opts = [
|
||||||
slashOptions.user({ name: "mod", description: "The moderator to unmute as", required: false }),
|
slashOptions.user({ name: "mod", description: "The moderator to unmute as", required: false }),
|
||||||
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
||||||
name: "attachment",
|
name: "attachment",
|
||||||
description: "An attachment to add to the reason of the unmute",
|
description: "An attachment to add to the reason",
|
||||||
}),
|
}),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@ const opts = [
|
||||||
}),
|
}),
|
||||||
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
...generateAttachmentSlashOptions(NUMBER_ATTACHMENTS_CASE_CREATION, {
|
||||||
name: "attachment",
|
name: "attachment",
|
||||||
description: "An attachment to add to the reason of the warn",
|
description: "An attachment to add to the reason",
|
||||||
}),
|
}),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
import { ChatInputCommandInteraction, GuildMember, Message, Snowflake } from "discord.js";
|
import { Attachment, ChatInputCommandInteraction, GuildMember, Message, Snowflake } from "discord.js";
|
||||||
import { GuildPluginData } from "knub";
|
import { GuildPluginData } from "knub";
|
||||||
import { waitForReply } from "knub/helpers";
|
|
||||||
import { CaseTypes } from "../../../../data/CaseTypes";
|
import { CaseTypes } from "../../../../data/CaseTypes";
|
||||||
import { LogType } from "../../../../data/LogType";
|
import { LogType } from "../../../../data/LogType";
|
||||||
import { humanizeDurationShort } from "../../../../humanizeDurationShort";
|
import { humanizeDurationShort } from "../../../../humanizeDurationShort";
|
||||||
|
@ -19,6 +18,8 @@ export async function actualMassBanCmd(
|
||||||
context: Message | ChatInputCommandInteraction,
|
context: Message | ChatInputCommandInteraction,
|
||||||
userIds: string[],
|
userIds: string[],
|
||||||
author: GuildMember,
|
author: GuildMember,
|
||||||
|
reason: string,
|
||||||
|
attachments: Attachment[],
|
||||||
) {
|
) {
|
||||||
// Limit to 100 users at once (arbitrary?)
|
// Limit to 100 users at once (arbitrary?)
|
||||||
if (userIds.length > 100) {
|
if (userIds.length > 100) {
|
||||||
|
@ -26,25 +27,12 @@ export async function actualMassBanCmd(
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ask for ban reason (cleaner this way instead of trying to cram it into the args)
|
if (await handleAttachmentLinkDetectionAndGetRestriction(pluginData, context, reason)) {
|
||||||
sendContextResponse(context, "Ban reason? `cancel` to cancel");
|
|
||||||
const banReasonReply = await waitForReply(pluginData.client, await getContextChannel(context), author.id);
|
|
||||||
|
|
||||||
if (!banReasonReply || !banReasonReply.content || banReasonReply.content.toLowerCase().trim() === "cancel") {
|
|
||||||
pluginData.getPlugin(CommonPlugin).sendErrorMessage(context, "Cancelled");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (await handleAttachmentLinkDetectionAndGetRestriction(pluginData, context, banReasonReply.content)) {
|
const banReason = await formatReasonWithMessageLinkForAttachments(pluginData, reason, context, attachments);
|
||||||
return;
|
const banReasonWithAttachments = formatReasonWithAttachments(reason, attachments);
|
||||||
}
|
|
||||||
|
|
||||||
const banReason = await formatReasonWithMessageLinkForAttachments(pluginData, banReasonReply.content, context, [
|
|
||||||
...banReasonReply.attachments.values(),
|
|
||||||
]);
|
|
||||||
const banReasonWithAttachments = formatReasonWithAttachments(banReasonReply.content, [
|
|
||||||
...banReasonReply.attachments.values(),
|
|
||||||
]);
|
|
||||||
|
|
||||||
// Verify we can act on each of the users specified
|
// Verify we can act on each of the users specified
|
||||||
for (const userId of userIds) {
|
for (const userId of userIds) {
|
||||||
|
@ -64,7 +52,7 @@ export async function actualMassBanCmd(
|
||||||
pluginData.state.massbanQueue.length === 0
|
pluginData.state.massbanQueue.length === 0
|
||||||
? "Banning..."
|
? "Banning..."
|
||||||
: `Massban queued. Waiting for previous massban to finish (max wait ${maxWaitTimeFormatted}).`;
|
: `Massban queued. Waiting for previous massban to finish (max wait ${maxWaitTimeFormatted}).`;
|
||||||
const loadingMsg = await sendContextResponse(context, initialLoadingText);
|
const loadingMsg = await sendContextResponse(context, { content: initialLoadingText, ephemeral: true });
|
||||||
|
|
||||||
const waitTimeStart = performance.now();
|
const waitTimeStart = performance.now();
|
||||||
const waitingInterval = setInterval(() => {
|
const waitingInterval = setInterval(() => {
|
||||||
|
@ -78,11 +66,20 @@ export async function actualMassBanCmd(
|
||||||
clearInterval(waitingInterval);
|
clearInterval(waitingInterval);
|
||||||
|
|
||||||
if (pluginData.state.unloaded) {
|
if (pluginData.state.unloaded) {
|
||||||
void loadingMsg.delete().catch(noop);
|
if (isContextInteraction(context)) {
|
||||||
|
void context.deleteReply().catch(noop);
|
||||||
|
} else {
|
||||||
|
void loadingMsg.delete().catch(noop);
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
void loadingMsg.edit("Banning...").catch(noop);
|
if (isContextInteraction(context)) {
|
||||||
|
void context.editReply("Banning...").catch(noop);
|
||||||
|
} else {
|
||||||
|
void loadingMsg.edit("Banning...").catch(noop);
|
||||||
|
}
|
||||||
|
|
||||||
// Ban each user and count failed bans (if any)
|
// Ban each user and count failed bans (if any)
|
||||||
const startTime = performance.now();
|
const startTime = performance.now();
|
||||||
|
@ -124,15 +121,23 @@ export async function actualMassBanCmd(
|
||||||
|
|
||||||
// Send a status update every 10 bans
|
// Send a status update every 10 bans
|
||||||
if ((i + 1) % 10 === 0) {
|
if ((i + 1) % 10 === 0) {
|
||||||
loadingMsg.edit(`Banning... ${i + 1}/${userIds.length}`).catch(noop);
|
const newLoadingMessageContent = `Banning... ${i + 1}/${userIds.length}`;
|
||||||
|
|
||||||
|
if (isContextInteraction(context)) {
|
||||||
|
void context.editReply(newLoadingMessageContent).catch(noop);
|
||||||
|
} else {
|
||||||
|
loadingMsg.edit(newLoadingMessageContent).catch(noop);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const totalTime = performance.now() - startTime;
|
const totalTime = performance.now() - startTime;
|
||||||
const formattedTimeTaken = humanizeDurationShort(totalTime, { round: true });
|
const formattedTimeTaken = humanizeDurationShort(totalTime, { round: true });
|
||||||
|
|
||||||
// Clear loading indicator
|
if (!isContextInteraction(context)) {
|
||||||
loadingMsg.delete().catch(noop);
|
// Clear loading indicator
|
||||||
|
loadingMsg.delete().catch(noop);
|
||||||
|
}
|
||||||
|
|
||||||
const successfulBanCount = userIds.length - failedBans.length;
|
const successfulBanCount = userIds.length - failedBans.length;
|
||||||
if (successfulBanCount === 0) {
|
if (successfulBanCount === 0) {
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
import { ChatInputCommandInteraction, GuildMember, Message, Snowflake } from "discord.js";
|
import { Attachment, ChatInputCommandInteraction, GuildMember, Message, Snowflake } from "discord.js";
|
||||||
import { GuildPluginData } from "knub";
|
import { GuildPluginData } from "knub";
|
||||||
import { waitForReply } from "knub/helpers";
|
|
||||||
import { LogType } from "../../../../data/LogType";
|
import { LogType } from "../../../../data/LogType";
|
||||||
import { logger } from "../../../../logger";
|
import { logger } from "../../../../logger";
|
||||||
import { canActOn, getContextChannel, sendContextResponse } from "../../../../pluginUtils";
|
import { canActOn, isContextInteraction, sendContextResponse } from "../../../../pluginUtils";
|
||||||
import { CommonPlugin } from "../../../Common/CommonPlugin";
|
import { CommonPlugin } from "../../../Common/CommonPlugin";
|
||||||
import { LogsPlugin } from "../../../Logs/LogsPlugin";
|
import { LogsPlugin } from "../../../Logs/LogsPlugin";
|
||||||
import { MutesPlugin } from "../../../Mutes/MutesPlugin";
|
import { MutesPlugin } from "../../../Mutes/MutesPlugin";
|
||||||
|
@ -16,6 +15,8 @@ export async function actualMassMuteCmd(
|
||||||
context: Message | ChatInputCommandInteraction,
|
context: Message | ChatInputCommandInteraction,
|
||||||
userIds: string[],
|
userIds: string[],
|
||||||
author: GuildMember,
|
author: GuildMember,
|
||||||
|
reason: string,
|
||||||
|
attachments: Attachment[],
|
||||||
) {
|
) {
|
||||||
// Limit to 100 users at once (arbitrary?)
|
// Limit to 100 users at once (arbitrary?)
|
||||||
if (userIds.length > 100) {
|
if (userIds.length > 100) {
|
||||||
|
@ -23,28 +24,12 @@ export async function actualMassMuteCmd(
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ask for mute reason
|
if (await handleAttachmentLinkDetectionAndGetRestriction(pluginData, context, reason)) {
|
||||||
sendContextResponse(context, "Mute reason? `cancel` to cancel");
|
|
||||||
const muteReasonReceived = await waitForReply(pluginData.client, await getContextChannel(context), author.id);
|
|
||||||
if (
|
|
||||||
!muteReasonReceived ||
|
|
||||||
!muteReasonReceived.content ||
|
|
||||||
muteReasonReceived.content.toLowerCase().trim() === "cancel"
|
|
||||||
) {
|
|
||||||
pluginData.getPlugin(CommonPlugin).sendErrorMessage(context, "Cancelled");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (await handleAttachmentLinkDetectionAndGetRestriction(pluginData, context, muteReasonReceived.content)) {
|
const muteReason = await formatReasonWithMessageLinkForAttachments(pluginData, reason, context, attachments);
|
||||||
return;
|
const muteReasonWithAttachments = formatReasonWithAttachments(reason, attachments);
|
||||||
}
|
|
||||||
|
|
||||||
const muteReason = await formatReasonWithMessageLinkForAttachments(pluginData, muteReasonReceived.content, context, [
|
|
||||||
...muteReasonReceived.attachments.values(),
|
|
||||||
]);
|
|
||||||
const muteReasonWithAttachments = formatReasonWithAttachments(muteReasonReceived.content, [
|
|
||||||
...muteReasonReceived.attachments.values(),
|
|
||||||
]);
|
|
||||||
|
|
||||||
// Verify we can act upon all users
|
// Verify we can act upon all users
|
||||||
for (const userId of userIds) {
|
for (const userId of userIds) {
|
||||||
|
@ -65,7 +50,7 @@ export async function actualMassMuteCmd(
|
||||||
});
|
});
|
||||||
|
|
||||||
// Show loading indicator
|
// Show loading indicator
|
||||||
const loadingMsg = await sendContextResponse(context, "Muting...");
|
const loadingMsg = await sendContextResponse(context, { content: "Muting...", ephemeral: true });
|
||||||
|
|
||||||
// Mute everyone and count fails
|
// Mute everyone and count fails
|
||||||
const modId = author.id;
|
const modId = author.id;
|
||||||
|
@ -84,8 +69,10 @@ export async function actualMassMuteCmd(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clear loading indicator
|
if (!isContextInteraction(context)) {
|
||||||
loadingMsg.delete();
|
// Clear loading indicator
|
||||||
|
loadingMsg.delete();
|
||||||
|
}
|
||||||
|
|
||||||
const successfulMuteCount = userIds.length - failedMutes.length;
|
const successfulMuteCount = userIds.length - failedMutes.length;
|
||||||
if (successfulMuteCount === 0) {
|
if (successfulMuteCount === 0) {
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
import { ChatInputCommandInteraction, GuildMember, Message, Snowflake } from "discord.js";
|
import { Attachment, ChatInputCommandInteraction, GuildMember, Message, Snowflake } from "discord.js";
|
||||||
import { GuildPluginData } from "knub";
|
import { GuildPluginData } from "knub";
|
||||||
import { waitForReply } from "knub/helpers";
|
|
||||||
import { CaseTypes } from "../../../../data/CaseTypes";
|
import { CaseTypes } from "../../../../data/CaseTypes";
|
||||||
import { LogType } from "../../../../data/LogType";
|
import { LogType } from "../../../../data/LogType";
|
||||||
import { getContextChannel, sendContextResponse } from "../../../../pluginUtils";
|
import { isContextInteraction, sendContextResponse } from "../../../../pluginUtils";
|
||||||
import { MINUTES } from "../../../../utils";
|
import { MINUTES, noop } from "../../../../utils";
|
||||||
import { CasesPlugin } from "../../../Cases/CasesPlugin";
|
import { CasesPlugin } from "../../../Cases/CasesPlugin";
|
||||||
import { CommonPlugin } from "../../../Common/CommonPlugin";
|
import { CommonPlugin } from "../../../Common/CommonPlugin";
|
||||||
import { LogsPlugin } from "../../../Logs/LogsPlugin";
|
import { LogsPlugin } from "../../../Logs/LogsPlugin";
|
||||||
|
@ -19,6 +18,8 @@ export async function actualMassUnbanCmd(
|
||||||
context: Message | ChatInputCommandInteraction,
|
context: Message | ChatInputCommandInteraction,
|
||||||
userIds: string[],
|
userIds: string[],
|
||||||
author: GuildMember,
|
author: GuildMember,
|
||||||
|
reason: string,
|
||||||
|
attachments: Attachment[],
|
||||||
) {
|
) {
|
||||||
// Limit to 100 users at once (arbitrary?)
|
// Limit to 100 users at once (arbitrary?)
|
||||||
if (userIds.length > 100) {
|
if (userIds.length > 100) {
|
||||||
|
@ -26,21 +27,11 @@ export async function actualMassUnbanCmd(
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ask for unban reason (cleaner this way instead of trying to cram it into the args)
|
if (await handleAttachmentLinkDetectionAndGetRestriction(pluginData, context, reason)) {
|
||||||
sendContextResponse(context, "Unban reason? `cancel` to cancel");
|
|
||||||
const unbanReasonReply = await waitForReply(pluginData.client, await getContextChannel(context), author.id);
|
|
||||||
if (!unbanReasonReply || !unbanReasonReply.content || unbanReasonReply.content.toLowerCase().trim() === "cancel") {
|
|
||||||
pluginData.getPlugin(CommonPlugin).sendErrorMessage(context, "Cancelled");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (await handleAttachmentLinkDetectionAndGetRestriction(pluginData, context, unbanReasonReply.content)) {
|
const unbanReason = await formatReasonWithMessageLinkForAttachments(pluginData, reason, context, attachments);
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const unbanReason = await formatReasonWithMessageLinkForAttachments(pluginData, unbanReasonReply.content, context, [
|
|
||||||
...unbanReasonReply.attachments.values(),
|
|
||||||
]);
|
|
||||||
|
|
||||||
// Ignore automatic unban cases and logs for these users
|
// Ignore automatic unban cases and logs for these users
|
||||||
// We'll create our own cases below and post a single "mass unbanned" log instead
|
// We'll create our own cases below and post a single "mass unbanned" log instead
|
||||||
|
@ -51,7 +42,7 @@ export async function actualMassUnbanCmd(
|
||||||
});
|
});
|
||||||
|
|
||||||
// Show a loading indicator since this can take a while
|
// Show a loading indicator since this can take a while
|
||||||
const loadingMsg = await sendContextResponse(context, "Unbanning...");
|
const loadingMsg = await sendContextResponse(context, { content: "Unbanning...", ephemeral: true });
|
||||||
|
|
||||||
// Unban each user and count failed unbans (if any)
|
// Unban each user and count failed unbans (if any)
|
||||||
const failedUnbans: Array<{ userId: string; reason: UnbanFailReasons }> = [];
|
const failedUnbans: Array<{ userId: string; reason: UnbanFailReasons }> = [];
|
||||||
|
@ -77,8 +68,10 @@ export async function actualMassUnbanCmd(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clear loading indicator
|
if (!isContextInteraction(context)) {
|
||||||
loadingMsg.delete();
|
// Clear loading indicator
|
||||||
|
loadingMsg.delete().catch(noop);
|
||||||
|
}
|
||||||
|
|
||||||
const successfulUnbanCount = userIds.length - failedUnbans.length;
|
const successfulUnbanCount = userIds.length - failedUnbans.length;
|
||||||
if (successfulUnbanCount === 0) {
|
if (successfulUnbanCount === 0) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue