diff --git a/backend/src/plugins/ModActions/ModActionsPlugin.ts b/backend/src/plugins/ModActions/ModActionsPlugin.ts index e1890271..7a05f0dd 100644 --- a/backend/src/plugins/ModActions/ModActionsPlugin.ts +++ b/backend/src/plugins/ModActions/ModActionsPlugin.ts @@ -51,7 +51,6 @@ import { ModActionsPluginType, zModActionsConfig } from "./types"; const defaultOptions = { config: { - main_guild: null, dm_on_warn: true, dm_on_kick: false, dm_on_ban: false, diff --git a/backend/src/plugins/ModActions/commands/UnbanCmd.ts b/backend/src/plugins/ModActions/commands/UnbanCmd.ts index a0eb41c9..53363ee0 100644 --- a/backend/src/plugins/ModActions/commands/UnbanCmd.ts +++ b/backend/src/plugins/ModActions/commands/UnbanCmd.ts @@ -47,19 +47,12 @@ export const UnbanCmd = modActionsCmd({ mod = args.mod; } - const config = pluginData.config.get(); - const guild = pluginData.client.guilds.cache.get(config.main_guild as Snowflake); - if (!guild) { - sendErrorMessage(pluginData, msg.channel, "Main guild not found!"); - return; - } - pluginData.state.serverLogs.ignoreLog(LogType.MEMBER_UNBAN, user.id); const reason = formatReasonWithAttachments(args.reason, [...msg.attachments.values()]); try { ignoreEvent(pluginData, IgnoredEventType.Unban, user.id); - await guild.bans.remove(user.id as Snowflake, reason ?? undefined); + await pluginData.guild.bans.remove(user.id as Snowflake, reason ?? undefined); } catch { sendErrorMessage(pluginData, msg.channel, "Failed to unban member; are you sure they're banned?"); return; diff --git a/backend/src/plugins/ModActions/types.ts b/backend/src/plugins/ModActions/types.ts index d5314c0f..6db044dc 100644 --- a/backend/src/plugins/ModActions/types.ts +++ b/backend/src/plugins/ModActions/types.ts @@ -12,7 +12,6 @@ import { UserNotificationMethod, UserNotificationResult } from "../../utils"; import { CaseArgs } from "../Cases/types"; export const zModActionsConfig = z.strictObject({ - main_guild: z.nullable(z.string()), dm_on_warn: z.boolean(), dm_on_kick: z.boolean(), dm_on_ban: z.boolean(),