refactor regex

LiveTL · Jun 7, 2024 · ce0208b · ce0208b
1 parent 08d276c
commit ce0208b
Showing 1 changed file with 37 additions and 15 deletions.
diff --git a/src/ts/ytcf-logic.ts b/src/ts/ytcf-logic.ts
@@ -62,14 +62,18 @@ export function shouldFilterMessage(action: Chat.MessageAction): boolean {
           if (!condition.value) {
             numValidFilters--;
           } else {
-            try {
-              const regex = parseRegex(condition.value);
-              const result = regex.test(compStr);
-              if (result === condition.invert) {
-                break;
-              }
-            } catch (e) {
-              console.error(e);
+            // try {
+            //   const regex = parseRegex(condition.value);
+            //   const result = regex.test(compStr);
+            //   if (result === condition.invert) {
+            //     break;
+            //   }
+            // } catch (e) {
+            //   console.error(e);
+            //   break;
+            // }
+            const { result, error } = testRegex(condition.value, compStr);
+            if (error || result === condition.invert) {
               break;
             }
           }
@@ -84,6 +88,22 @@ export function shouldFilterMessage(action: Chat.MessageAction): boolean {
   return false;
 }
 
+export const testRegex = (expression: string, value: string): { result: boolean; error: Error | false; } => {
+  try {
+    const regex = parseRegex(expression);
+    return {
+      result: regex.test(value),
+      error: false
+    };
+  } catch (e) {
+    console.error(e);
+    return {
+      result: false,
+      error: e as Error
+    };
+  }
+}
+
 export function shouldActivatePreset(preset: YtcF.FilterPreset, info: SimpleVideoInfo): boolean {
   for (const trigger of preset.triggers) {
     let compStr = '';
@@ -111,13 +131,15 @@ export function shouldActivatePreset(preset: YtcF.FilterPreset, info: SimpleVide
       const result = s1[trigger.type](s2);
       if (result) return true;
     } else {
-      try {
-        const regex = parseRegex(trigger.value);
-        const result = regex.test(compStr);
-        if (result) return true;
-      } catch (e) {
-        console.error(e);
-      }
+      // try {
+      //   const regex = parseRegex(trigger.value);
+      //   const result = regex.test(compStr);
+      //   if (result) return true;
+      // } catch (e) {
+      //   console.error(e);
+      // }
+      const { result } = testRegex(trigger.value, compStr);
+      if (result) return true;
     }
   }
   return false;