From 548642dab9f6d1f607418d2278969d3125046016 Mon Sep 17 00:00:00 2001
From: ikechan8370 <geyinchibuaa@gmail.com>
Date: Tue, 14 Feb 2023 18:58:58 +0800
Subject: [PATCH] fix: null option

---
 apps/chat.js    | 8 ++++++--
 config/index.js | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/chat.js b/apps/chat.js
index d02bdad..d5a2166 100644
--- a/apps/chat.js
+++ b/apps/chat.js
@@ -6,7 +6,7 @@ import mjAPI from 'mathjax-node'
 import { uuid } from 'oicq/lib/common.js'
 import delay from 'delay'
 import { ChatGPTAPI } from 'chatgpt'
-import { ChatGPTClient, BingAIClient  } from '@waylaidwanderer/chatgpt-api'
+import { ChatGPTClient, BingAIClient } from '@waylaidwanderer/chatgpt-api'
 import { getMessageById, tryTimes, upsertMessage } from '../utils/common.js'
 import { ChatGPTPuppeteer } from '../utils/browser.js'
 import { KeyvFile } from 'keyv-file'
@@ -336,7 +336,11 @@ export class chatgpt extends plugin {
   }
 
   async sendMessage (prompt, conversation = {}, use) {
-    conversation.timeoutMs = 120000
+    if (!conversation) {
+      conversation = {
+        timeoutMs: 120000
+      }
+    }
     // console.log(use)
     if (use === 'browser') {
       return await this.chatgptBrowserBased(prompt, conversation)
diff --git a/config/index.js b/config/index.js
index e9d8ba6..d938084 100644
--- a/config/index.js
+++ b/config/index.js
@@ -20,7 +20,7 @@ export const Config = {
   apiKey: API_KEY,
   // 模型名称，选填。如无特殊需求保持默认即可，会使用chatgpt-api库提供的当前可用的最适合的默认值。保底可用的是 text-davinci-003。当发现新的可用的chatGPT模型会更新这里的值
   // 20230211： text-chat-davinci-002-sh-alpha-aoruigiofdj83 中午存活了几分钟
-  model: '',
+  model: 'text-davinci-002-render',
   api: '',
   // ***********************************************************************************************************************************
   //                                                        以下为API2方式的配置                                                          *