From ef53ee64c62b26d3659f420a5303a038735cb3b9 Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Tue, 5 Oct 2021 22:10:56 +0300
Subject: [PATCH] fix: revert regex batching

---
 .../plugins/Automod/triggers/matchRegex.ts    | 35 ++++++-------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/backend/src/plugins/Automod/triggers/matchRegex.ts b/backend/src/plugins/Automod/triggers/matchRegex.ts
index b334d9a4..3e0b2e38 100644
--- a/backend/src/plugins/Automod/triggers/matchRegex.ts
+++ b/backend/src/plugins/Automod/triggers/matchRegex.ts
@@ -13,8 +13,6 @@ interface MatchResultType {
   type: MatchableTextType;
 }
 
-const combinedRegexCache: WeakMap<any, RegExp> = new WeakMap();
-
 export const MatchRegexTrigger = automodTrigger<MatchResultType>()({
   configType: t.type({
     patterns: t.array(TRegex),
@@ -46,20 +44,6 @@ export const MatchRegexTrigger = automodTrigger<MatchResultType>()({
       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");
-      if (trigger.patterns.some((r) => r.source === "。")) {
-        console.log("!! COMBINED PATTERN !!", combinedPattern);
-      }
-      combinedRegexCache.set(trigger, combinedRegex);
-    }
-    const regex = combinedRegexCache.get(trigger)!;
-
     for await (let [type, str] of matchMultipleTextTypesOnMessage(pluginData, trigger, context.message)) {
       if (trigger.strip_markdown) {
         str = stripMarkdown(str);
@@ -69,14 +53,17 @@ export const MatchRegexTrigger = automodTrigger<MatchResultType>()({
         str = normalizeText(str);
       }
 
-      const matches = await pluginData.state.regexRunner.exec(regex, str).catch(allowTimeout);
-      if (matches?.length) {
-        return {
-          extra: {
-            pattern: "<temporarily hidden>",
-            type,
-          },
-        };
+      for (const sourceRegex of trigger.patterns) {
+        const regex = new RegExp(sourceRegex.source, trigger.case_sensitive && !sourceRegex.ignoreCase ? "" : "i");
+        const matches = await pluginData.state.regexRunner.exec(regex, str).catch(allowTimeout);
+        if (matches?.length) {
+          return {
+            extra: {
+              pattern: sourceRegex.source,
+              type,
+            },
+          };
+        }
       }
     }