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

On review feedback of /regex-toggle

Browse Source 
- Add quiet arg to suppress success toast
- Fix return values
- Switch-case instead of nested ternaries
- state uses onOfToggle
This commit is contained in:
Wolfsblvt
2025-03-14 01:03:08 +01:00
parent 0f5f8e163d
commit 18fa33d816
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -413,13 +413,14 @@ function runRegexCallback(args, value) {
/** /**
* /regex-toggle slash command callback * /regex-toggle slash command callback
* @param {{state: string}} args Named arguments * @param {{state: string, quiet: string}} args Named arguments
* @param {string} scriptName The name of the script to toggle * @param {string} scriptName The name of the script to toggle
* @returns {Promise<string>} The regexed string * @returns {Promise<string>} The name of the script
*/ */
async function toggleRegexCallback(args, scriptName) { async function toggleRegexCallback(args, scriptName) {
if (typeof scriptName !== 'string') throw new Error('Script name must be a string.'); if (typeof scriptName !== 'string') throw new Error('Script name must be a string.');
const quiet = isTrueBoolean(args?.quiet);
const action = isTrueBoolean(args?.state) ? 'enable' : const action = isTrueBoolean(args?.state) ? 'enable' :
isFalseBoolean(args?.state) ? 'disable' : isFalseBoolean(args?.state) ? 'disable' :
'toggle'; 'toggle';
@ -429,19 +430,29 @@ async function toggleRegexCallback(args, scriptName) {
if (!script) { if (!script) {
toastr.warning(t`Regex script '${scriptName}' not found.`); toastr.warning(t`Regex script '${scriptName}' not found.`);
return; return '';
} }
script.disabled = action === 'enable' ? false : action === 'disable' ? true : !script.disabled; switch (action) {
case 'enable':
script.disabled = false;
break;
case 'disable':
script.disabled = true;
break;
default:
script.disabled = !script.disabled;
break;
}
const isScoped = characters[this_chid]?.data?.extensions?.regex_scripts?.some(s => s.id === script.id); const isScoped = characters[this_chid]?.data?.extensions?.regex_scripts?.some(s => s.id === script.id);
const index = isScoped ? characters[this_chid]?.data?.extensions?.regex_scripts?.indexOf(script) : scripts.indexOf(script); const index = isScoped ? characters[this_chid]?.data?.extensions?.regex_scripts?.indexOf(script) : scripts.indexOf(script);
await saveRegexScript(script, index, isScoped); await saveRegexScript(script, index, isScoped);
if (script.disabled) { if (script.disabled) {
toastr.success(t`Regex script '${scriptName}' has been disabled.`); !quiet && toastr.success(t`Regex script '${scriptName}' has been disabled.`);
} else { } else {
toastr.success(t`Regex script '${scriptName}' has been enabled.`); !quiet && toastr.success(t`Regex script '${scriptName}' has been enabled.`);
} }
return script.scriptName || ''; return script.scriptName || '';
@ -676,8 +687,16 @@ jQuery(async () => {
namedArgumentList: [ namedArgumentList: [
SlashCommandNamedArgument.fromProps({ SlashCommandNamedArgument.fromProps({
name: 'state', name: 'state',
description: 'Explicitly set the state of the script (true to enable, false to disable). If not provided, the state will be toggled to the opposite of the current state.', description: 'Explicitly set the state of the script (\'on\' to enable, \'off\' to disable). If not provided, the state will be toggled to the opposite of the current state.',
typeList: [ARGUMENT_TYPE.BOOLEAN], typeList: [ARGUMENT_TYPE.BOOLEAN],
defaultValue: 'toggle',
enumList: commonEnumProviders.boolean('onOffToggle')(),
}),
SlashCommandNamedArgument.fromProps({
name: 'quiet',
description: 'Suppress the toast message script toggled',
typeList: [ARGUMENT_TYPE.BOOLEAN],
defaultValue: 'false',
enumList: commonEnumProviders.boolean('trueFalse')(), enumList: commonEnumProviders.boolean('trueFalse')(),
}), }),
], ],