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

Remove /flushinject's variable usage in unnamed

Browse Source
This commit is contained in:
Wolfsblvt
2024-06-28 04:00:32 +02:00
parent 11ca0dd22e
commit b97dceeb7a
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1310,12 +1310,9 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({
unnamedArgumentList: [ unnamedArgumentList: [
SlashCommandArgument.fromProps({ SlashCommandArgument.fromProps({
description: 'injection ID or a variable name pointing to ID', description: 'injection ID or a variable name pointing to ID',
typeList: [ARGUMENT_TYPE.STRING, ARGUMENT_TYPE.VARIABLE_NAME], typeList: [ARGUMENT_TYPE.STRING],
defaultValue: '', defaultValue: '',
enumProvider: () => [ enumProvider: commonEnumProviders.injects,
...commonEnumProviders.injects(),
...commonEnumProviders.variables('all')().map(x => { x.description = 'Variable'; return x; }),
],
}), }),
], ],
callback: flushInjectsCallback, callback: flushInjectsCallback,
@ -1486,16 +1483,16 @@ function listInjectsCallback() {
/** /**
* Flushes script injections for the current chat. * Flushes script injections for the current chat.
* @param {import('./slash-commands/SlashCommand.js').NamedArguments} args Named arguments * @param {import('./slash-commands/SlashCommand.js').NamedArguments} _ Named arguments
* @param {string} value Unnamed argument * @param {string} value Unnamed argument
* @returns {string} Empty string * @returns {string} Empty string
*/ */
function flushInjectsCallback(args, value) { function flushInjectsCallback(_, value) {
if (!chat_metadata.script_injects) { if (!chat_metadata.script_injects) {
return ''; return '';
} }
const idArgument = resolveVariable(value, args._scope); const idArgument = value;
for (const [id, inject] of Object.entries(chat_metadata.script_injects)) { for (const [id, inject] of Object.entries(chat_metadata.script_injects)) {
if (idArgument && id !== idArgument) { if (idArgument && id !== idArgument) {