Merge pull request #2629 from SillyTavern/improve-swipe-commands Improve `/addswipe` and `/delswipe` slightly

478e1a6bb5a57e46cc8f63433742bcdd4b0bde53

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

public/scripts/slash-commands.js+34 -8 Viewed

     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'delswipe',
         callback: deleteSwipeCallback,
 +        returns: 'the new, currently selected swipe id',
         aliases: ['swipedel'],
         unnamedArgumentList: [
             SlashCommandArgument.fromProps({

     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'addswipe',
         callback: addSwipeCallback,
 +        returns: 'the new swipe id',
         aliases: ['swipeadd'],
 +        namedArgumentList: [
 +            SlashCommandNamedArgument.fromProps({
 +                name: 'switch',
 +                description: 'switch to the new swipe',
 +                typeList: [ARGUMENT_TYPE.BOOLEAN],
 +                enumList: commonEnumProviders.boolean()(),
 +            }),
 +        ],
         unnamedArgumentList: [
             new SlashCommandArgument(
                 'text', [ARGUMENT_TYPE.STRING], true,
             ),
         ],
 -        helpString: 'Adds a swipe to the last chat message.',
 +        helpString: `
 +        <div>
 +            Adds a swipe to the last chat message.
 +        </div>
 +        <div>
 +            Use switch=true to switch to directly switch to the new swipe.
 +        </div>`,
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'stop',

+    }
+}
+-
 +/**
 -async function addSwipeCallback(_, arg) {
 + * @param {{switch?: string}} args - named arguments
 + * @param {string} value - The swipe text to add (unnamed argument)
 + */
 +async function addSwipeCallback(args, value) {
     const lastMessage = chat[chat.length - 1];
     if (!lastMessage) {

@@ -2163,7 +2182,7 @@ async function addSwipeCallback(_, arg) {
2163	2182	return '';
2164	2183	}
2165	2184
2166	2185	if (!argvalue) {
2167	2186	console.warn('WARN: No argument provided for /addswipe command');
2168	2187	return '';
2169	2188	}

         lastMessage.swipe_info = lastMessage.swipes.map(() => ({}));
+    }
     lastMessage.swipes.push(argvalue);
     lastMessage.swipe_info.push({
         send_date: getMessageTimeStamp(),
         gen_started: null,
         gen_finished: null,
         extra: {
             bias: extractMessageBias(argvalue),
             gen_id: Date.now(),
             api: 'manual',
             model: 'slash command',
         },
     });
 +    const newSwipeId = lastMessage.swipes.length - 1;
++
 +    if (isTrueBoolean(args.switch)) {
 +        lastMessage.swipe_id = newSwipeId;
 +        lastMessage.mes = lastMessage.swipes[newSwipeId];
 +    }
++
     await saveChatConditional();
     await reloadCurrentChat();
     return ''String(newSwipeId);
+}
 async function deleteSwipeCallback(_, arg) {

     await saveChatConditional();
     await reloadCurrentChat();
     return ''String(newSwipeId);
+}
 async function askCharacter(args, text) {