rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2435 from SillyTavern/remove-var-from-at-arg 

Remove variable usage of 'at' arg in send commands
This commit is contained in:
Cohee 2024-06-28 22:54:40 +03:00 committed by GitHub
parent c34150fef0 38792d071b
commit a287ccfca2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,8 +178,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({
SlashCommandNamedArgument.fromProps({ SlashCommandNamedArgument.fromProps({
name: 'at', name: 'at',
description: 'position to insert the message', description: 'position to insert the message',
typeList: [ARGUMENT_TYPE.NUMBER, ARGUMENT_TYPE.VARIABLE_NAME], typeList: [ARGUMENT_TYPE.NUMBER],
enumProvider: commonEnumProviders.messages({ allowIdAfter: true, allowVars: true }), enumProvider: commonEnumProviders.messages({ allowIdAfter: true }),
}), }),
], ],
unnamedArgumentList: [ unnamedArgumentList: [
@ -221,8 +221,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({
SlashCommandNamedArgument.fromProps({ SlashCommandNamedArgument.fromProps({
name: 'at', name: 'at',
description: 'position to insert the message', description: 'position to insert the message',
typeList: [ARGUMENT_TYPE.NUMBER, ARGUMENT_TYPE.VARIABLE_NAME], typeList: [ARGUMENT_TYPE.NUMBER],
enumProvider: commonEnumProviders.messages({ allowIdAfter: true, allowVars: true }), enumProvider: commonEnumProviders.messages({ allowIdAfter: true }),
}), }),
], ],
unnamedArgumentList: [ unnamedArgumentList: [
@ -275,8 +275,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({
SlashCommandNamedArgument.fromProps({ SlashCommandNamedArgument.fromProps({
name: 'at', name: 'at',
description: 'position to insert the message', description: 'position to insert the message',
typeList: [ARGUMENT_TYPE.NUMBER, ARGUMENT_TYPE.VARIABLE_NAME], typeList: [ARGUMENT_TYPE.NUMBER],
enumProvider: commonEnumProviders.messages({ allowIdAfter: true, allowVars: true }), enumProvider: commonEnumProviders.messages({ allowIdAfter: true }),
}), }),
], ],
unnamedArgumentList: [ unnamedArgumentList: [
@ -460,8 +460,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({
SlashCommandNamedArgument.fromProps({ SlashCommandNamedArgument.fromProps({
name: 'at', name: 'at',
description: 'position to insert the message', description: 'position to insert the message',
typeList: [ARGUMENT_TYPE.NUMBER, ARGUMENT_TYPE.VARIABLE_NAME], typeList: [ARGUMENT_TYPE.NUMBER],
enumProvider: commonEnumProviders.messages({ allowIdAfter: true, allowVars: true }), enumProvider: commonEnumProviders.messages({ allowIdAfter: true }),
}), }),
SlashCommandNamedArgument.fromProps({ SlashCommandNamedArgument.fromProps({
name: 'name', name: 'name',
@ -2428,7 +2428,7 @@ async function sendUserMessageCallback(args, text) {
text = text.trim(); text = text.trim();
const compact = isTrueBoolean(args?.compact); const compact = isTrueBoolean(args?.compact);
const bias = extractMessageBias(text); const bias = extractMessageBias(text);
const insertAt = Number(resolveVariable(args?.at)); const insertAt = Number(args?.at);
if ('name' in args) { if ('name' in args) {
const name = args.name || ''; const name = args.name || '';
@ -2737,7 +2737,7 @@ export async function sendMessageAs(args, text) {
}, },
}]; }];
const insertAt = Number(resolveVariable(args.at)); const insertAt = Number(args.at);
if (!isNaN(insertAt) && insertAt >= 0 && insertAt <= chat.length) { if (!isNaN(insertAt) && insertAt >= 0 && insertAt <= chat.length) {
chat.splice(insertAt, 0, message); chat.splice(insertAt, 0, message);
@ -2784,7 +2784,7 @@ export async function sendNarratorMessage(args, text) {
}, },
}; };
const insertAt = Number(resolveVariable(args.at)); const insertAt = Number(args.at);
if (!isNaN(insertAt) && insertAt >= 0 && insertAt <= chat.length) { if (!isNaN(insertAt) && insertAt >= 0 && insertAt <= chat.length) {
chat.splice(insertAt, 0, message); chat.splice(insertAt, 0, message);
@ -2866,7 +2866,7 @@ async function sendCommentMessage(args, text) {
}, },
}; };
const insertAt = Number(resolveVariable(args.at)); const insertAt = Number(args.at);
if (!isNaN(insertAt) && insertAt >= 0 && insertAt <= chat.length) { if (!isNaN(insertAt) && insertAt >= 0 && insertAt <= chat.length) {
chat.splice(insertAt, 0, message); chat.splice(insertAt, 0, message);