mirror of
https://github.com/ikechan8370/chatgpt-plugin.git
synced 2025-12-17 22:07:10 +00:00
Merge branch 'v2' into v2
This commit is contained in:
commit
0daecc2edb
5 changed files with 68 additions and 64 deletions
15
apps/chat.js
15
apps/chat.js
|
|
@ -9,6 +9,7 @@ import SydneyAIClient from '../utils/SydneyAIClient.js'
|
|||
import { PoeClient } from '../utils/poe/index.js'
|
||||
import AzureTTS from '../utils/tts/microsoft-azure.js'
|
||||
import VoiceVoxTTS from '../utils/tts/voicevox.js'
|
||||
import fs from 'fs'
|
||||
import {
|
||||
render, renderUrl,
|
||||
getMessageById,
|
||||
|
|
@ -119,11 +120,11 @@ export class chatgpt extends plugin {
|
|||
permission: 'master'
|
||||
},
|
||||
{
|
||||
reg: '^#(chatgpt)?结束对话([sS]*)',
|
||||
reg: '^#(chatgpt)?(结束|新开|摧毁|毁灭|完结)对话([sS]*)',
|
||||
fnc: 'destroyConversations'
|
||||
},
|
||||
{
|
||||
reg: '^#(chatgpt)?结束全部对话$',
|
||||
reg: '^#(chatgpt)?(结束|新开|摧毁|毁灭|完结)全部对话$',
|
||||
fnc: 'endAllConversations',
|
||||
permission: 'master'
|
||||
},
|
||||
|
|
@ -1046,7 +1047,7 @@ export class chatgpt extends plugin {
|
|||
}
|
||||
try {
|
||||
try {
|
||||
let sendable = await uploadRecord(wav)
|
||||
let sendable = await uploadRecord(wav, Config.ttsMode === 'azure')
|
||||
if (sendable) {
|
||||
await e.reply(sendable)
|
||||
} else {
|
||||
|
|
@ -1061,6 +1062,14 @@ export class chatgpt extends plugin {
|
|||
logger.error(err)
|
||||
await this.reply('合成语音发生错误~')
|
||||
}
|
||||
if (Config.ttsMode === 'azure' && Config.azureTTSKey) {
|
||||
// 清理文件
|
||||
try {
|
||||
fs.unlinkSync(wav)
|
||||
} catch (err) {
|
||||
logger.warn(err)
|
||||
}
|
||||
}
|
||||
} else if (userSetting.usePicture || (Config.autoUsePicture && response.length > Config.autoUsePictureThreshold)) {
|
||||
// todo use next api of chatgpt to complete incomplete respoonse
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -38,17 +38,17 @@ let helpData = [
|
|||
},
|
||||
{
|
||||
icon: 'destroy',
|
||||
title: '#结束对话',
|
||||
title: '#(结束|新开|摧毁|毁灭|完结)对话',
|
||||
desc: '结束自己当前对话,下次开启对话机器人将遗忘掉本次对话内容。'
|
||||
},
|
||||
{
|
||||
icon: 'destroy',
|
||||
title: '#结束全部对话',
|
||||
title: '#(结束|新开|摧毁|毁灭|完结)全部对话',
|
||||
desc: '结束正在与本机器人进行对话的全部用户的对话。'
|
||||
},
|
||||
{
|
||||
icon: 'destroy-other',
|
||||
title: '#结束对话 @某人',
|
||||
title: '#(结束|新开|摧毁|毁灭|完结)对话 @某人',
|
||||
desc: '结束该用户当前对话,下次开启对话机器人将遗忘掉本次对话内容。'
|
||||
},
|
||||
{
|
||||
|
|
@ -104,7 +104,7 @@ let helpData = [
|
|||
{
|
||||
icon: 'game',
|
||||
title: '#chatgpt设置语音角色',
|
||||
desc: '设置语音模式下回复的角色音色'
|
||||
desc: '设置语音模式下回复的角色音色。优先级高于默认语音角色'
|
||||
},
|
||||
{
|
||||
icon: 'list',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue