rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Regex: Upgrade engine

Browse Source 
If the extension is disabled, don't use any regex formatting. In
addition, wrap all foreach logic into its own function which
reduces the size of all regex injections.

This commit also removes the need for working around static imports
as UI is separate from the engine and is therefore imported at the
same time as other non-static extensions.

Signed-off-by: kingbri <bdashore3@proton.me>
This commit is contained in:
kingbri
2023-07-05 00:32:31 -04:00
parent fb02c00402
commit fee801c2a4
5 changed files with 84 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
public/scripts/slash-commands.js
View File

@@ -23,8 +23,7 @@ import {
import { humanizedDateTime } from "./RossAscends-mods.js";
import { resetSelectedGroup } from "./group-chats.js";
import { extension_settings } from "./extensions.js";
import { runRegexScript } from "./extensions/regex/engine.js";
import { REGEX_PLACEMENT } from "./extensions/regex/index.js";
import { getRegexedString, regex_placement } from "./extensions/regex/engine.js";
import { chat_styles, power_user } from "./power-user.js";
export {
executeSlashCommands,
@@ -228,14 +227,10 @@ async function sendMessageAs(_, text) {
const name = parts.shift().trim();
let mesText = parts.join('\n').trim();
extension_settings.regex.forEach((script) => {
if (script.placement.includes(REGEX_PLACEMENT.sendas)) {
const regexResult = runRegexScript(script, mesText);
if (regexResult) {
mesText = regexResult;
}
}
});
const regexResult = getRegexedString(mesText, regex_placement.SENDAS);
if (regexResult) {
mesText = regexResult;
}
// Messages that do nothing but set bias will be hidden from the context
const bias = extractMessageBias(mesText);
@@ -279,14 +274,10 @@ async function sendNarratorMessage(_, text) {
return;
}
extension_settings.regex.forEach((script) => {
if (script.placement.includes(REGEX_PLACEMENT.system)) {
const regexResult = runRegexScript(script, text);
if (regexResult) {
text = regexResult;
}
}
});
const regexResult = getRegexedString(text, regex_placement.SYSTEM);
if (regexResult) {
text = regexResult;
}
const name = chat_metadata[NARRATOR_NAME_KEY] || NARRATOR_NAME_DEFAULT;
// Messages that do nothing but set bias will be hidden from the context