From c3eb8ac5dbf56c66acefea73faabea6a407da134 Mon Sep 17 00:00:00 2001
From: ikechan8370 <geyinchibuaa@gmail.com>
Date: Sat, 15 Feb 2025 23:39:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=81=8A=E5=A4=A9=E8=AE=B0=E5=BD=95bug?=
 =?UTF-8?q?=EF=BC=9B=E5=88=A0=E9=99=A4=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/bym.js                        | 10 ++--------
 client/CopilotAIClient.js          |  4 +++-
 client/CustomGoogleGeminiClient.js |  2 +-
 model/core.js                      |  4 +++-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/apps/bym.js b/apps/bym.js
index b9d271a..41b86f5 100644
--- a/apps/bym.js
+++ b/apps/bym.js
@@ -55,15 +55,9 @@ export class bym extends plugin {
     }
     if (prop < Config.bymRate) {
       logger.info('random chat hit')
-      let chats = await getChatHistoryGroup(e, Config.groupContextLength)
+      // let chats = await getChatHistoryGroup(e, Config.groupContextLength)
       let system = `你的名字是“${Config.assistantLabel}”，你在一个qq群里，群号是${group},当前和你说话的人群名片是${card}, qq号是${sender}, 请你结合用户的发言和聊天记录作出回应，要求表现得随性一点，最好参与讨论，混入其中。不要过分插科打诨，不知道说什么可以复读群友的话。要求你做搜索、发图、发视频和音乐等操作时要使用工具。不可以直接发[图片]这样蒙混过关。要求优先使用中文进行对话。如果此时不需要自己说话，可以只回复<EMPTY>` +
         candidate +
-        '以下是聊天记录:' + chats
-          .map(chat => {
-            let sender = chat.sender || chat || {}
-            return `【${sender.card || sender.nickname}】(qq：${sender.user_id}, ${roleMap[sender.role] || 'normal user'}，${sender.area ? 'from ' + sender.area + ', ' : ''} ${sender.age} years old, 群头衔：${sender.title}, gender: ${sender.sex}, time：${formatDate(new Date(chat.time * 1000))} 说：${chat.raw_message}`
-          })
-          .join('\n') +
         `\n你的回复应该尽可能简练，像人类一样随意，不要附加任何奇怪的东西，如聊天记录的格式（比如${Config.assistantLabel}：），禁止重复聊天记录。`
 
       let rsp = await core.sendMessage(e.msg, {}, Config.bymMode, e, {
@@ -83,7 +77,7 @@ export class bym extends plugin {
             msg && e.reply(msg)
           },
           // 上下文在bym.js里构造，简化版。
-          enableGroupContext: false
+          enableGroupContext: Config.enableGroupContext
         }
       })
       // let rsp = await client.sendMessage(e.msg, opt)
diff --git a/client/CopilotAIClient.js b/client/CopilotAIClient.js
index 8295353..6ff650f 100644
--- a/client/CopilotAIClient.js
+++ b/client/CopilotAIClient.js
@@ -121,7 +121,9 @@ export class BingAIClient {
       this.ws.once('message', (data) => {
         clearTimeout(timeout) // 清除超时定时器
         const message = JSON.parse(data)
-        logger.info(data)
+        if (this.debug) {
+          logger.info(data)
+        }
         if (message.event === 'challenge') {
           logger.warn('遇到turnstile验证码，尝试使用2captcha解决')
           // 如果收到 challenge，处理挑战
diff --git a/client/CustomGoogleGeminiClient.js b/client/CustomGoogleGeminiClient.js
index ec3e771..87ef625 100644
--- a/client/CustomGoogleGeminiClient.js
+++ b/client/CustomGoogleGeminiClient.js
@@ -250,7 +250,7 @@ export class CustomGoogleGeminiClient extends GoogleGeminiClient {
       delete content.conversationId
     })
     if (this.debug) {
-      logger.info(JSON.stringify(body))
+      logger.debug(JSON.stringify(body))
     }
     let result = await newFetch(url, {
       method: 'POST',
diff --git a/model/core.js b/model/core.js
index e749c65..3c86c73 100644
--- a/model/core.js
+++ b/model/core.js
@@ -152,7 +152,9 @@ class Core {
         messages: [],
         createdAt: Date.now()
       }
-      logger.info(JSON.stringify(conversations))
+      if (Config.debug) {
+        logger.debug(JSON.stringify(conversations))
+      }
       const previousCachedMessages = SydneyAIClient.getMessagesForConversation(conversations.messages, conversation.parentMessageId)
         .map((message) => {
           return {