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

Merge pull request #1861 from berbant/staging 

Deleting the current chat when creating a new one
This commit is contained in:
Cohee 2024-02-29 11:47:05 +02:00 committed by GitHub
parent e8985c259c a85a2bbab1
commit 8981346360
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/script.js
View File

@ -8376,9 +8376,14 @@ jQuery(async function () {
//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
if (selected_group) {
//Fix it; When you're creating a new group chat (but not when initially converting from the existing regular chat), the first greeting message doesn't automatically get translated.
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;
@ -8387,6 +8392,7 @@ jQuery(async function () {
$('#selected_chat_pole').val(characters[this_chid].chat);
await getChat();
await createOrEditCharacter();
if (isDelChatCheckbox) await delChat(chat_file_for_del + '.jsonl');
}
}
@ -8765,7 +8771,14 @@ jQuery(async function () {
else if (id == 'option_start_new_chat') {
if ((selected_group || this_chid !== undefined) && !is_send_press) {
popup_type = 'new_chat';
callPopup('<h3>Start new chat?</h3>');
callPopup(`
<h3>Start new chat?</h3><br>
<label for="del_chat_checkbox" class="checkbox_label justifyCenter"
title="If necessary, you can later restore this chat file from the /backups folder">
<input type="checkbox" id="del_chat_checkbox" />
<span>Also delete the current chat file</span>
</label><br>
`);
}
}

2
public/scripts/group-chats.js
View File

@ -1622,7 +1622,7 @@ export async function deleteGroupChat(groupId, chatId) {
if (response.ok) {
if (group.chats.length) {
await openGroupChat(groupId, group.chats[0]);
await openGroupChat(groupId, group.chats[group.chats.length-1]);
} else {
await createNewGroupChat(groupId);
}