From b8f86d55da9a58398d589a0d14ffac971fb8e503 Mon Sep 17 00:00:00 2001
From: kingbri <bdashore3@proton.me>
Date: Wed, 5 Jul 2023 00:52:29 -0400
Subject: [PATCH] Regex: Add substitution to regex and undefined checks

Sometimes a user may want to substitute variables in the regex
itself rather than just matching those variables. This can be
optionally enabled in the editor.

In addition, try preventing crashes by checking for undefined
variables or null coalescing.

Signed-off-by: kingbri <bdashore3@proton.me>
---
 public/scripts/extensions/regex/editor.html |  4 ++++
 public/scripts/extensions/regex/engine.js   |  5 +++--
 public/scripts/extensions/regex/index.js    | 21 +++++++++++++++++----
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/public/scripts/extensions/regex/editor.html b/public/scripts/extensions/regex/editor.html
index e19d11777..31bb8eada 100644
--- a/public/scripts/extensions/regex/editor.html
+++ b/public/scripts/extensions/regex/editor.html
@@ -89,6 +89,10 @@
                     <input type="checkbox" name="run_on_edit" />
                     <span data-i18n="Run On Edit">Run On Edit</span>
                 </label>
+                <label class="checkbox flex-container">
+                    <input type="checkbox" name="substitute_regex" />
+                    <span data-i18n="Substitute Regex">Substitute Regex</span>
+                </label>
             </div>
         </div>
     </div>
diff --git a/public/scripts/extensions/regex/engine.js b/public/scripts/extensions/regex/engine.js
index d4dc484e1..073eb7028 100644
--- a/public/scripts/extensions/regex/engine.js
+++ b/public/scripts/extensions/regex/engine.js
@@ -45,13 +45,14 @@ function getRegexedString(rawString, placement) {
 
 // Runs the provided regex script on the given string
 function runRegexScript(regexScript, rawString) {
-    if (!!(regexScript.disabled)) {
+    if (!regexScript || !!(regexScript.disabled) || !regexScript?.findRegex || !rawString) {
         return;
     }
 
     let match;
     let newString;
-    const findRegex = regexFromString(regexScript.findRegex);
+    console.log(regexScript.substituteRegex ? substituteParams(regexScript.findRegex) : regexScript.findRegex)
+    const findRegex = regexFromString(regexScript.substituteRegex ? substituteParams(regexScript.findRegex) : regexScript.findRegex);
     while ((match = findRegex.exec(rawString)) !== null) {
         const fencedMatch = match[0];
         const capturedMatch = match[1];
diff --git a/public/scripts/extensions/regex/index.js b/public/scripts/extensions/regex/index.js
index d839b7769..e577437ba 100644
--- a/public/scripts/extensions/regex/index.js
+++ b/public/scripts/extensions/regex/index.js
@@ -97,16 +97,25 @@ async function onRegexEditorOpenClick(existingId) {
         existingScriptIndex = extension_settings.regex.findIndex((script) => script.scriptName === existingScriptName);
         if (existingScriptIndex !== -1) {
             const existingScript = extension_settings.regex[existingScriptIndex];
-            editorHtml.find(`.regex_script_name`).val(existingScript.scriptName);
-            editorHtml.find(`.find_regex`).val(existingScript.findRegex);
-            editorHtml.find(`.regex_replace_string`).val(existingScript.replaceString);
+            if (existingScript.scriptName) {
+                editorHtml.find(`.regex_script_name`).val(existingScript.scriptName);
+            } else {
+                toastr.error("This script doesn't have a name! Please delete it.")
+                return;
+            }
+
+            editorHtml.find(`.find_regex`).val(existingScript.findRegex || "");
+            editorHtml.find(`.regex_replace_string`).val(existingScript.replaceString || "");
             editorHtml.find(`.regex_trim_strings`).val(existingScript.trimStrings?.join("\n") || []);
             editorHtml
                 .find(`input[name="disabled"]`)
                 .prop("checked", existingScript.disabled ?? false);
             editorHtml
                 .find(`input[name="run_on_edit"]`)
-                .prop("checked", existingScript.runOnEdit);
+                .prop("checked", existingScript.runOnEdit ?? false);
+            editorHtml
+                .find(`input[name="substitute_regex"]`)
+                .prop("checked", existingScript.substituteRegex ?? false);
 
             existingScript.placement.forEach((element) => {
                 editorHtml
@@ -145,6 +154,10 @@ async function onRegexEditorOpenClick(existingId) {
             runOnEdit:
                 editorHtml
                     .find(`input[name="run_on_edit"]`)
+                    .prop("checked"),
+            substituteRegex:
+                editorHtml
+                    .find(`input[name="substitute_regex"]`)
                     .prop("checked")
         };