From ea687296a51083f4902e0f267e8fe22e8280e75d Mon Sep 17 00:00:00 2001
From: ikechan8370 <geyinchi@buaa.edu.cn>
Date: Mon, 30 Oct 2023 15:35:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B4=E7=90=86=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E9=95=BF=E6=9C=9F=E9=81=97=E7=95=99=E6=87=92=E5=BE=97=E4=BF=AE?=
 =?UTF-8?q?=E7=9A=84=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/chat.js            | 13 ++++++++-----
 utils/SydneyAIClient.js |  6 +++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/apps/chat.js b/apps/chat.js
index fb14c7a..b7c635f 100644
--- a/apps/chat.js
+++ b/apps/chat.js
@@ -1102,9 +1102,7 @@ export class chatgpt extends plugin {
         logger.mark({ conversation })
       }
       let chatMessage = await this.sendMessage(prompt, conversation, use, e)
-      if (chatMessage.image) {
-        this.setContext('solveBingCaptcha', false, 60)
-        await e.reply([chatMessage.text, segment.image(`base64://${chatMessage.image}`)])
+      if (chatMessage?.noMsg) {
         return false
       }
       // 处理星火和bard图片
@@ -1869,10 +1867,10 @@ export class chatgpt extends plugin {
             text: errorMessage,
             error: true
           }
-        } else {
+        } else if (response?.response) {
           return {
             text: response?.response,
-            quote: response.quote,
+            quote: response?.quote,
             suggestedResponses: response.suggestedResponses,
             conversationId: response.conversationId,
             clientId: response.clientId,
@@ -1881,6 +1879,11 @@ export class chatgpt extends plugin {
             parentMessageId: response.apology ? conversation.parentMessageId : response.messageId,
             bingToken
           }
+        } else {
+          logger.debug('no message')
+          return {
+            noMsg: true
+          }
         }
       }
       case 'api3': {
diff --git a/utils/SydneyAIClient.js b/utils/SydneyAIClient.js
index 701f2ec..c425f7c 100644
--- a/utils/SydneyAIClient.js
+++ b/utils/SydneyAIClient.js
@@ -138,7 +138,11 @@ export default class SydneyAIClient {
         agent = proxy(this.opts.proxy)
       }
       if (Config.sydneyWebsocketUseProxy) {
-        sydneyHost = Config.sydneyReverseProxy.replace('https://', 'wss://').replace('http://', 'ws://')
+        if (!Config.sydneyReverseProxy) {
+          logger.warn('用户开启了对话反代，但是没有配置反代，忽略反代配置')
+        } else {
+          sydneyHost = Config.sydneyReverseProxy.replace('https://', 'wss://').replace('http://', 'ws://')
+        }
       }
       logger.mark(`use sydney websocket host: ${sydneyHost}`)
       let host = sydneyHost + '/sydney/ChatHub'