From 75a060b86c8282a80c4acd07c4cd079964cc91e3 Mon Sep 17 00:00:00 2001
From: ikechan8370 <geyinchibuaa@gmail.com>
Date: Sun, 5 Mar 2023 14:39:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/chat.js       | 10 ++++++----
 apps/management.js | 10 +++-------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/apps/chat.js b/apps/chat.js
index 3e75e4a..e1120e5 100644
--- a/apps/chat.js
+++ b/apps/chat.js
@@ -80,7 +80,7 @@ export class chatgpt extends plugin {
           fnc: 'chatgpt'
         },
         {
-          reg: '^#chatgpt对话列表$',
+          reg: '^#(chatgpt)?对话列表$',
           fnc: 'getAllConversations',
           permission: 'master'
         },
@@ -110,7 +110,7 @@ export class chatgpt extends plugin {
           fnc: 'switch2Audio'
         },
         {
-          reg: '^#chatgpt设置语音角色',
+          reg: '^#chatgpt设置(语音角色|角色语音|角色)',
           fnc: 'setDefaultRole'
         },
         {
@@ -133,7 +133,7 @@ export class chatgpt extends plugin {
           fnc: 'attachConversation'
         },
         {
-          reg: '^#chatgpt加入对话',
+          reg: '^#(chatgpt)?加入对话',
           fnc: 'joinConversation'
         },
         {
@@ -380,7 +380,9 @@ export class chatgpt extends plugin {
     } else {
       userSetting = JSON.parse(userSetting)
     }
-    let speaker = _.trimStart(e.msg, '#chatgpt设置语音角色') || '随机'
+    const regex = /^#chatgpt设置(语音角色|角色语音|角色)/
+    // let speaker = _.trimStart(e.msg, regex) || '随机'
+    let speaker = e.msg.replace(regex, '').trim() || '随机'
     userSetting.ttsRole = convertSpeaker(speaker)
     if (speakers.indexOf(userSetting.ttsRole) >= 0) {
       await redis.set(`CHATGPT:USER:${e.sender.user_id}`, JSON.stringify(userSetting))
diff --git a/apps/management.js b/apps/management.js
index 4a4e14a..1f806ce 100644
--- a/apps/management.js
+++ b/apps/management.js
@@ -23,12 +23,12 @@ export class ChatgptManagement extends plugin {
           permission: 'master'
         },
         {
-          reg: '#chatgpt设置token',
+          reg: '#chatgpt(设置|绑定)(token|Token)',
           fnc: 'setAccessToken',
           permission: 'master'
         },
         {
-          reg: '#chatgpt设置必应token',
+          reg: '#chatgpt(设置|绑定)(必应|Bing |bing )(token|Token)',
           fnc: 'setBingAccessToken',
           permission: 'master'
         },
@@ -58,11 +58,7 @@ export class ChatgptManagement extends plugin {
           permission: 'master'
         },
         {
-          reg: '^#chatgpt模式帮助$',
-          fnc: 'modeHelp'
-        },
-        {
-          reg: '^#chatgpt模式$',
+          reg: '^#chatgpt模式(帮助)?$',
           fnc: 'modeHelp'
         },
         {