From e4b098b5639aaf579fcb41b1dc0ab2954cb090fe Mon Sep 17 00:00:00 2001 From: Dragory <2606411+Dragory@users.noreply.github.com> Date: Mon, 15 Jan 2024 22:39:27 +0000 Subject: [PATCH] fix: automod types --- backend/src/plugins/Automod/actions/changePerms.ts | 6 +++--- .../Automod/functions/createMessageSpamTrigger.ts | 2 +- backend/src/plugins/Automod/triggers/matchLinks.ts | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/src/plugins/Automod/actions/changePerms.ts b/backend/src/plugins/Automod/actions/changePerms.ts index b5bc9686..33b0c283 100644 --- a/backend/src/plugins/Automod/actions/changePerms.ts +++ b/backend/src/plugins/Automod/actions/changePerms.ts @@ -2,7 +2,7 @@ import { PermissionsBitField, PermissionsString } from "discord.js"; import { U } from "ts-toolbelt"; import z from "zod"; import { TemplateSafeValueContainer, renderTemplate } from "../../../templateFormatter"; -import { isValidSnowflake, keys, noop, zSnowflake } from "../../../utils"; +import { isValidSnowflake, keys, noop, zBoundedCharacters, zSnowflake } from "../../../utils"; import { guildToTemplateSafeGuild, savedMessageToTemplateSafeSavedMessage, @@ -66,8 +66,8 @@ const allPermissionNames = [...permissionNames, ...legacyPermissionNames] as con export const ChangePermsAction = automodAction({ configSchema: z.strictObject({ - target: zSnowflake, - channel: zSnowflake.nullable().default(null), + target: zBoundedCharacters(1, 255), + channel: zBoundedCharacters(1, 255).nullable().default(null), perms: z.record( z.enum(allPermissionNames), z.boolean().nullable(), diff --git a/backend/src/plugins/Automod/functions/createMessageSpamTrigger.ts b/backend/src/plugins/Automod/functions/createMessageSpamTrigger.ts index 19364eee..562ade6b 100644 --- a/backend/src/plugins/Automod/functions/createMessageSpamTrigger.ts +++ b/backend/src/plugins/Automod/functions/createMessageSpamTrigger.ts @@ -16,7 +16,7 @@ interface TMessageSpamMatchResultType { const configSchema = z.strictObject({ amount: z.number().int(), within: zDelayString, - per_channel: z.boolean().optional(), + per_channel: z.boolean().nullable().default(false), }); export function createMessageSpamTrigger(spamType: RecentActionType, prettyName: string) { diff --git a/backend/src/plugins/Automod/triggers/matchLinks.ts b/backend/src/plugins/Automod/triggers/matchLinks.ts index 128b3cd1..fe3280fc 100644 --- a/backend/src/plugins/Automod/triggers/matchLinks.ts +++ b/backend/src/plugins/Automod/triggers/matchLinks.ts @@ -21,18 +21,18 @@ const regexCache = new WeakMap(); const quickLinkCheck = /^https?:\/\//i; const configSchema = z.strictObject({ - include_domains: z.array(z.string().max(255)).max(255).optional(), - exclude_domains: z.array(z.string().max(255)).max(255).optional(), + include_domains: z.array(z.string().max(255)).max(700).optional(), + exclude_domains: z.array(z.string().max(255)).max(700).optional(), include_subdomains: z.boolean().default(true), - include_words: z.array(z.string().max(2000)).max(512).optional(), - exclude_words: z.array(z.string().max(2000)).max(512).optional(), + include_words: z.array(z.string().max(2000)).max(700).optional(), + exclude_words: z.array(z.string().max(2000)).max(700).optional(), include_regex: z.array(zRegex(z.string().max(2000))).max(512).optional(), exclude_regex: z.array(zRegex(z.string().max(2000))).max(512).optional(), phisherman: z.strictObject({ include_suspected: z.boolean().optional(), include_verified: z.boolean().optional(), }).optional(), - only_real_links: z.boolean(), + only_real_links: z.boolean().default(true), match_messages: z.boolean().default(true), match_embeds: z.boolean().default(true), match_visible_names: z.boolean().default(false),