StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-03-15 05:41:51 +00:00
Code Releases Activity

Disable match_embeds by default in other triggers as well. Add strip_markdown option to match_regex as well.

Browse source
This commit is contained in:
Dragory 2020-09-15 02:02:24 +03:00
parent d9140ff7a8
commit 46400166ea
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/src/plugins/Automod/triggers/matchInvites.ts
View file

@ -37,7 +37,7 @@ export const MatchInvitesTrigger = automodTrigger<MatchResultType>()({
defaultConfig: { defaultConfig: {
allow_group_dm_invites: false, allow_group_dm_invites: false,
match_messages: true, match_messages: true,
match_embeds: true, match_embeds: false,
match_visible_names: false, match_visible_names: false,
match_usernames: false, match_usernames: false,
match_nicknames: false, match_nicknames: false,

2
backend/src/plugins/Automod/triggers/matchLinks.ts
View file

@ -40,7 +40,7 @@ export const MatchLinksTrigger = automodTrigger<MatchResultType>()({
defaultConfig: { defaultConfig: {
include_subdomains: true, include_subdomains: true,
match_messages: true, match_messages: true,
match_embeds: true, match_embeds: false,
match_visible_names: false, match_visible_names: false,
match_usernames: false, match_usernames: false,
match_nicknames: false, match_nicknames: false,

9
backend/src/plugins/Automod/triggers/matchRegex.ts
View file

@ -6,6 +6,7 @@ import { getTextMatchPartialSummary } from "../functions/getTextMatchPartialSumm
import { allowTimeout } from "../../../RegExpRunner"; import { allowTimeout } from "../../../RegExpRunner";
import { TRegex } from "../../../validatorUtils"; import { TRegex } from "../../../validatorUtils";
import { normalizeText } from "../../../utils/normalizeText"; import { normalizeText } from "../../../utils/normalizeText";
import { stripMarkdown } from "../../../utils/stripMarkdown";
interface MatchResultType { interface MatchResultType {
pattern: string; pattern: string;
@ -17,6 +18,7 @@ export const MatchRegexTrigger = automodTrigger<MatchResultType>()({
patterns: t.array(TRegex), patterns: t.array(TRegex),
case_sensitive: t.boolean, case_sensitive: t.boolean,
normalize: t.boolean, normalize: t.boolean,
strip_markdown: t.boolean,
match_messages: t.boolean, match_messages: t.boolean,
match_embeds: t.boolean, match_embeds: t.boolean,
match_visible_names: t.boolean, match_visible_names: t.boolean,
@ -28,8 +30,9 @@ export const MatchRegexTrigger = automodTrigger<MatchResultType>()({
defaultConfig: { defaultConfig: {
case_sensitive: false, case_sensitive: false,
normalize: false, normalize: false,
strip_markdown: false,
match_messages: true, match_messages: true,
match_embeds: true, match_embeds: false,
match_visible_names: false, match_visible_names: false,
match_usernames: false, match_usernames: false,
match_nicknames: false, match_nicknames: false,
@ -42,6 +45,10 @@ export const MatchRegexTrigger = automodTrigger<MatchResultType>()({
} }
for await (let [type, str] of matchMultipleTextTypesOnMessage(pluginData, trigger, context.message)) { for await (let [type, str] of matchMultipleTextTypesOnMessage(pluginData, trigger, context.message)) {
if (trigger.strip_markdown) {
str = stripMarkdown(str);
}
if (trigger.normalize) { if (trigger.normalize) {
str = normalizeText(str); str = normalizeText(str);
} }