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

Make Run on edit actually work

Browse Source 
Fixes #2958
This commit is contained in:
Cohee
2024-10-07 20:21:07 +03:00
parent 591f61d354
commit 9e50ff34c9
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/script.js
View File

@@ -6798,7 +6798,10 @@ function updateMessage(div) {
text = getRegexedString( text = getRegexedString(
text, text,
regexPlacement, regexPlacement,
{ characterOverride: mes.extra?.type === 'narrator' ? undefined : mes.name }, {
characterOverride: mes.extra?.type === 'narrator' ? undefined : mes.name,
isEdit: true,
},
); );

2
public/scripts/extensions/regex/editor.html
View File

@@ -117,7 +117,7 @@
<input type="checkbox" name="disabled" /> <input type="checkbox" name="disabled" />
<span data-i18n="Disabled">Disabled</span> <span data-i18n="Disabled">Disabled</span>
</label> </label>
<label class="checkbox flex-container"> <label class="checkbox flex-container" title="Run the regex script when the message belonging a to specified role(s) is edited.">
<input type="checkbox" name="run_on_edit" /> <input type="checkbox" name="run_on_edit" />
<span data-i18n="Run On Edit">Run On Edit</span> <span data-i18n="Run On Edit">Run On Edit</span>
</label> </label>

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

@@ -44,9 +44,9 @@ function getScopedRegex() {
* @param {regex_placement} placement The placement of the string * @param {regex_placement} placement The placement of the string
* @param {RegexParams} params The parameters to use for the regex script * @param {RegexParams} params The parameters to use for the regex script
* @returns {string} The regexed string * @returns {string} The regexed string
* @typedef {{characterOverride?: string, isMarkdown?: boolean, isPrompt?: boolean, depth?: number }} RegexParams The parameters to use for the regex script * @typedef {{characterOverride?: string, isMarkdown?: boolean, isPrompt?: boolean, isEdit?: boolean, depth?: number }} RegexParams The parameters to use for the regex script
*/ */
function getRegexedString(rawString, placement, { characterOverride, isMarkdown, isPrompt, depth } = {}) { function getRegexedString(rawString, placement, { characterOverride, isMarkdown, isPrompt, isEdit, depth } = {}) {
// WTF have you passed me? // WTF have you passed me?
if (typeof rawString !== 'string') { if (typeof rawString !== 'string') {
console.warn('getRegexedString: rawString is not a string. Returning empty string.'); console.warn('getRegexedString: rawString is not a string. Returning empty string.');
@@ -68,6 +68,11 @@ function getRegexedString(rawString, placement, { characterOverride, isMarkdown,
// 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)
) { ) {
if (isEdit && !script.runOnEdit) {
console.debug(`getRegexedString: Skipping script ${script.scriptName} because it does not run on edit`);
return;
}
// Check if the depth is within the min/max depth // Check if the depth is within the min/max depth
if (typeof depth === 'number' && depth >= 0) { if (typeof depth === 'number' && depth >= 0) {
if (!isNaN(script.minDepth) && script.minDepth !== null && script.minDepth >= 0 && depth < script.minDepth) { if (!isNaN(script.minDepth) && script.minDepth !== null && script.minDepth >= 0 && depth < script.minDepth) {