MurasameNoa/chatgpt-plugin
1
0
Fork 0
mirror of https://github.com/ikechan8370/chatgpt-plugin.git synced 2025-12-16 13:27:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: merge conflict

Browse source
This commit is contained in:
ikechan8370 2023-11-21 15:43:48 +08:00
commit 2b19302b87
14 changed files with 264 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

6
utils/common.js
View file

@ -832,8 +832,10 @@ export function getMaxModelTokens (model = 'gpt-3.5-turbo') {
if (model.startsWith('gpt-3.5-turbo')) {
if (model.includes('16k')) {
return 16000
} else {
} else if (model.includes('0613') || model.includes('0314')) {
return 4000
} else {
return 16000
}
} else {
if (model.includes('32k')) {
@ -870,7 +872,7 @@ export async function generateAudio (e, pendingText, speakingEmotion, emotionDeg
if (!Config.ttsSpace && !Config.azureTTSKey && !Config.voicevoxSpace) return false
let wav
const speaker = getUserSpeaker(await getUserReplySetting(e))
let ignoreEncode = getUin(e) === 88888
let ignoreEncode = e.adapter === 'shamrock'
try {
if (Config.ttsMode === 'vits-uma-genshin-honkai' && Config.ttsSpace) {
if (Config.autoJapanese) {