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

Fix /sys continue in groups

This commit is contained in:
Cohee 2023-12-11 15:08:20 +02:00
parent 23e6a10cb5
commit c6bd3ef255
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -867,10 +867,11 @@ function activateImpersonate(members) {
*/
function activateSwipe(members) {
let activatedNames = [];
const lastMessage = chat[chat.length - 1];
if (chat[chat.length - 1].is_user) {
if (lastMessage.is_user || lastMessage.is_system || lastMessage.extra?.type === system_message_types.NARRATOR) {
for (const message of chat.slice().reverse()) {
if (message.is_system || message.is_user) {
if (message.is_user || message.is_system || message.extra?.type === system_message_types.NARRATOR) {
continue;
}
@ -886,8 +887,8 @@ function activateSwipe(members) {
}
// pre-update group chat swipe
if (!chat[chat.length - 1].original_avatar) {
const matches = characters.filter(x => x.name == chat[chat.length - 1].name);
if (!lastMessage.original_avatar) {
const matches = characters.filter(x => x.name == lastMessage.name);
for (const match of matches) {
if (members.includes(match.avatar)) {
@ -897,7 +898,7 @@ function activateSwipe(members) {
}
}
else {
activatedNames.push(chat[chat.length - 1].original_avatar);
activatedNames.push(lastMessage.original_avatar);
}
const memberIds = activatedNames