rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix TTS plugin clicks on SD button

Browse Source
This commit is contained in:
SillyLossy
2023-05-12 17:50:39 +03:00
parent 77cb59a7a2
commit d4eef884eb
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/scripts/extensions/tts/index.js
View File

@ -75,6 +75,7 @@ async function moduleWorker() {
// We're currently swiping or streaming. Don't generate voice // We're currently swiping or streaming. Don't generate voice
if ( if (
message.mes === '...' || message.mes === '...' ||
message.mes === '' ||
(context.streamingProcessor && !context.streamingProcessor.isFinished) (context.streamingProcessor && !context.streamingProcessor.isFinished)
) { ) {
return return
@ -164,7 +165,7 @@ function onAudioControlClicked() {
function addAudioControl() { function addAudioControl() {
$('#send_but_sheld').prepend('<div id="tts_media_control"/>') $('#send_but_sheld').prepend('<div id="tts_media_control"/>')
$('#send_but_sheld').on('click', onAudioControlClicked) $('#tts_media_control').on('click', onAudioControlClicked)
audioControl = document.getElementById('tts_media_control') audioControl = document.getElementById('tts_media_control')
updateUiAudioPlayState() updateUiAudioPlayState()
} }
@ -181,7 +182,7 @@ function completeCurrentAudioJob() {
*/ */
async function addAudioJob(response) { async function addAudioJob(response) {
const audioData = await response.blob() const audioData = await response.blob()
if (!audioData.type in ['audio/mpeg', 'audio/wav']) { if (!audioData.type in ['audio/mpeg', 'audio/wav', 'audio/x-wav', 'audio/wave']) {
throw `TTS received HTTP response with invalid data format. Expecting audio/mpeg, got ${audioData.type}` throw `TTS received HTTP response with invalid data format. Expecting audio/mpeg, got ${audioData.type}`
} }
audioJobQueue.push(audioData) audioJobQueue.push(audioData)
@ -241,11 +242,16 @@ async function processTtsQueue() {
console.debug('New message found, running TTS') console.debug('New message found, running TTS')
currentTtsJob = ttsJobQueue.shift() currentTtsJob = ttsJobQueue.shift()
const text = extension_settings.tts.narrate_dialogues_only const text = extension_settings.tts.narrate_dialogues_only
? currentTtsJob.mes.replace(/\*[^\*]*?(\*|$)/g, '') // remove asterisks content ? currentTtsJob.mes.replace(/\*[^\*]*?(\*|$)/g, '').trim() // remove asterisks content
: currentTtsJob.mes.replaceAll('*', '') // remove just the asterisks : currentTtsJob.mes.replaceAll('*', '').trim() // remove just the asterisks
const char = currentTtsJob.name const char = currentTtsJob.name
try { try {
if (!text) {
console.warn('Got empty text in TTS queue job.');
return;
}
if (!voiceMap[char]) { if (!voiceMap[char]) {
throw `${char} not in voicemap. Configure character in extension settings voice map` throw `${char} not in voicemap. Configure character in extension settings voice map`
} }