diff --git a/apps/management.js b/apps/management.js index 6671eb7..93aca06 100644 --- a/apps/management.js +++ b/apps/management.js @@ -29,42 +29,42 @@ export class ChatgptManagement extends plugin { priority: 500, rule: [ { - reg: '#chatgpt开启(问题)?(回复)?确认', + reg: '^#chatgpt开启(问题)?(回复)?确认', fnc: 'turnOnConfirm', permission: 'master' }, { - reg: '#chatgpt关闭(问题)?(回复)?确认', + reg: '^#chatgpt关闭(问题)?(回复)?确认', fnc: 'turnOffConfirm', permission: 'master' }, { - reg: '#chatgpt(设置|绑定)(token|Token)', + reg: '^#chatgpt(设置|绑定)(token|Token)', fnc: 'setAccessToken', permission: 'master' }, { - reg: '#chatgpt(设置|绑定)(Poe|POE)(token|Token)', + reg: '^#chatgpt(设置|绑定)(Poe|POE)(token|Token)', fnc: 'setPoeCookie', permission: 'master' }, { - reg: '#chatgpt(设置|绑定|添加)(必应|Bing |bing )(token|Token)', + reg: '^#chatgpt(设置|绑定|添加)(必应|Bing |bing )(token|Token)', fnc: 'setBingAccessToken', permission: 'master' }, { - reg: '#chatgpt(删除|移除)(必应|Bing |bing )(token|Token)', + reg: '^#chatgpt(删除|移除)(必应|Bing |bing )(token|Token)', fnc: 'delBingAccessToken', permission: 'master' }, { - reg: '#chatgpt(查看|浏览)(必应|Bing |bing )(token|Token)', + reg: '^#chatgpt(查看|浏览)(必应|Bing |bing )(token|Token)', fnc: 'getBingAccessToken', permission: 'master' }, { - reg: '#chatgpt(迁移|恢复)(必应|Bing |bing )(token|Token)', + reg: '^#chatgpt(迁移|恢复)(必应|Bing |bing )(token|Token)', fnc: 'migrateBingAccessToken', permission: 'master' }, diff --git a/utils/common.js b/utils/common.js index 002f69c..df7256d 100644 --- a/utils/common.js +++ b/utils/common.js @@ -1,17 +1,17 @@ // import { remark } from 'remark' // import stripMarkdown from 'strip-markdown' -import { exec } from 'child_process' +import {exec} from 'child_process' import lodash from 'lodash' import fs from 'node:fs' import path from 'node:path' import buffer from 'buffer' import yaml from 'yaml' import puppeteer from '../../../lib/puppeteer/puppeteer.js' -import { Config } from './config.js' -import { convertSpeaker, generateVitsAudio, speakers as vitsRoleList } from './tts.js' -import VoiceVoxTTS, { supportConfigurations as voxRoleList } from './tts/voicevox.js' -import AzureTTS, { supportConfigurations as azureRoleList } from './tts/microsoft-azure.js' -import { translate } from './translate.js' +import {Config} from './config.js' +import {convertSpeaker, generateVitsAudio, speakers as vitsRoleList} from './tts.js' +import VoiceVoxTTS, {supportConfigurations as voxRoleList} from './tts/voicevox.js' +import AzureTTS, {supportConfigurations as azureRoleList} from './tts/microsoft-azure.js' +import {translate} from './translate.js' import uploadRecord from './uploadRecord.js' // export function markdownToText (markdown) { // return remark() @@ -897,6 +897,7 @@ export async function generateAzureAudio (pendingText, role = '随机', speaking let languagePrefix = azureRoleList.find(config => config.code === speaker).languageDetail.charAt(0) languagePrefix = languagePrefix.startsWith('E') ? '英' : languagePrefix pendingText = (await translate(pendingText, languagePrefix)).replace('\n', '') + } else { let role, languagePrefix role = azureRoleList[Math.floor(Math.random() * azureRoleList.length)] @@ -938,3 +939,4 @@ export function getUserSpeaker (userSetting) { return userSetting.ttsRoleVoiceVox || Config.voicevoxTTSSpeaker } } +