From 6ee1fbf988bec5692fd3d594488e72051d775c79 Mon Sep 17 00:00:00 2001 From: iamshoXy Date: Thu, 25 Apr 2024 15:16:01 +0200 Subject: [PATCH] Revert 5b51ea7 --- backend/src/plugins/ModActions/events/AuditLogEvents.ts | 6 +----- .../ModActions/events/CreateBanCaseOnManualBanEvt.ts | 4 ++-- .../ModActions/events/CreateKickCaseOnManualKickEvt.ts | 2 +- .../ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/backend/src/plugins/ModActions/events/AuditLogEvents.ts b/backend/src/plugins/ModActions/events/AuditLogEvents.ts index beb28030..a66328b9 100644 --- a/backend/src/plugins/ModActions/events/AuditLogEvents.ts +++ b/backend/src/plugins/ModActions/events/AuditLogEvents.ts @@ -17,11 +17,7 @@ export const AuditLogEvents = modActionsEvt({ const casesPlugin = pluginData.getPlugin(CasesPlugin); // Create mute/unmute cases for manual timeouts - if ( - auditLogEntry.action === AuditLogEvent.MemberUpdate && - pluginData.guild.id === config.main_guild && - config.create_cases_for_manual_actions - ) { + if (auditLogEntry.action === AuditLogEvent.MemberUpdate && config.create_cases_for_manual_actions) { const target = await resolveUser(pluginData.client, auditLogEntry.targetId!); // Only act based on the last changes in this log diff --git a/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts b/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts index 449110e3..237454ba 100644 --- a/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts +++ b/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts @@ -43,7 +43,7 @@ export const CreateBanCaseOnManualBanEvt = modActionsEvt({ const config = mod instanceof UnknownUser ? pluginData.config.get() : await pluginData.config.getForUser(mod); - if (pluginData.guild.id === config.main_guild && config.create_cases_for_manual_actions) { + if (config.create_cases_for_manual_actions) { reason = relevantAuditLogEntry.reason ?? ""; createdCase = await casesPlugin.createCase({ userId: user.id, @@ -56,7 +56,7 @@ export const CreateBanCaseOnManualBanEvt = modActionsEvt({ } } else { const config = pluginData.config.get(); - if (pluginData.guild.id === config.main_guild && config.create_cases_for_manual_actions) { + if (config.create_cases_for_manual_actions) { createdCase = await casesPlugin.createCase({ userId: user.id, modId: "0", diff --git a/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts b/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts index 4d35f753..0f840910 100644 --- a/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts +++ b/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts @@ -40,7 +40,7 @@ export const CreateKickCaseOnManualKickEvt = modActionsEvt({ const config = mod instanceof UnknownUser ? pluginData.config.get() : await pluginData.config.getForUser(mod); - if (pluginData.guild.id === config.main_guild && config.create_cases_for_manual_actions) { + if (config.create_cases_for_manual_actions) { const casesPlugin = pluginData.getPlugin(CasesPlugin); createdCase = await casesPlugin.createCase({ userId: member.id, diff --git a/backend/src/plugins/ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts b/backend/src/plugins/ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts index 30e1dc9b..9400c732 100644 --- a/backend/src/plugins/ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts +++ b/backend/src/plugins/ModActions/events/CreateUnbanCaseOnManualUnbanEvt.ts @@ -41,7 +41,7 @@ export const CreateUnbanCaseOnManualUnbanEvt = modActionsEvt({ const config = mod instanceof UnknownUser ? pluginData.config.get() : await pluginData.config.getForUser(mod); - if (pluginData.guild.id === config.main_guild && config.create_cases_for_manual_actions) { + if (config.create_cases_for_manual_actions) { createdCase = await casesPlugin.createCase({ userId: user.id, modId, @@ -52,7 +52,7 @@ export const CreateUnbanCaseOnManualUnbanEvt = modActionsEvt({ } } else { const config = pluginData.config.get(); - if (pluginData.guild.id === config.main_guild && config.create_cases_for_manual_actions) { + if (config.create_cases_for_manual_actions) { createdCase = await casesPlugin.createCase({ userId: user.id, modId: "0",