diff --git a/backend/src/plugins/Automod/triggers/matchInvites.ts b/backend/src/plugins/Automod/triggers/matchInvites.ts index c0a9dbca..234b4578 100644 --- a/backend/src/plugins/Automod/triggers/matchInvites.ts +++ b/backend/src/plugins/Automod/triggers/matchInvites.ts @@ -37,7 +37,7 @@ export const MatchInvitesTrigger = automodTrigger()({ defaultConfig: { allow_group_dm_invites: false, match_messages: true, - match_embeds: true, + match_embeds: false, match_visible_names: false, match_usernames: false, match_nicknames: false, diff --git a/backend/src/plugins/Automod/triggers/matchLinks.ts b/backend/src/plugins/Automod/triggers/matchLinks.ts index 9a71ea4b..50d953d6 100644 --- a/backend/src/plugins/Automod/triggers/matchLinks.ts +++ b/backend/src/plugins/Automod/triggers/matchLinks.ts @@ -40,7 +40,7 @@ export const MatchLinksTrigger = automodTrigger()({ defaultConfig: { include_subdomains: true, match_messages: true, - match_embeds: true, + match_embeds: false, match_visible_names: false, match_usernames: false, match_nicknames: false, diff --git a/backend/src/plugins/Automod/triggers/matchRegex.ts b/backend/src/plugins/Automod/triggers/matchRegex.ts index 3b98469a..95dc3241 100644 --- a/backend/src/plugins/Automod/triggers/matchRegex.ts +++ b/backend/src/plugins/Automod/triggers/matchRegex.ts @@ -6,6 +6,7 @@ import { getTextMatchPartialSummary } from "../functions/getTextMatchPartialSumm import { allowTimeout } from "../../../RegExpRunner"; import { TRegex } from "../../../validatorUtils"; import { normalizeText } from "../../../utils/normalizeText"; +import { stripMarkdown } from "../../../utils/stripMarkdown"; interface MatchResultType { pattern: string; @@ -17,6 +18,7 @@ export const MatchRegexTrigger = automodTrigger()({ patterns: t.array(TRegex), case_sensitive: t.boolean, normalize: t.boolean, + strip_markdown: t.boolean, match_messages: t.boolean, match_embeds: t.boolean, match_visible_names: t.boolean, @@ -28,8 +30,9 @@ export const MatchRegexTrigger = automodTrigger()({ defaultConfig: { case_sensitive: false, normalize: false, + strip_markdown: false, match_messages: true, - match_embeds: true, + match_embeds: false, match_visible_names: false, match_usernames: false, match_nicknames: false, @@ -42,6 +45,10 @@ export const MatchRegexTrigger = automodTrigger()({ } for await (let [type, str] of matchMultipleTextTypesOnMessage(pluginData, trigger, context.message)) { + if (trigger.strip_markdown) { + str = stripMarkdown(str); + } + if (trigger.normalize) { str = normalizeText(str); }