Merge pull request #3743 from BrendanMcCauley/3710 Fix activatePooledorder()

4f52c369faa80564df154c964593716c5d09ef84

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed
1 files changed, +4 -3Ignore whitespace
public/scripts/group-chats.js+4 -3
@@ -882,7 +882,7 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
882882 activatedMembers = activateListOrder(enabledMembers);
883883 }
884884 else if (activationStrategy === group_activation_strategy.POOLED) {
885885 activatedMembers = activatePooledOrder(enabledMembers, lastMessage, isUserInput);
886886 }
887887 else if (activationStrategy === group_activation_strategy.MANUAL && !isUserInput) {
888888 activatedMembers = shuffle(enabledMembers).slice(0, 1).map(x => characters.findIndex(y => y.avatar === x)).filter(x => x !== -1);
@@ -1030,16 +1030,17 @@ function activateListOrder(members) {
10301030 * Activate group members based on the last message.
10311031 * @param {string[]} members List of member avatars
10321032 * @param {Object} lastMessage Last message
1033+ * @param {boolean} isUserInput Whether the user has input text
10331034 * @returns {number[]} List of character ids
10341035 */
10351036function activatePooledOrder(members, lastMessage, isUserInput) {
10361037 /** @type {string} */
10371038 let activatedMember = null;
10381039 /** @type {string[]} */
10391040 const spokenSinceUser = [];
10401041
10411042 for (const message of chat.slice().reverse()) {
10421043 if (message.is_user || isUserInput) {
10431044 break;
10441045 }
10451046