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

Fix off-by-one in addOneMessage

Browse Source
This commit is contained in:
valadaptive
2024-01-27 13:47:04 -05:00
parent 7f955a59b9
commit e475081116
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/script.js
View File

@@ -1924,7 +1924,7 @@ function addOneMessage(mes, { type = 'normal', insertAfter = null, scroll = true
} }
}*/ }*/
let params = { let params = {
mesId: forceId ?? chat.length, mesId: forceId ?? chat.length - 1,
characterName: mes.name, characterName: mes.name,
isUser: mes.is_user, isUser: mes.is_user,
avatarImg: avatarImg, avatarImg: avatarImg,
@@ -1963,7 +1963,8 @@ function addOneMessage(mes, { type = 'normal', insertAfter = null, scroll = true
return forceId; return forceId;
} }
return type == 'swipe' ? chat.length - 1 : chat.length; // Callers push the new message to chat before calling addOneMessage
return chat.length - 1;
} }
const newMessageId = getMessageId(); const newMessageId = getMessageId();
@@ -2041,7 +2042,7 @@ function addOneMessage(mes, { type = 'normal', insertAfter = null, scroll = true
swipeMessage.find('.tokenCounterDisplay').html(''); swipeMessage.find('.tokenCounterDisplay').html('');
} }
} else { } else {
const messageId = forceId ?? chat.length; const messageId = forceId ?? chat.length - 1;
$('#chat').find(`[mesid="${messageId}"]`).find('.mes_text').append(messageText); $('#chat').find(`[mesid="${messageId}"]`).find('.mes_text').append(messageText);
appendMediaToMessage(mes, newMessage); appendMediaToMessage(mes, newMessage);
hideSwipeButtons(getMessageId()); hideSwipeButtons(getMessageId());
@@ -6495,7 +6496,7 @@ function showSwipeButtons(id = chat.length - 1) {
$('.mes:last').attr('mesid') < 0 || $('.mes:last').attr('mesid') < 0 ||
chat[chat.length - 1].is_user || chat[chat.length - 1].is_user ||
chat[chat.length - 1].extra?.image || chat[chat.length - 1].extra?.image ||
id < 1 || id < 0 ||
(selected_group && is_group_generating) (selected_group && is_group_generating)
) { return; } ) { return; }