From 22c646ae5dfa478761e5ea60ace6d223957e3567 Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Wed, 31 May 2023 08:33:49 +0900
Subject: [PATCH] [fix] group chat activation & talkness

---
 src/ts/process/group.ts | 8 +++++---
 src/ts/process/index.ts | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/ts/process/group.ts b/src/ts/process/group.ts
index 86ed862d..5af16c31 100644
--- a/src/ts/process/group.ts
+++ b/src/ts/process/group.ts
@@ -56,6 +56,7 @@ export type GroupOrder = {
 
 export function groupOrder(chars:GroupOrder[], input:string):GroupOrder[] {
     let order:GroupOrder[] = [];
+    let ids:string[] = []
     if (input) {
         const words = getWords(input)
 
@@ -66,6 +67,7 @@ export function groupOrder(chars:GroupOrder[], input:string):GroupOrder[] {
 
                 if (charNameChunks.includes(word)) {
                     order.push(char);
+                    ids.push(char.id)
                     break;
                 }
             }
@@ -74,15 +76,15 @@ export function groupOrder(chars:GroupOrder[], input:string):GroupOrder[] {
 
     const shuffled = shuffle(chars)
     for (const char of shuffled) {
-        if(order.includes(char)){
+        if(ids.includes(char.id)){
             continue
         }
 
-        //TODO
-        const chance = 0.5
+        const chance = char.talkness ?? 0.5
 
         if (chance >= Math.random()) {
             order.push(char);
+            ids.push(char.id)
         }
     }
 
diff --git a/src/ts/process/index.ts b/src/ts/process/index.ts
index a694092e..5df79a20 100644
--- a/src/ts/process/index.ts
+++ b/src/ts/process/index.ts
@@ -79,6 +79,8 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
                     talkness: nowChatroom.characterActive[i] ? nowChatroom.characterTalks[i] : -1,
                     index: i
                 }
+            }).filter((v) => {
+                return v.talkness > 0
             })
             if(!nowChatroom.orderByOrder){
                 order = groupOrder(order, lastMessage?.data).filter((v) => {