StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(automod): fix empty patterns list in match_regex matching every message

Browse source
This commit is contained in:
Dragory 2021-10-05 21:48:02 +03:00
parent 392e2da2d1
commit b951feeabd
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,6 +46,17 @@ export const MatchRegexTrigger = automodTrigger<MatchResultType>()({
return; return;
} }
if (trigger.patterns.length === 0) {
return;
}
if (!combinedRegexCache.has(trigger)) {
const combinedPattern = trigger.patterns.map((p) => `(?:${p.source})`).join("|");
const combinedRegex = new RegExp(combinedPattern, trigger.case_sensitive ? "" : "i");
combinedRegexCache.set(trigger, combinedRegex);
}
const regex = combinedRegexCache.get(trigger)!;
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) { if (trigger.strip_markdown) {
str = stripMarkdown(str); str = stripMarkdown(str);
@ -55,13 +66,6 @@ export const MatchRegexTrigger = automodTrigger<MatchResultType>()({
str = normalizeText(str); str = normalizeText(str);
} }
if (!combinedRegexCache.has(trigger)) {
const combinedPattern = trigger.patterns.map((p) => `(?:${p.source})`).join("|");
const combinedRegex = new RegExp(combinedPattern, trigger.case_sensitive ? "" : "i");
combinedRegexCache.set(trigger, combinedRegex);
}
const regex = combinedRegexCache.get(trigger)!;
const matches = await pluginData.state.regexRunner.exec(regex, str).catch(allowTimeout); const matches = await pluginData.state.regexRunner.exec(regex, str).catch(allowTimeout);
if (matches?.length) { if (matches?.length) {
return { return {