From db6f782e0f59ad665c7f50837610860743727cd8 Mon Sep 17 00:00:00 2001 From: LenAnderson Date: Thu, 7 Dec 2023 16:48:24 +0000 Subject: [PATCH] add index to /setvar and /setglobalvar --- public/scripts/variables.js | 54 ++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/public/scripts/variables.js b/public/scripts/variables.js index 99175d9c4..39038684a 100644 --- a/public/scripts/variables.js +++ b/public/scripts/variables.js @@ -28,12 +28,33 @@ function getLocalVariable(name, args = {}) { return (localVariable === '' || isNaN(Number(localVariable))) ? (localVariable || '') : Number(localVariable); } -function setLocalVariable(name, value) { +function setLocalVariable(name, value, args = {}) { if (!chat_metadata.variables) { chat_metadata.variables = {}; } - chat_metadata.variables[name] = value; + if (args.index !== undefined) { + try { + let localVariable = JSON.parse(chat_metadata.variables[name] ?? 'null'); + const numIndex = Number(args.index); + if (Number.isNaN(numIndex)) { + if (localVariable === null) { + localVariable = {}; + } + localVariable[args.index] = value; + } else { + if (localVariable === null) { + localVariable = []; + } + localVariable[numIndex] = value; + } + chat_metadata.variables[name] = JSON.stringify(localVariable); + } catch { + // that didn't work + } + } else { + chat_metadata.variables[name] = value; + } saveMetadataDebounced(); return value; } @@ -60,8 +81,29 @@ function getGlobalVariable(name, args = {}) { return (globalVariable === '' || isNaN(Number(globalVariable))) ? (globalVariable || '') : Number(globalVariable); } -function setGlobalVariable(name, value) { - extension_settings.variables.global[name] = value; +function setGlobalVariable(name, value, args = {}) { + if (args.index !== undefined) { + try { + let globalVariable = JSON.parse(extension_settings.variables.global[name] ?? 'null'); + const numIndex = Number(args.index); + if (Number.isNaN(numIndex)) { + if (globalVariable === null) { + globalVariable = {}; + } + globalVariable[args.index] = value; + } else { + if (globalVariable === null) { + globalVariable = []; + } + globalVariable[numIndex] = value; + } + extension_settings.variables.global[name] = JSON.stringify(globalVariable); + } catch { + // that didn't work + } + } else { + extension_settings.variables.global[name] = value; + } saveSettingsDebounced(); } @@ -577,10 +619,10 @@ function lenValuesCallback(value) { export function registerVariableCommands() { registerSlashCommand('listvar', listVariablesCallback, [], ' – list registered chat variables', true, true); - registerSlashCommand('setvar', (args, value) => setLocalVariable(args.key || args.name, value), [], 'key=varname (value) – set a local variable value and pass it down the pipe, e.g. /setvar key=color green', true, true); + registerSlashCommand('setvar', (args, value) => setLocalVariable(args.key || args.name, value, args), [], 'key=varname (value) – set a local variable value and pass it down the pipe, e.g. /setvar key=color green', true, true); registerSlashCommand('getvar', (args, value) => getLocalVariable(value, args), [], 'index=listIndex (key) – get a local variable value and pass it down the pipe, index is optional, e.g. /getvar height or /getvar index=3 costumes', true, true); registerSlashCommand('addvar', (args, value) => addLocalVariable(args.key || args.name, value), [], 'key=varname (increment) – add a value to a local variable and pass the result down the pipe, e.g. /addvar score 10', true, true); - registerSlashCommand('setglobalvar', (args, value) => setGlobalVariable(args.key || args.name, value), [], 'key=varname (value) – set a global variable value and pass it down the pipe, e.g. /setglobalvar key=color green', true, true); + registerSlashCommand('setglobalvar', (args, value) => setGlobalVariable(args.key || args.name, value, args), [], 'key=varname (value) – set a global variable value and pass it down the pipe, e.g. /setglobalvar key=color green', true, true); registerSlashCommand('getglobalvar', (args, value) => getGlobalVariable(value, args), [], 'index=listIndex (key) – get a global variable value and pass it down the pipe, index is optional, e.g. /getglobalvar height or /getglobalvar index=3 costumes', true, true); registerSlashCommand('addglobalvar', (args, value) => addGlobalVariable(args.key || args.name, value), [], 'key=varname (increment) – add a value to a global variable and pass the result down the pipe, e.g. /addglobalvar score 10', true, true); registerSlashCommand('incvar', (_, value) => incrementLocalVariable(value), [], '(key) – increment a local variable by 1 and pass the result down the pipe, e.g. /incvar score', true, true);