From 3db90907058b4a14ef52fcf8a862b93b66b4e819 Mon Sep 17 00:00:00 2001 From: Dragory <2606411+Dragory@users.noreply.github.com> Date: Mon, 15 Jan 2024 18:03:45 +0000 Subject: [PATCH] fix: circular dependency in automod types --- backend/src/plugins/Automod/actions/ban.ts | 2 +- backend/src/plugins/Automod/actions/kick.ts | 2 +- backend/src/plugins/Automod/actions/mute.ts | 2 +- backend/src/plugins/Automod/actions/warn.ts | 2 +- backend/src/plugins/Automod/constants.ts | 6 ++++++ backend/src/plugins/Automod/types.ts | 5 ----- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/backend/src/plugins/Automod/actions/ban.ts b/backend/src/plugins/Automod/actions/ban.ts index dcc9563f..22cc8167 100644 --- a/backend/src/plugins/Automod/actions/ban.ts +++ b/backend/src/plugins/Automod/actions/ban.ts @@ -4,7 +4,7 @@ import { CaseArgs } from "../../Cases/types"; import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin"; import { resolveActionContactMethods } from "../functions/resolveActionContactMethods"; import { automodAction } from "../helpers"; -import { zNotify } from "../types"; +import { zNotify } from "../constants"; const configSchema = z.strictObject({ reason: zBoundedCharacters(0, 4000).nullable().default(null), diff --git a/backend/src/plugins/Automod/actions/kick.ts b/backend/src/plugins/Automod/actions/kick.ts index 5afba467..412309cd 100644 --- a/backend/src/plugins/Automod/actions/kick.ts +++ b/backend/src/plugins/Automod/actions/kick.ts @@ -4,7 +4,7 @@ import { CaseArgs } from "../../Cases/types"; import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin"; import { resolveActionContactMethods } from "../functions/resolveActionContactMethods"; import { automodAction } from "../helpers"; -import { zNotify } from "../types"; +import { zNotify } from "../constants"; export const KickAction = automodAction({ configSchema: z.strictObject({ diff --git a/backend/src/plugins/Automod/actions/mute.ts b/backend/src/plugins/Automod/actions/mute.ts index 4a2a42ad..c2f8e186 100644 --- a/backend/src/plugins/Automod/actions/mute.ts +++ b/backend/src/plugins/Automod/actions/mute.ts @@ -6,7 +6,7 @@ import { LogsPlugin } from "../../Logs/LogsPlugin"; import { MutesPlugin } from "../../Mutes/MutesPlugin"; import { resolveActionContactMethods } from "../functions/resolveActionContactMethods"; import { automodAction } from "../helpers"; -import { zNotify } from "../types"; +import { zNotify } from "../constants"; export const MuteAction = automodAction({ configSchema: z.strictObject({ diff --git a/backend/src/plugins/Automod/actions/warn.ts b/backend/src/plugins/Automod/actions/warn.ts index e8c63340..7ccb3898 100644 --- a/backend/src/plugins/Automod/actions/warn.ts +++ b/backend/src/plugins/Automod/actions/warn.ts @@ -4,7 +4,7 @@ import { CaseArgs } from "../../Cases/types"; import { ModActionsPlugin } from "../../ModActions/ModActionsPlugin"; import { resolveActionContactMethods } from "../functions/resolveActionContactMethods"; import { automodAction } from "../helpers"; -import { zNotify } from "../types"; +import { zNotify } from "../constants"; export const WarnAction = automodAction({ configSchema: z.strictObject({ diff --git a/backend/src/plugins/Automod/constants.ts b/backend/src/plugins/Automod/constants.ts index 53ff75ad..cc37f402 100644 --- a/backend/src/plugins/Automod/constants.ts +++ b/backend/src/plugins/Automod/constants.ts @@ -1,3 +1,4 @@ +import z from "zod"; import { MINUTES, SECONDS } from "../../utils"; export const RECENT_SPAM_EXPIRY_TIME = 10 * SECONDS; @@ -18,3 +19,8 @@ export enum RecentActionType { MemberLeave, ThreadCreate, } + +export const zNotify = z.union([ + z.literal("dm"), + z.literal("channel"), +]); diff --git a/backend/src/plugins/Automod/types.ts b/backend/src/plugins/Automod/types.ts index 59a09a33..251ef643 100644 --- a/backend/src/plugins/Automod/types.ts +++ b/backend/src/plugins/Automod/types.ts @@ -65,11 +65,6 @@ const zRule = z.strictObject({ }); export type TRule = z.infer; -export const zNotify = z.union([ - z.literal("dm"), - z.literal("channel"), -]); - export const zAutomodConfig = z.strictObject({ rules: zBoundedRecord( z.record(z.string().max(100), zRule),