Fix a mistake with canModerate

Author: TheKodeToad

backend/src/plugin/moderation/config.ts

@@ -34,6 +34,17 @@ export const ModerationConfig = z.strictObject({
 	preset_reasons: z.array(PresetReason).default([]), // TODO
 	preset_prefix: z.string().default("!"), // TODO
 
+	member_ranking: mappedEnum({
+		none: MemberRanking.None,
+		highest_role: MemberRanking.HighestRole,
+		level: MemberRanking.Level
+	}).default(MemberRanking.HighestRole).describe(
+		"Customize the system used to determine whether a moderator can moderate a user.\n" +
+		"'none' allows anyone to be moderated by a moderator.\n" +
+		"'highest_role' reflects the behavior of Discord; you can only moderate users who's highest role is below yours.\n" +
+		"'level' is based on who has a higher level in the app's group system."
+	),
+
 	ban: z.strictObject({
 		send_direct_message: z.boolean().default(false),
 		direct_message: messageTemplate(actionParams).optional(),
@@ -63,17 +74,6 @@ export const ModerationConfig = z.strictObject({
 		preset_reasons: PresetReason.array().default(discordReasons),
 	}).prefault({}).describe("Configure warn behavior"),
 
-	member_ranking: mappedEnum({
-		none: MemberRanking.None,
-		highest_role: MemberRanking.HighestRole,
-		level: MemberRanking.Level
-	}).default(MemberRanking.HighestRole).describe(
-		"Customize the system used to determine whether a moderator can moderate a user.\n" +
-		"'none' allows anyone to be moderated by a moderator.\n" +
-		"'highest_role' reflects the behavior of Discord; you can only moderate users who's highest role is below yours.\n" +
-		"'level' is based on who has a higher level in the app's group system."
-	),
-
 	default_permissions: z.strictObject({
 		ban: z.boolean().default(false),
 		unban: z.boolean().default(false),

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

@@ -81,7 +81,7 @@ export async function doBulkAction(action: BulkAction): Promise<BulkResult> {
 				continue;
 			}
 
-			if (!canModerate(action.memberRanking, action.guild.clientMember, target)) {
+			if (!canModerate(MemberRanking.HighestRole, action.guild.clientMember, target)) {
 				result.unsuccessful.push({
 					error: "App lacks permission to moderate the user",
 					user: target,