rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2024-12-14 18:35:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove getMessageId

Browse Source 
As far as I can tell, we don't add/remove anything from chat in between
the calculation of newMessageId and subsequent calls to getMessageId.
We can just use newMessageId everywhere.
This commit is contained in:
valadaptive 2024-01-27 13:50:54 -05:00
parent e475081116
commit 29f509179c
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/script.js
View File

@ -1958,16 +1958,9 @@ function addOneMessage(mes, { type = 'normal', insertAfter = null, scroll = true
}
}
function getMessageId() {
if (typeof forceId == 'number') {
return forceId;
}
// Callers push the new message to chat before calling addOneMessage
const newMessageId = typeof forceId == 'number' ? forceId : chat.length - 1;
// Callers push the new message to chat before calling addOneMessage
return chat.length - 1;
}
const newMessageId = getMessageId();
const newMessage = $(`#chat [mesid="${newMessageId}"]`);
const isSmallSys = mes?.extra?.isSmallSys;
newMessage.data('isSystem', isSystem);
@ -2045,7 +2038,7 @@ function addOneMessage(mes, { type = 'normal', insertAfter = null, scroll = true
const messageId = forceId ?? chat.length - 1;
$('#chat').find(`[mesid="${messageId}"]`).find('.mes_text').append(messageText);
appendMediaToMessage(mes, newMessage);
hideSwipeButtons(getMessageId());
hideSwipeButtons(newMessageId);
}
addCopyToCodeBlocks(newMessage);
@ -2055,8 +2048,8 @@ function addOneMessage(mes, { type = 'normal', insertAfter = null, scroll = true
$('#chat .mes').last().addClass('last_mes');
$('#chat .mes').eq(-2).removeClass('last_mes');
hideSwipeButtons(getMessageId());
showSwipeButtons(getMessageId());
hideSwipeButtons(newMessageId);
showSwipeButtons(newMessageId);
scrollChatToBottom();
}
}