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

Added loop-around for swipe-left when multiple swipes exist (#1104) 

* Added loop-around for swipe-left when multiple swipes exist

* Added loop around for alternate greetings in swipe_right(),
Disabled toast for add more alternate greetings

* Debounce saving swipes

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
This commit is contained in:
anmelus 2023-09-07 06:45:19 -07:00 committed by GitHub
parent e681f1f36f
commit f2cae64b0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
public/script.js
View File

@ -5794,7 +5794,7 @@ function showSwipeButtons() {
const swipeId = chat[chat.length - 1].swipe_id; const swipeId = chat[chat.length - 1].swipe_id;
var swipesCounterHTML = (`${(swipeId + 1)}/${(chat[chat.length - 1].swipes.length)}`); var swipesCounterHTML = (`${(swipeId + 1)}/${(chat[chat.length - 1].swipes.length)}`);
if (swipeId !== undefined && swipeId != 0) { if (swipeId !== undefined && chat[chat.length - 1].swipes.length > 1) {
currentMessage.children('.swipe_left').css('display', 'flex'); currentMessage.children('.swipe_left').css('display', 'flex');
} }
//only show right when generate is off, or when next right swipe would not make a generate happen //only show right when generate is off, or when next right swipe would not make a generate happen
@ -6354,6 +6354,11 @@ function swipe_left() { // when we swipe left..but no generation.
const swipe_duration = 120; const swipe_duration = 120;
const swipe_range = '700px'; const swipe_range = '700px';
chat[chat.length - 1]['swipe_id']--; chat[chat.length - 1]['swipe_id']--;
if (chat[chat.length - 1]['swipe_id'] < 0) {
chat[chat.length - 1]['swipe_id'] = chat[chat.length - 1]['swipes'].length - 1;
}
if (chat[chat.length - 1]['swipe_id'] >= 0) { if (chat[chat.length - 1]['swipe_id'] >= 0) {
/*$(this).parent().children('swipe_right').css('display', 'flex'); /*$(this).parent().children('swipe_right').css('display', 'flex');
if (chat[chat.length - 1]['swipe_id'] === 0) { if (chat[chat.length - 1]['swipe_id'] === 0) {
@ -6431,7 +6436,7 @@ function swipe_left() { // when we swipe left..but no generation.
queue: false, queue: false,
complete: async function () { complete: async function () {
await eventSource.emit(event_types.MESSAGE_SWIPED, (chat.length - 1)); await eventSource.emit(event_types.MESSAGE_SWIPED, (chat.length - 1));
await saveChatConditional(); saveChatDebounced();
} }
}); });
} }
@ -6480,12 +6485,12 @@ const swipe_right = () => {
return; return;
} }
if (chat.length == 1) { // if (chat.length == 1) {
if (chat[0]['swipe_id'] !== undefined && chat[0]['swipe_id'] == chat[0]['swipes'].length - 1) { // if (chat[0]['swipe_id'] !== undefined && chat[0]['swipe_id'] == chat[0]['swipes'].length - 1) {
toastr.info('Add more alternative greetings to swipe through', 'That\'s all for now'); // toastr.info('Add more alternative greetings to swipe through', 'That\'s all for now');
return; // return;
} // }
} // }
const swipe_duration = 200; const swipe_duration = 200;
const swipe_range = 700; const swipe_range = 700;
@ -6500,7 +6505,11 @@ const swipe_right = () => {
chat[chat.length - 1]['swipe_info'][0] = { 'send_date': chat[chat.length - 1]['send_date'], 'gen_started': chat[chat.length - 1]['gen_started'], 'gen_finished': chat[chat.length - 1]['gen_finished'], 'extra': JSON.parse(JSON.stringify(chat[chat.length - 1]['extra'])) }; chat[chat.length - 1]['swipe_info'][0] = { 'send_date': chat[chat.length - 1]['send_date'], 'gen_started': chat[chat.length - 1]['gen_started'], 'gen_finished': chat[chat.length - 1]['gen_finished'], 'extra': JSON.parse(JSON.stringify(chat[chat.length - 1]['extra'])) };
//assign swipe info array with last message from chat //assign swipe info array with last message from chat
} }
if (chat.length === 1 && chat[0]['swipe_id'] !== undefined && chat[0]['swipe_id'] === chat[0]['swipes'].length - 1) { // if swipe_right is called on the last alternate greeting, loop back around
chat[0]['swipe_id'] = 0;
} else {
chat[chat.length - 1]['swipe_id']++; // make new slot in array chat[chat.length - 1]['swipe_id']++; // make new slot in array
}
if (chat[chat.length - 1].extra) { if (chat[chat.length - 1].extra) {
// if message has memory attached - remove it to allow regen // if message has memory attached - remove it to allow regen
if (chat[chat.length - 1].extra.memory) { if (chat[chat.length - 1].extra.memory) {
@ -6515,7 +6524,7 @@ const swipe_right = () => {
chat[chat.length - 1]['swipe_info'] = []; chat[chat.length - 1]['swipe_info'] = [];
} }
//console.log(chat[chat.length-1]['swipes']); //console.log(chat[chat.length-1]['swipes']);
if (parseInt(chat[chat.length - 1]['swipe_id']) === chat[chat.length - 1]['swipes'].length) { //if swipe id of last message is the same as the length of the 'swipes' array if (parseInt(chat[chat.length - 1]['swipe_id']) === chat[chat.length - 1]['swipes'].length && chat.length !== 1) { //if swipe id of last message is the same as the length of the 'swipes' array and not the greeting
delete chat[chat.length - 1].gen_started; delete chat[chat.length - 1].gen_started;
delete chat[chat.length - 1].gen_finished; delete chat[chat.length - 1].gen_finished;
run_generate = true; run_generate = true;
@ -6616,7 +6625,7 @@ const swipe_right = () => {
await Generate('swipe'); await Generate('swipe');
} else { } else {
if (parseInt(chat[chat.length - 1]['swipe_id']) !== chat[chat.length - 1]['swipes'].length) { if (parseInt(chat[chat.length - 1]['swipe_id']) !== chat[chat.length - 1]['swipes'].length) {
await saveChatConditional(); saveChatDebounced();
} }
} }
} }