mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Remove /send's variable usage in 'name' argument
This commit is contained in:
@ -466,12 +466,9 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({
|
|||||||
SlashCommandNamedArgument.fromProps({
|
SlashCommandNamedArgument.fromProps({
|
||||||
name: 'name',
|
name: 'name',
|
||||||
description: 'display name',
|
description: 'display name',
|
||||||
typeList: [ARGUMENT_TYPE.STRING, ARGUMENT_TYPE.VARIABLE_NAME],
|
typeList: [ARGUMENT_TYPE.STRING],
|
||||||
defaultValue: '{{user}}',
|
defaultValue: '{{user}}',
|
||||||
enumProvider: () => [
|
enumProvider: commonEnumProviders.characters('character'),
|
||||||
...commonEnumProviders.characters('character')(),
|
|
||||||
...commonEnumProviders.variables('all')().map(x => { x.description = 'Variable'; return x; }),
|
|
||||||
],
|
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
unnamedArgumentList: [
|
unnamedArgumentList: [
|
||||||
@ -2437,7 +2434,7 @@ async function sendUserMessageCallback(args, text) {
|
|||||||
const insertAt = Number(resolveVariable(args?.at));
|
const insertAt = Number(resolveVariable(args?.at));
|
||||||
|
|
||||||
if ('name' in args) {
|
if ('name' in args) {
|
||||||
const name = resolveVariable(args.name) || '';
|
const name = args.name || '';
|
||||||
const avatar = findPersonaByName(name) || user_avatar;
|
const avatar = findPersonaByName(name) || user_avatar;
|
||||||
await sendMessageAsUser(text, bias, insertAt, compact, name, avatar);
|
await sendMessageAsUser(text, bias, insertAt, compact, name, avatar);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user