empty regex fix

LiveTL · May 28, 2024 · fc62613 · fc62613
1 parent 6797867
commit fc62613
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/components/YtcFilterWelcome.svelte b/src/components/YtcFilterWelcome.svelte
@@ -36,7 +36,7 @@
     <br />
     <strong>v{version}:</strong>
     <span>
-      new auto-open setting + UI tweaks.
+      new auto-open setting, UI tweaks, minor fixes.
     </span>
   </p>
 </div>

diff --git a/src/components/settings/YtcFilterArchiveList.svelte b/src/components/settings/YtcFilterArchiveList.svelte
@@ -209,7 +209,7 @@
       </tr>
       {#each data.slice(startIndex, startIndex + 10) as item, i (item.key)}
         <tr class="hover-highlight" style="padding: 0x 5px;" on:click={isArchiveLoadSelection ? loadArchiveEntry(item) : undefined}>
-          <td>{item.info?.video.videoId}</td>
+          <td style="white-space: nowrap;">{item.info?.video.videoId}</td>
           <td style="width: 100%;">
             {computeName(item)}
           </td>

diff --git a/src/ts/ytcf-logic.ts b/src/ts/ytcf-logic.ts
@@ -59,12 +59,14 @@ export function shouldFilterMessage(action: Chat.MessageAction): boolean {
             break;
           }
         } else {
-          const regex = parseRegex(condition.value);
-          const result = regex.test(compStr);
           if (!condition.value) {
             numValidFilters--;
-          } else if (result === condition.invert) {
-            break;
+          } else {
+            const regex = parseRegex(condition.value);
+            const result = regex.test(compStr);
+            if (result === condition.invert) {
+              break;
+            }
           }
         }
         numSatisfied++;
@@ -105,8 +107,12 @@ export function shouldActivatePreset(preset: YtcF.FilterPreset, info: SimpleVide
       if (result) return true;
     } else {
       const regex = parseRegex(trigger.value);
-      const result = regex.test(compStr);
-      if (result) return true;
+      try {
+        const result = regex.test(compStr);
+        if (result) return true;
+      } catch (e) {
+        console.error(e);
+      }
     }
   }
   return false;