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

Refactor to not use array

Browse Source
This commit is contained in:
Cohee
2025-03-11 22:16:26 +02:00
parent ad225138b4
commit 370bd9a3a8
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1031,7 +1031,9 @@ function activateListOrder(members) {
* @returns {number[]} List of character ids * @returns {number[]} List of character ids
*/ */
function activatePooledOrder(members, lastMessage) { function activatePooledOrder(members, lastMessage) {
const activatedMembers = []; /** @type {string} */
let activatedMember = null;
/** @type {string[]} */
const spokenSinceUser = []; const spokenSinceUser = [];
for (const message of chat.slice().reverse()) { for (const message of chat.slice().reverse()) {
@@ -1051,19 +1053,17 @@ function activatePooledOrder(members, lastMessage) {
const haveNotSpoken = members.filter(x => !spokenSinceUser.includes(x)); const haveNotSpoken = members.filter(x => !spokenSinceUser.includes(x));
if (haveNotSpoken.length) { if (haveNotSpoken.length) {
activatedMembers.push(haveNotSpoken[Math.floor(Math.random() * haveNotSpoken.length)]); activatedMember = haveNotSpoken[Math.floor(Math.random() * haveNotSpoken.length)];
} }
if (activatedMembers.length === 0) { if (activatedMember === null) {
const lastMessageAvatar = members.length > 1 && lastMessage && !lastMessage.is_user && lastMessage.original_avatar; const lastMessageAvatar = members.length > 1 && lastMessage && !lastMessage.is_user && lastMessage.original_avatar;
const randomPool = lastMessageAvatar ? members.filter(x => x !== lastMessage.original_avatar) : members; const randomPool = lastMessageAvatar ? members.filter(x => x !== lastMessage.original_avatar) : members;
activatedMembers.push(randomPool[Math.floor(Math.random() * randomPool.length)]); activatedMember = randomPool[Math.floor(Math.random() * randomPool.length)];
} }
const memberIds = activatedMembers const memberId = characters.findIndex(y => y.avatar === activatedMember);
.map((x) => characters.findIndex((y) => y.avatar === x)) return memberId !== -1 ? [memberId] : [];
.filter((x) => x !== -1);
return memberIds;
} }
function activateNaturalOrder(members, input, lastMessage, allowSelfResponses, isUserInput) { function activateNaturalOrder(members, input, lastMessage, allowSelfResponses, isUserInput) {