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 mentions in groups

Browse Source
This commit is contained in:
SillyLossy
2023-03-29 21:00:34 +03:00
parent 5adb6e9b8c
commit 55e2c7439f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -290,7 +290,10 @@ async function generateGroupWrapper(by_auto_mode, type=null) {
let messagesBefore = chat.length; let messagesBefore = chat.length;
let lastMessageText = lastMessage.mes; let lastMessageText = lastMessage.mes;
let activationText = ""; let activationText = "";
let isUserInput = false;
if (userInput && userInput.length && !by_auto_mode) { if (userInput && userInput.length && !by_auto_mode) {
isUserInput = true;
activationText = userInput; activationText = userInput;
messagesBefore++; messagesBefore++;
} else { } else {
@@ -299,7 +302,10 @@ async function generateGroupWrapper(by_auto_mode, type=null) {
} }
} }
const activatedMembers = type !== "swipe" ? activateMembers(group.members, activationText, lastMessage, group.allow_self_responses) : activateSwipe(group.members); const activatedMembers = type !== "swipe"
? activateMembers(group.members, activationText, lastMessage, group.allow_self_responses, isUserInput)
: activateSwipe(group.members);
// now the real generation begins: cycle through every character // now the real generation begins: cycle through every character
for (const chId of activatedMembers) { for (const chId of activatedMembers) {
const generateType = type !== "swipe" ? "group_chat" : "swipe"; const generateType = type !== "swipe" ? "group_chat" : "swipe";
@@ -356,11 +362,11 @@ function activateSwipe(members) {
return memberIds; return memberIds;
} }
function activateMembers(members, input, lastMessage, allowSelfResponses) { function activateMembers(members, input, lastMessage, allowSelfResponses, isUserInput) {
let activatedNames = []; let activatedNames = [];
// prevents the same character from speaking twice // prevents the same character from speaking twice
let bannedUser = lastMessage && !lastMessage.is_user && lastMessage.name; let bannedUser = !isUserInput && lastMessage && !lastMessage.is_user && lastMessage.name;
// ...unless allowed to do so // ...unless allowed to do so
if (allowSelfResponses) { if (allowSelfResponses) {