From 9da636996130cac5904625300b7aaf3c1b3d75c8 Mon Sep 17 00:00:00 2001 From: metal Date: Mon, 6 Sep 2021 13:51:23 +0100 Subject: [PATCH 1/2] Update backend/src/plugins/Automod/AutomodPlugin.ts Co-authored-by: Almeida --- backend/src/plugins/Automod/AutomodPlugin.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/plugins/Automod/AutomodPlugin.ts b/backend/src/plugins/Automod/AutomodPlugin.ts index d8c81512..14fc645b 100644 --- a/backend/src/plugins/Automod/AutomodPlugin.ts +++ b/backend/src/plugins/Automod/AutomodPlugin.ts @@ -161,7 +161,7 @@ const configPreprocessor: ConfigPreprocessorFn = options => { if (rule["actions"]["log"] == null) { rule["actions"]["log"] = true; } - if (rule["actions"]["clean"] === true && rule["actions"]["start_thread"]) { + if (rule["actions"]["clean"] && rule["actions"]["start_thread"]) { throw new StrictValidationError([`Cannot have both clean and start_thread at rule '${rule.name}'`]); } } From dd3902ecfcbc321ce56a0bf600f397bccf7df376 Mon Sep 17 00:00:00 2001 From: metal Date: Mon, 6 Sep 2021 13:51:32 +0100 Subject: [PATCH 2/2] Update backend/src/plugins/Automod/actions/startThread.ts Co-authored-by: Almeida --- backend/src/plugins/Automod/actions/startThread.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/plugins/Automod/actions/startThread.ts b/backend/src/plugins/Automod/actions/startThread.ts index fdc06d05..fc977f0e 100644 --- a/backend/src/plugins/Automod/actions/startThread.ts +++ b/backend/src/plugins/Automod/actions/startThread.ts @@ -1,10 +1,10 @@ import { GuildFeature, ThreadAutoArchiveDuration } from "discord-api-types"; import { TextChannel } from "discord.js"; import * as t from "io-ts"; -import { renderTemplate, TemplateSafeValueContainer } from "src/templateFormatter"; +import { renderTemplate, TemplateSafeValueContainer } from "../../../templateFormatter"; import { ChannelTypeStrings } from "src/types"; -import { convertDelayStringToMS, MINUTES, tDelayString, tNullable } from "src/utils"; -import { savedMessageToTemplateSafeSavedMessage, userToTemplateSafeUser } from "src/utils/templateSafeObjects"; +import { convertDelayStringToMS, MINUTES, tDelayString, tNullable } from "../../../utils"; +import { savedMessageToTemplateSafeSavedMessage, userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; import { noop } from "../../../utils"; import { automodAction } from "../helpers";