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

Repurpose trigger command not just for groups

This commit is contained in:
Cohee 2023-11-27 11:16:40 +02:00
parent a10b6da477
commit edafb8dd13
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/script.js
View File

@ -7692,7 +7692,9 @@ jQuery(async function () {
$("#send_but").on('click', function () { $("#send_but").on('click', function () {
if (is_send_press == false) { if (is_send_press == false) {
is_send_press = true; // This prevents from running /trigger command with a send button
// But send on Enter doesn't set is_send_press (it is done by the Generate itself)
// is_send_press = true;
Generate(); Generate();
} }
}); });

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

@ -29,6 +29,7 @@ import {
deactivateSendButtons, deactivateSendButtons,
activateSendButtons, activateSendButtons,
main_api, main_api,
is_send_press,
} from "../script.js"; } from "../script.js";
import { getMessageTimeStamp } from "./RossAscends-mods.js"; import { getMessageTimeStamp } from "./RossAscends-mods.js";
import { findGroupMemberId, groups, is_group_generating, resetSelectedGroup, saveGroupChat, selected_group } from "./group-chats.js"; import { findGroupMemberId, groups, is_group_generating, resetSelectedGroup, saveGroupChat, selected_group } from "./group-chats.js";
@ -153,7 +154,7 @@ parser.addCommand('sysgen', generateSystemMessage, [], '<span class="monospace">
parser.addCommand('ask', askCharacter, [], '<span class="monospace">(prompt)</span> – asks a specified character card a prompt', true, true); parser.addCommand('ask', askCharacter, [], '<span class="monospace">(prompt)</span> – asks a specified character card a prompt', true, true);
parser.addCommand('delname', deleteMessagesByNameCallback, ['cancel'], '<span class="monospace">(name)</span> – deletes all messages attributed to a specified name', true, true); parser.addCommand('delname', deleteMessagesByNameCallback, ['cancel'], '<span class="monospace">(name)</span> – deletes all messages attributed to a specified name', true, true);
parser.addCommand('send', sendUserMessageCallback, ['add'], '<span class="monospace">(text)</span> – adds a user message to the chat log without triggering a generation', true, true); parser.addCommand('send', sendUserMessageCallback, ['add'], '<span class="monospace">(text)</span> – adds a user message to the chat log without triggering a generation', true, true);
parser.addCommand('trigger', triggerGroupMessageCallback, [], '<span class="monospace">(member index or name)</span> – triggers a message generation for the specified group member', true, true); parser.addCommand('trigger', triggerGenerationCallback, [], ' – triggers a message generation. If in group, can trigger a message for the specified group member index or name.', true, true);
parser.addCommand('hide', hideMessageCallback, [], '<span class="monospace">(message index or range)</span> – hides a chat message from the prompt', true, true); parser.addCommand('hide', hideMessageCallback, [], '<span class="monospace">(message index or range)</span> – hides a chat message from the prompt', true, true);
parser.addCommand('unhide', unhideMessageCallback, [], '<span class="monospace">(message index or range)</span> – unhides a message from the prompt', true, true); parser.addCommand('unhide', unhideMessageCallback, [], '<span class="monospace">(message index or range)</span> – unhides a message from the prompt', true, true);
parser.addCommand('disable', disableGroupMemberCallback, [], '<span class="monospace">(member index or name)</span> – disables a group member from being drafted for replies', true, true); parser.addCommand('disable', disableGroupMemberCallback, [], '<span class="monospace">(member index or name)</span> – disables a group member from being drafted for replies', true, true);
@ -864,28 +865,26 @@ async function addGroupMemberCallback(_, arg) {
return character.name; return character.name;
} }
async function triggerGroupMessageCallback(_, arg) { async function triggerGenerationCallback(_, arg) {
if (!selected_group) { if (is_send_press || is_group_generating) {
toastr.warning("Cannot run /trigger command outside of a group chat."); toastr.warning("Cannot run trigger command while the reply is being generated.");
return '';
}
if (is_group_generating) {
toastr.warning("Cannot run trigger command while the group reply is generating.");
return ''; return '';
} }
// Prevent generate recursion // Prevent generate recursion
$('#send_textarea').val('').trigger('input'); $('#send_textarea').val('').trigger('input');
const chid = findGroupMemberId(arg); let chid = undefined;
if (chid === undefined) { if (selected_group && arg) {
console.warn(`WARN: No group member found for argument ${arg}`); chid = findGroupMemberId(arg);
return '';
if (chid === undefined) {
console.warn(`WARN: No group member found for argument ${arg}`);
}
} }
Generate('normal', { force_chid: chid }); setTimeout(() => Generate('normal', { force_chid: chid }), 100);
return ''; return '';
} }