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'