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

Made mass action reason part of the slash command options

Browse source
This commit is contained in:
Lily Bergonzat 2024-02-24 20:30:11 +01:00
parent 4d8b6b5cd7
commit 91025d8569
19 changed files with 213 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

53
backend/src/plugins/ModActions/functions/actualCommands/actualMassBanCmd.ts
View file

@ -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 { waitForReply } from "knub/helpers";
import { CaseTypes } from "../../../../data/CaseTypes";
import { LogType } from "../../../../data/LogType";
import { humanizeDurationShort } from "../../../../humanizeDurationShort";
@ -19,6 +18,8 @@ export async function actualMassBanCmd(
context: Message | ChatInputCommandInteraction,
userIds: string[],
author: GuildMember,
reason: string,
attachments: Attachment[],
) {
// Limit to 100 users at once (arbitrary?)
if (userIds.length > 100) {
@ -26,25 +27,12 @@ export async function actualMassBanCmd(
return;
}
// Ask for ban reason (cleaner this way instead of trying to cram it into the args)
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");
if (await handleAttachmentLinkDetectionAndGetRestriction(pluginData, context, reason)) {
return;
}
if (await handleAttachmentLinkDetectionAndGetRestriction(pluginData, context, banReasonReply.content)) {
return;
}
const banReason = await formatReasonWithMessageLinkForAttachments(pluginData, banReasonReply.content, context, [
...banReasonReply.attachments.values(),
]);
const banReasonWithAttachments = formatReasonWithAttachments(banReasonReply.content, [
...banReasonReply.attachments.values(),
]);
const banReason = await formatReasonWithMessageLinkForAttachments(pluginData, reason, context, attachments);
const banReasonWithAttachments = formatReasonWithAttachments(reason, attachments);
// Verify we can act on each of the users specified
for (const userId of userIds) {
@ -64,7 +52,7 @@ export async function actualMassBanCmd(
pluginData.state.massbanQueue.length === 0
? "Banning..."
: `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 waitingInterval = setInterval(() => {
@ -78,11 +66,20 @@ export async function actualMassBanCmd(
clearInterval(waitingInterval);
if (pluginData.state.unloaded) {
void loadingMsg.delete().catch(noop);
if (isContextInteraction(context)) {
void context.deleteReply().catch(noop);
} else {
void loadingMsg.delete().catch(noop);
}
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)
const startTime = performance.now();
@ -124,15 +121,23 @@ export async function actualMassBanCmd(
// Send a status update every 10 bans
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 formattedTimeTaken = humanizeDurationShort(totalTime, { round: true });
// Clear loading indicator
loadingMsg.delete().catch(noop);
if (!isContextInteraction(context)) {
// Clear loading indicator
loadingMsg.delete().catch(noop);
}
const successfulBanCount = userIds.length - failedBans.length;
if (successfulBanCount === 0) {

37
backend/src/plugins/ModActions/functions/actualCommands/actualMassMuteCmd.ts
View file

@ -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 { waitForReply } from "knub/helpers";
import { LogType } from "../../../../data/LogType";
import { logger } from "../../../../logger";
import { canActOn, getContextChannel, sendContextResponse } from "../../../../pluginUtils";
import { canActOn, isContextInteraction, sendContextResponse } from "../../../../pluginUtils";
import { CommonPlugin } from "../../../Common/CommonPlugin";
import { LogsPlugin } from "../../../Logs/LogsPlugin";
import { MutesPlugin } from "../../../Mutes/MutesPlugin";
@ -16,6 +15,8 @@ export async function actualMassMuteCmd(
context: Message | ChatInputCommandInteraction,
userIds: string[],
author: GuildMember,
reason: string,
attachments: Attachment[],
) {
// Limit to 100 users at once (arbitrary?)
if (userIds.length > 100) {
@ -23,28 +24,12 @@ export async function actualMassMuteCmd(
return;
}
// Ask for mute 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");
if (await handleAttachmentLinkDetectionAndGetRestriction(pluginData, context, reason)) {
return;
}
if (await handleAttachmentLinkDetectionAndGetRestriction(pluginData, context, muteReasonReceived.content)) {
return;
}
const muteReason = await formatReasonWithMessageLinkForAttachments(pluginData, muteReasonReceived.content, context, [
...muteReasonReceived.attachments.values(),
]);
const muteReasonWithAttachments = formatReasonWithAttachments(muteReasonReceived.content, [
...muteReasonReceived.attachments.values(),
]);
const muteReason = await formatReasonWithMessageLinkForAttachments(pluginData, reason, context, attachments);
const muteReasonWithAttachments = formatReasonWithAttachments(reason, attachments);
// Verify we can act upon all users
for (const userId of userIds) {
@ -65,7 +50,7 @@ export async function actualMassMuteCmd(
});
// Show loading indicator
const loadingMsg = await sendContextResponse(context, "Muting...");
const loadingMsg = await sendContextResponse(context, { content: "Muting...", ephemeral: true });
// Mute everyone and count fails
const modId = author.id;
@ -84,8 +69,10 @@ export async function actualMassMuteCmd(
}
}
// Clear loading indicator
loadingMsg.delete();
if (!isContextInteraction(context)) {
// Clear loading indicator
loadingMsg.delete();
}
const successfulMuteCount = userIds.length - failedMutes.length;
if (successfulMuteCount === 0) {

31
backend/src/plugins/ModActions/functions/actualCommands/actualMassUnbanCmd.ts
View file

@ -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 { waitForReply } from "knub/helpers";
import { CaseTypes } from "../../../../data/CaseTypes";
import { LogType } from "../../../../data/LogType";
import { getContextChannel, sendContextResponse } from "../../../../pluginUtils";
import { MINUTES } from "../../../../utils";
import { isContextInteraction, sendContextResponse } from "../../../../pluginUtils";
import { MINUTES, noop } from "../../../../utils";
import { CasesPlugin } from "../../../Cases/CasesPlugin";
import { CommonPlugin } from "../../../Common/CommonPlugin";
import { LogsPlugin } from "../../../Logs/LogsPlugin";
@ -19,6 +18,8 @@ export async function actualMassUnbanCmd(
context: Message | ChatInputCommandInteraction,
userIds: string[],
author: GuildMember,
reason: string,
attachments: Attachment[],
) {
// Limit to 100 users at once (arbitrary?)
if (userIds.length > 100) {
@ -26,21 +27,11 @@ export async function actualMassUnbanCmd(
return;
}
// Ask for unban reason (cleaner this way instead of trying to cram it into the args)
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");
if (await handleAttachmentLinkDetectionAndGetRestriction(pluginData, context, reason)) {
return;
}
if (await handleAttachmentLinkDetectionAndGetRestriction(pluginData, context, unbanReasonReply.content)) {
return;
}
const unbanReason = await formatReasonWithMessageLinkForAttachments(pluginData, unbanReasonReply.content, context, [
...unbanReasonReply.attachments.values(),
]);
const unbanReason = await formatReasonWithMessageLinkForAttachments(pluginData, reason, context, attachments);
// Ignore automatic unban cases and logs for these users
// 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
const loadingMsg = await sendContextResponse(context, "Unbanning...");
const loadingMsg = await sendContextResponse(context, { content: "Unbanning...", ephemeral: true });
// Unban each user and count failed unbans (if any)
const failedUnbans: Array<{ userId: string; reason: UnbanFailReasons }> = [];
@ -77,8 +68,10 @@ export async function actualMassUnbanCmd(
}
}
// Clear loading indicator
loadingMsg.delete();
if (!isContextInteraction(context)) {
// Clear loading indicator
loadingMsg.delete().catch(noop);
}
const successfulUnbanCount = userIds.length - failedUnbans.length;
if (successfulUnbanCount === 0) {