From e6738e552706edc234ace59eb63beec35d1f1d6f Mon Sep 17 00:00:00 2001
From: ikechan8370 <geyinchibuaa@gmail.com>
Date: Fri, 3 Feb 2023 21:49:55 +0800
Subject: [PATCH] fix: redis expire time; picture mode title; queue lock
 problem

---
 apps/chat.js                 | 32 ++++++++++++++++----------------
 resources/content/index.html |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/apps/chat.js b/apps/chat.js
index 6053d85..ec8e36d 100644
--- a/apps/chat.js
+++ b/apps/chat.js
@@ -241,9 +241,7 @@ export class chatgpt extends plugin {
       }
       let response = chatMessage?.text
       previousConversation.num = previousConversation.num + 1
-      await redis.set(`CHATGPT:CONVERSATIONS:${e.sender.user_id}`, JSON.stringify(previousConversation), { EX: CONVERSATION_PRESERVE_TIME })
-      // 移除队列首位，释放锁
-      await redis.lPop('CHATGPT:CHAT_QUEUE', 0)
+      await redis.set(`CHATGPT:CONVERSATIONS:${e.sender.user_id}`, JSON.stringify(previousConversation), CONVERSATION_PRESERVE_TIME > 0 ? { EX: CONVERSATION_PRESERVE_TIME } : {})
       // 检索是否有屏蔽词
       const blockWord = blockWords.split(',').find(word => response.toLowerCase().includes(word.toLowerCase()))
       if (blockWord) {
@@ -260,37 +258,37 @@ export class chatgpt extends plugin {
       }
       if (userSetting.usePicture) {
         let endTokens = ['.', '。', '……', '!', '！', ']', ')', '）', '】', '?', '？', '~', '"', "'"]
-        while (!endTokens.find(token => response.trimEnd().endsWith(token))) {
+        let maxTries = 3
+        while (maxTries >= 0 && !endTokens.find(token => response.trimEnd().endsWith(token))) {
+          maxTries--
           // while (!response.trimEnd().endsWith('.') && !response.trimEnd().endsWith('。') && !response.trimEnd().endsWith('……') &&
           //     !response.trimEnd().endsWith('！') && !response.trimEnd().endsWith('!') && !response.trimEnd().endsWith(']') && !response.trimEnd().endsWith('】')
           // ) {
           await this.reply('内容有点多，我正在奋笔疾书，请再等一会', true, { recallMsg: 5 })
           option = {
-            onConversationResponse: function (c) {
-              previousConversation.conversation = {
-                conversationId: c.conversation_id,
-                parentMessageId: c.message.id
-              }
-              redis.set(`CHATGPT:CONVERSATIONS:${e.sender.user_id}`, JSON.stringify(previousConversation), { EX: CONVERSATION_PRESERVE_TIME }).then(res => {
-                logger.debug('redis set conversation')
-              })
-            }
+            timeoutMs: 120000
           }
           option = Object.assign(option, previousConversation.conversation)
           const responseAppend = await this.chatGPTApi.sendMessage('Continue', option)
+          previousConversation.conversation = {
+            conversationId: responseAppend.conversationId,
+            parentMessageId: responseAppend.id
+          }
+          let responseAppendText = responseAppend?.text
+          await redis.set(`CHATGPT:CONVERSATIONS:${e.sender.user_id}`, JSON.stringify(previousConversation), CONVERSATION_PRESERVE_TIME > 0 ? { EX: CONVERSATION_PRESERVE_TIME } : {})
           // console.log(responseAppend)
           // 检索是否有屏蔽词
-          const blockWord = blockWords.split(',').find(word => responseAppend.toLowerCase().includes(word.toLowerCase()))
+          const blockWord = blockWords.split(',').find(word => responseAppendText.toLowerCase().includes(word.toLowerCase()))
           if (blockWord) {
             await this.reply('返回内容存在敏感词，我不想回答你', true)
             return
           }
-          if (responseAppend.indexOf('conversation') > -1 || responseAppend.startsWith("I'm sorry")) {
+          if (responseAppendText.indexOf('conversation') > -1 || responseAppendText.startsWith("I'm sorry")) {
             logger.warn('chatgpt might forget what it had said')
             break
           }
 
-          response = response + responseAppend
+          response = response + responseAppendText
         }
         // logger.info(response)
         // markdown转为html
@@ -302,6 +300,8 @@ export class chatgpt extends plugin {
       } else {
         await this.reply(`${response}`, e.isGroup)
       }
+      // 移除队列首位，释放锁
+      await redis.lPop('CHATGPT:CHAT_QUEUE', 0)
     } catch (e) {
       logger.error(e)
       // 异常了也要腾地方（todo 大概率后面的也会异常，要不要一口气全杀了）
diff --git a/resources/content/index.html b/resources/content/index.html
index 720bcc7..4ae3ff4 100644
--- a/resources/content/index.html
+++ b/resources/content/index.html
@@ -16,7 +16,7 @@
 <!--    </div>-->
     <div class="question">
         <span>
-            {{question}}
+            {{prompt}}
         </span>
 
     </div>