From 17e388ff485a20ce0c2efdce40d845c5aedc58f0 Mon Sep 17 00:00:00 2001 From: Dragory <2606411+Dragory@users.noreply.github.com> Date: Wed, 23 Dec 2020 04:27:58 +0200 Subject: [PATCH] cases: allow using user overrides for log_automatic_actions --- backend/src/plugins/Cases/functions/createCaseNote.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/src/plugins/Cases/functions/createCaseNote.ts b/backend/src/plugins/Cases/functions/createCaseNote.ts index 1eae08f9..34db8758 100644 --- a/backend/src/plugins/Cases/functions/createCaseNote.ts +++ b/backend/src/plugins/Cases/functions/createCaseNote.ts @@ -3,7 +3,7 @@ import { GuildPluginData } from "knub"; import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError"; import { resolveCaseId } from "./resolveCaseId"; import { postCaseToCaseLogChannel } from "./postToCaseLogChannel"; -import { resolveUser } from "../../../utils"; +import { resolveUser, UnknownUser } from "../../../utils"; export async function createCaseNote(pluginData: GuildPluginData<CasesPluginType>, args: CaseNoteArgs): Promise<void> { const theCase = await pluginData.state.cases.find(resolveCaseId(args.caseId)); @@ -12,7 +12,7 @@ export async function createCaseNote(pluginData: GuildPluginData<CasesPluginType } const mod = await resolveUser(pluginData.client, args.modId); - if (!mod) { + if (mod instanceof UnknownUser) { throw new RecoverablePluginError(ERRORS.INVALID_USER); } @@ -46,7 +46,8 @@ export async function createCaseNote(pluginData: GuildPluginData<CasesPluginType } } - if ((!args.automatic || pluginData.config.get().log_automatic_actions) && args.postInCaseLogOverride !== false) { + const modConfig = pluginData.config.getForUser(mod); + if ((!args.automatic || modConfig.log_automatic_actions) && args.postInCaseLogOverride !== false) { await postCaseToCaseLogChannel(pluginData, theCase.id); } }