From dce7503c413dda37d8820346be7e43f37951954b Mon Sep 17 00:00:00 2001
From: ikechan8370 <geyinchibuaa@gmail.com>
Date: Fri, 13 Oct 2023 22:15:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BE=AE=E8=BD=AF=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=AC=AC=E4=B8=80=E6=AC=A1=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=AF=B9=E8=AF=9D=E6=8F=90=E7=A4=BA=E4=BB=A5?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E6=97=A0=E9=99=90=E5=BE=AA=E7=8E=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/chat.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/chat.js b/apps/chat.js
index 1bea8a3..d375415 100644
--- a/apps/chat.js
+++ b/apps/chat.js
@@ -761,7 +761,7 @@ export class chatgpt extends plugin {
       if (!e.raw_message || e.msg?.startsWith('#')) {
         return false
       }
-      if (e.isGroup && !(e.atme || e.atBot)) {
+      if ((e.isGroup || e.group_id) && !(e.atme || e.atBot)) {
         return false
       }
       if (e.user_id == getUin(e)) return false
@@ -1720,8 +1720,11 @@ export class chatgpt extends plugin {
                   }
                 } else {
                   // 未登录用户maxConv目前为5或10，出验证码没救
-                  logger.warn(`token [${bingToken}] 无效或已过期`)
+                  logger.warn(`token [${bingToken}] 无效或已过期，如确认token无误，请前往网页版必应对话一次`)
+                  retry = 0
                 }
+              } else {
+                retry = 0
               }
             } else
               if (message && typeof message === 'string' && message.indexOf('限流') > -1) {