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: fix "Alter Outgoing Prompt" applying when unchecked (#3380)

Browse Source 
* Regex: rework ephemerality options.

* Fix ephemeral regex being executed when unwanted

* Revert to old code style
This commit is contained in:
Cohee
2025-01-29 11:39:32 +02:00
committed by GitHub
parent 9e8fd3f5a0
commit a6a7810be2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/scripts/extensions/regex/engine.js
View File

@ -95,7 +95,7 @@ function getRegexedString(rawString, placement, { characterOverride, isMarkdown,
// Script applies to Generate and input is Generate // Script applies to Generate and input is Generate
(script.promptOnly && isPrompt) || (script.promptOnly && isPrompt) ||
// Script applies to all cases when neither "only"s are true, but there's no need to do it when `isMarkdown`, the as source (chat history) should already be changed beforehand // Script applies to all cases when neither "only"s are true, but there's no need to do it when `isMarkdown`, the as source (chat history) should already be changed beforehand
(!script.markdownOnly && !script.promptOnly && !isMarkdown) (!script.markdownOnly && !script.promptOnly && !isMarkdown && !isPrompt)
) { ) {
if (isEdit && !script.runOnEdit) { if (isEdit && !script.runOnEdit) {
console.debug(`getRegexedString: Skipping script ${script.scriptName} because it does not run on edit`); console.debug(`getRegexedString: Skipping script ${script.scriptName} because it does not run on edit`);

2
public/scripts/extensions/regex/index.js
View File

@ -18,7 +18,7 @@ import { t } from '../../i18n.js';
* @property {string} replaceString - The replace string * @property {string} replaceString - The replace string
* @property {string[]} trimStrings - The trim strings * @property {string[]} trimStrings - The trim strings
* @property {string?} findRegex - The find regex * @property {string?} findRegex - The find regex
* @property {string?} substituteRegex - The substitute regex * @property {number?} substituteRegex - The substitute regex
*/ */
/** /**