Direct message -> DM

Author: TheKodeToad

backend/src/bot/plugin/moderation/command/action/ban.ts

@@ -27,7 +27,7 @@ export const banCommand = defineCommand({
 		},
 		dm: {
 			type: OptionType.Flag,
-			description: "Choose whether to notify the banned user with a direct message - overrides the configured default!",
+			description: "Choose whether to notify the banned user with a DM (overrides the configured default).",
 			name: ["dm", "d", "direct-message"],
 			negativeName: ["no-dm", "nd", "no-direct-message"],
 		},

backend/src/bot/plugin/moderation/command/action/kick.ts

@@ -28,7 +28,7 @@ export const kickCommand = defineCommand({
 		dm: {
 			type: OptionType.Flag,
 			name: ["dm", "d", "direct-message"],
-			description: "Choose whether to notify the kicked user with a direct message - overrides the configured default!",
+			description: "Choose whether to notify the kicked user with a DM (overrides the configured default).",
 			negativeName: ["no-dm", "nd", "no-direct-message"],
 		},
 	},

backend/src/bot/plugin/moderation/command/action/timeout.ts

@@ -1,3 +1,4 @@
+import { Permissions } from "oceanic.js";
 import { humanizeDuration } from "../../../../../common/time.ts";
 import { CaseType } from "../../../../../db/moderation/cases.ts";
 import { escapeMarkdown } from "../../../../common/discord/markdown.ts";
@@ -10,7 +11,7 @@ import { moderationConfig } from "../../index.ts";
 
 export const timeoutCommand = defineCommand({
 	name: ["timeout", "mute", "chatmute"],
-	description: "Prevent a member from chatting - or doing anything other than reading messages - in the server.",
+	description: "Time out a member (only allow them to read messages).",
 
 	options: {
 		user: {
@@ -34,7 +35,7 @@ export const timeoutCommand = defineCommand({
 		},
 		dm: {
 			type: OptionType.Flag,
-			description: "Choose whether to notify the affected user with a direct message - overrides the configured default!",
+			description: "Choose whether to notify the timed out user with a DM (overrides the configured default).",
 			name: ["dm", "d", "direct-message"],
 			negativeName: ["no-dm", "nd", "no-direct-message"],
 		}
@@ -59,6 +60,7 @@ export const timeoutCommand = defineCommand({
 
 			membersOnly: true,
 
+			canPerform: member => member.permissions.has(Permissions.ADMINISTRATOR),
 			async perform(member, calculatedExpiry) {
 				await context.guild.editMember(member.id, {
 					communicationDisabledUntil: calculatedExpiry!.toISOString(),
@@ -78,7 +80,7 @@ export const timeoutCommand = defineCommand({
 			if (successful.length === 1)
 				await context.respond(`${icons.success} Timed out ${formatBulkSuccess(successful[0]!)}!`);
 			else if (unsuccessful.length === 1)
-				await context.respond(`${icons.error} Could not timeout ${formatBulkError(unsuccessful[0]!)}!`);
+				await context.respond(`${icons.error} Could not time out ${formatBulkError(unsuccessful[0]!)}!`);
 		} else {
 			const successfulMessage = successful.map(item => `- ${formatBulkSuccess(item)}`).join("\n");
 			const unsuccessfulMessage = unsuccessful.map(item => `- ${formatBulkError(item)}`).join("\n");

backend/src/bot/plugin/moderation/command/action/warn.ts

@@ -26,7 +26,7 @@ export const warnCommand = defineCommand({
 		},
 		dm: {
 			type: OptionType.Flag,
-			description: "Choose whether to notify the warned user with a direct message - overrides the configured default!",
+			description: "Choose whether to notify the warned user with a DM (overrides the configured default).",
 			name: ["dm", "d", "direct-message"],
 			negativeName: ["no-dm", "nd", "no-direct-message"],
 		},

backend/src/bot/plugin/moderation/helper/bulkAction.ts

@@ -8,7 +8,7 @@ type BulkAction =
 	(
 		{
 			membersOnly: true;
-			perform: (user: Member, calculatedExpiry: Date | undefined) => Promise<void> | void;
+			perform: (member: Member, calculatedExpiry: Date | undefined) => Promise<void> | void;
 		}
 		| {
 			membersOnly: false;
@@ -23,6 +23,7 @@ type BulkAction =
 		directMessage?: CreateMessageOptions;
 		duration?: number;
 
+		canPerform?(member: Member): Promise<boolean> | boolean;
 		makeCase(options: Pick<CreateCaseOptions, "createdAt" | "expiresAt" | "actorID" | "targetID" | "dmDelivered">): CreateCaseOptions;
 	};
 
@@ -47,6 +48,9 @@ export async function doBulkAction(action: BulkAction): Promise<BulkResult> {
 
 	const members = await fetchMembersCached(action.guild, action.ids);
 
+	// eslint-disable-next-line @typescript-eslint/unbound-method
+	action.canPerform ??= () => true;
+
 	for (const targetID of action.ids) {
 		let target: Member | User;
 		let dmDelivered = false;
@@ -64,7 +68,7 @@ export async function doBulkAction(action: BulkAction): Promise<BulkResult> {
 				continue;
 			}
 
-			if (!canModerate(action.guild.clientMember, target)) {
+			if (!action.canPerform(target) || !canModerate(action.guild.clientMember, target)) {
 				result.unsuccessful.push({
 					error: "App lacks permission to moderate the user",
 					user: target,