rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-03-12 18:10:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2438 from SillyTavern/commands-send-at-supports-depth

Browse Source 
Various commands with 'at' support depth values
This commit is contained in:
Cohee 2024-06-29 14:33:22 +03:00 committed by GitHub
commit bf28ae07b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,7 +177,7 @@ export function initDefaultSlashCommands() {
), ),
SlashCommandNamedArgument.fromProps({ SlashCommandNamedArgument.fromProps({
name: 'at', name: 'at',
description: 'position to insert the message', description: 'position to insert the message (index-based, corresponding to message id). If not set, the message will be inserted at the end of the chat.\nNegative values are accepted and will work similarly to how \'depth\' usually works. For example, -1 will insert the message right before the last message in chat.',
typeList: [ARGUMENT_TYPE.NUMBER], typeList: [ARGUMENT_TYPE.NUMBER],
enumProvider: commonEnumProviders.messages({ allowIdAfter: true }), enumProvider: commonEnumProviders.messages({ allowIdAfter: true }),
}), }),
@ -220,7 +220,7 @@ export function initDefaultSlashCommands() {
), ),
SlashCommandNamedArgument.fromProps({ SlashCommandNamedArgument.fromProps({
name: 'at', name: 'at',
description: 'position to insert the message', description: 'position to insert the message (index-based, corresponding to message id). If not set, the message will be inserted at the end of the chat.\nNegative values are accepted and will work similarly to how \'depth\' usually works. For example, -1 will insert the message right before the last message in chat.',
typeList: [ARGUMENT_TYPE.NUMBER], typeList: [ARGUMENT_TYPE.NUMBER],
enumProvider: commonEnumProviders.messages({ allowIdAfter: true }), enumProvider: commonEnumProviders.messages({ allowIdAfter: true }),
}), }),
@ -274,7 +274,7 @@ export function initDefaultSlashCommands() {
), ),
SlashCommandNamedArgument.fromProps({ SlashCommandNamedArgument.fromProps({
name: 'at', name: 'at',
description: 'position to insert the message', description: 'position to insert the message (index-based, corresponding to message id). If not set, the message will be inserted at the end of the chat.\nNegative values are accepted and will work similarly to how \'depth\' usually works. For example, -1 will insert the message right before the last message in chat.',
typeList: [ARGUMENT_TYPE.NUMBER], typeList: [ARGUMENT_TYPE.NUMBER],
enumProvider: commonEnumProviders.messages({ allowIdAfter: true }), enumProvider: commonEnumProviders.messages({ allowIdAfter: true }),
}), }),
@ -459,7 +459,7 @@ export function initDefaultSlashCommands() {
), ),
SlashCommandNamedArgument.fromProps({ SlashCommandNamedArgument.fromProps({
name: 'at', name: 'at',
description: 'position to insert the message', description: 'position to insert the message (index-based, corresponding to message id). If not set, the message will be inserted at the end of the chat.\nNegative values are accepted and will work similarly to how \'depth\' usually works. For example, -1 will insert the message right before the last message in chat.',
typeList: [ARGUMENT_TYPE.NUMBER], typeList: [ARGUMENT_TYPE.NUMBER],
enumProvider: commonEnumProviders.messages({ allowIdAfter: true }), enumProvider: commonEnumProviders.messages({ allowIdAfter: true }),
}), }),
@ -2490,7 +2490,14 @@ 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(args?.at);
let insertAt = Number(args?.at);
// Convert possible depth parameter to index
if (!isNaN(insertAt) && (insertAt < 0 || insertAt === Number(-0))) {
// Negative value means going back from current chat length. (E.g.: 8 messages, Depth 1 means insert at index 7)
insertAt = chat.length + insertAt;
}
if ('name' in args) { if ('name' in args) {
const name = args.name || ''; const name = args.name || '';
@ -2799,7 +2806,13 @@ export async function sendMessageAs(args, text) {
}, },
}]; }];
const insertAt = Number(args.at); let insertAt = Number(args.at);
// Convert possible depth parameter to index
if (!isNaN(insertAt) && (insertAt < 0 || insertAt === Number(-0))) {
// Negative value means going back from current chat length. (E.g.: 8 messages, Depth 1 means insert at index 7)
insertAt = chat.length + insertAt;
}
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);
@ -2846,7 +2859,13 @@ export async function sendNarratorMessage(args, text) {
}, },
}; };
const insertAt = Number(args.at); let insertAt = Number(args.at);
// Convert possible depth parameter to index
if (!isNaN(insertAt) && (insertAt < 0 || insertAt === Number(-0))) {
// Negative value means going back from current chat length. (E.g.: 8 messages, Depth 1 means insert at index 7)
insertAt = chat.length + insertAt;
}
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);
@ -2928,7 +2947,13 @@ async function sendCommentMessage(args, text) {
}, },
}; };
const insertAt = Number(args.at); let insertAt = Number(args.at);
// Convert possible depth parameter to index
if (!isNaN(insertAt) && (insertAt < 0 || insertAt === Number(-0))) {
// Negative value means going back from current chat length. (E.g.: 8 messages, Depth 1 means insert at index 7)
insertAt = chat.length + insertAt;
}
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);