rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor new chat to new popup

Browse Source
This commit is contained in:
Wolfsblvt
2024-06-27 00:45:26 +02:00
parent 360c2985f5
commit efb9fbcc7e
1 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
public/script.js
View File

@@ -8551,6 +8551,39 @@ async function doImpersonate(args, prompt) {
return ''; return '';
} }
async function doNewChat({ deleteCurrentChat = false } = {}) {
//Make a new chat for selected character
if ((!selected_group && this_chid == undefined) || menu_type != 'create') {
return;
}
//Fix it; New chat doesn't create while open create character menu
await clearChat();
chat.length = 0;
chat_file_for_del = getCurrentChatDetails()?.sessionName;
// Make it easier to find in backups
if (deleteCurrentChat) {
await saveChatConditional();
}
if (selected_group) {
await createNewGroupChat(selected_group);
if (deleteCurrentChat) await deleteGroupChat(selected_group, chat_file_for_del);
}
else {
//RossAscends: added character name to new chat filenames and replaced Date.now() with humanizedDateTime;
chat_metadata = {};
characters[this_chid].chat = `${name2} - ${humanizedDateTime()}`;
$('#selected_chat_pole').val(characters[this_chid].chat);
await getChat();
await createOrEditCharacter(new CustomEvent('newChat'));
if (deleteCurrentChat) await delChat(chat_file_for_del + '.jsonl');
}
}
async function doDeleteChat() { async function doDeleteChat() {
await displayPastChats(); await displayPastChats();
let currentChatDeleteButton = $('.select_chat_block[highlight=\'true\']').parent().find('.PastChat_cross'); let currentChatDeleteButton = $('.select_chat_block[highlight=\'true\']').parent().find('.PastChat_cross');
@@ -9215,38 +9248,6 @@ jQuery(async function () {
if (popup_type == 'alternate_greeting' && menu_type !== 'create') { if (popup_type == 'alternate_greeting' && menu_type !== 'create') {
createOrEditCharacter(); createOrEditCharacter();
} }
//Make a new chat for selected character
if (
popup_type == 'new_chat' &&
(selected_group || this_chid !== undefined) &&
menu_type != 'create'
) {
//Fix it; New chat doesn't create while open create character menu
await clearChat();
chat.length = 0;
chat_file_for_del = getCurrentChatDetails()?.sessionName;
const isDelChatCheckbox = document.getElementById('del_chat_checkbox')?.checked;
// Make it easier to find in backups
if (isDelChatCheckbox) {
await saveChatConditional();
}
if (selected_group) {
await createNewGroupChat(selected_group);
if (isDelChatCheckbox) await deleteGroupChat(selected_group, chat_file_for_del);
}
else {
//RossAscends: added character name to new chat filenames and replaced Date.now() with humanizedDateTime;
chat_metadata = {};
characters[this_chid].chat = `${name2} - ${humanizedDateTime()}`;
$('#selected_chat_pole').val(characters[this_chid].chat);
await getChat();
await createOrEditCharacter(new CustomEvent('newChat'));
if (isDelChatCheckbox) await delChat(chat_file_for_del + '.jsonl');
}
}
if (dialogueResolve) { if (dialogueResolve) {
if (popup_type == 'input') { if (popup_type == 'input') {
@@ -9574,14 +9575,20 @@ jQuery(async function () {
else if (id == 'option_start_new_chat') { else if (id == 'option_start_new_chat') {
if ((selected_group || this_chid !== undefined) && !is_send_press) { if ((selected_group || this_chid !== undefined) && !is_send_press) {
callPopup(` let deleteCurrentChat = false;
<h3>Start new chat?</h3><br> const result = await Popup.show.confirm('Start new chat?', `
<label for="del_chat_checkbox" class="checkbox_label justifyCenter" <label for="del_chat_checkbox" class="checkbox_label justifyCenter"
title="If necessary, you can later restore this chat file from the /backups folder"> title="If necessary, you can later restore this chat file from the /backups folder">
<input type="checkbox" id="del_chat_checkbox" /> <input type="checkbox" id="del_chat_checkbox" />
<small>Also delete the current chat file</small> <small>Also delete the current chat file</small>
</label><br> </label>`, {
`, 'new_chat', ''); onClose: () => deleteCurrentChat = !!$('#del_chat_checkbox').prop('checked'),
});
if (!result) {
return;
}
await doNewChat({ deleteCurrentChat: deleteCurrentChat });
} }
} }