fix: 优化一些命令匹配

This commit is contained in:
ikechan8370 2023-03-05 14:39:33 +08:00
parent 312af3cf4a
commit 75a060b86c
2 changed files with 9 additions and 11 deletions

View file

@ -80,7 +80,7 @@ export class chatgpt extends plugin {
fnc: 'chatgpt' fnc: 'chatgpt'
}, },
{ {
reg: '^#chatgpt对话列表$', reg: '^#(chatgpt)?对话列表$',
fnc: 'getAllConversations', fnc: 'getAllConversations',
permission: 'master' permission: 'master'
}, },
@ -110,7 +110,7 @@ export class chatgpt extends plugin {
fnc: 'switch2Audio' fnc: 'switch2Audio'
}, },
{ {
reg: '^#chatgpt设置语音角色', reg: '^#chatgpt设置(语音角色|角色语音|角色)',
fnc: 'setDefaultRole' fnc: 'setDefaultRole'
}, },
{ {
@ -133,7 +133,7 @@ export class chatgpt extends plugin {
fnc: 'attachConversation' fnc: 'attachConversation'
}, },
{ {
reg: '^#chatgpt加入对话', reg: '^#(chatgpt)?加入对话',
fnc: 'joinConversation' fnc: 'joinConversation'
}, },
{ {
@ -380,7 +380,9 @@ export class chatgpt extends plugin {
} else { } else {
userSetting = JSON.parse(userSetting) 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) userSetting.ttsRole = convertSpeaker(speaker)
if (speakers.indexOf(userSetting.ttsRole) >= 0) { if (speakers.indexOf(userSetting.ttsRole) >= 0) {
await redis.set(`CHATGPT:USER:${e.sender.user_id}`, JSON.stringify(userSetting)) await redis.set(`CHATGPT:USER:${e.sender.user_id}`, JSON.stringify(userSetting))

View file

@ -23,12 +23,12 @@ export class ChatgptManagement extends plugin {
permission: 'master' permission: 'master'
}, },
{ {
reg: '#chatgpt设置token', reg: '#chatgpt(设置|绑定)(token|Token)',
fnc: 'setAccessToken', fnc: 'setAccessToken',
permission: 'master' permission: 'master'
}, },
{ {
reg: '#chatgpt设置必应token', reg: '#chatgpt(设置|绑定)(必应|Bing |bing )(token|Token)',
fnc: 'setBingAccessToken', fnc: 'setBingAccessToken',
permission: 'master' permission: 'master'
}, },
@ -58,11 +58,7 @@ export class ChatgptManagement extends plugin {
permission: 'master' permission: 'master'
}, },
{ {
reg: '^#chatgpt模式帮助$', reg: '^#chatgpt模式(帮助)?$',
fnc: 'modeHelp'
},
{
reg: '^#chatgpt模式$',
fnc: 'modeHelp' fnc: 'modeHelp'
}, },
{ {