Port #3031 onto new engine

48d8e6e2c385218e64926f2fd72dd84943f67416

Cohee <18619528+Cohee1207@users.noreply.github.com>

public/scripts/extensions/regex/engine.js+27 -2 Viewed

-import { characters, substituteParams, this_chid } from '../../../script.js';
+import { characters, substituteParams, substituteParamsExtended, this_chid } from '../../../script.js';
 import { extension_settings } from '../../extensions.js';
 import { regexFromString } from '../../utils.js';
 export {

     WORLD_INFO: 5,
 };
+function sanitizeRegexMacro(x) {
+    return (x && typeof x === 'string') ?
+        x.replaceAll(/[\n\r\t\v\f\0.^$*+?{}[\]\\/|()]/gs, function (s) {
+            switch (s) {
+                case '\n':
+                    return '\\n';
+                case '\r':
+                    return '\\r';
+                case '\t':
+                    return '\\t';
+                case '\v':
+                    return '\\v';
+                case '\f':
+                    return '\\f';
+                case '\0':
+                    return '\\0';
+                default:
+                    return '\\' + s;
+            }
+        }) : x;
+}
 function getScopedRegex() {
     const isAllowed = extension_settings?.character_allowed_regex?.includes(characters?.[this_chid]?.avatar);

         return newString;
+    }
-    const findRegex = regexFromString(regexScript.substituteRegex ? substituteParams(regexScript.findRegex) : regexScript.findRegex);
+    const regexString = regexScript.substituteRegex
+        ? substituteParamsExtended(regexScript.findRegex, {}, sanitizeRegexMacro)
+        : regexScript.findRegex;
+    const findRegex = regexFromString(regexString);
     // The user skill issued. Return with nothing.
     if (!findRegex) {