diff --git a/public/script.js b/public/script.js
index 0dd1a66b9..33bbfbc1d 100644
--- a/public/script.js
+++ b/public/script.js
@@ -2607,7 +2607,7 @@ function extractImageFromMessage(getMessage) {
return { getMessage, image, title };
}
-function isMultigenEnabled() {
+export function isMultigenEnabled() {
return power_user.multigen && (main_api == 'textgenerationwebui' || main_api == 'kobold' || main_api == 'novel');
}
diff --git a/public/scripts/extensions/tts/index.js b/public/scripts/extensions/tts/index.js
index 10f62b52a..2f9f3a4fb 100644
--- a/public/scripts/extensions/tts/index.js
+++ b/public/scripts/extensions/tts/index.js
@@ -1,6 +1,5 @@
-import { callPopup, is_send_press, saveSettingsDebounced } from '../../../script.js'
+import { callPopup, isMultigenEnabled, is_send_press, saveSettingsDebounced } from '../../../script.js'
import { extension_settings, getContext } from '../../extensions.js'
-import { is_group_generating } from '../../group-chats.js'
import { getStringHash } from '../../utils.js'
import { ElevenLabsTtsProvider } from './elevenlabs.js'
import { SileroTtsProvider } from './silerotts.js'
@@ -44,8 +43,8 @@ async function moduleWorker() {
return
}
- // Message is currently being generated
- if (is_send_press || is_group_generating) {
+ // Multigen message is currently being generated
+ if (is_send_press && isMultigenEnabled()) {
return;
}
@@ -241,7 +240,9 @@ async function processTtsQueue() {
console.debug('New message found, running TTS')
currentTtsJob = ttsJobQueue.shift()
- const text = currentTtsJob.mes.replaceAll('*', '')
+ const text = extension_settings.tts.narrate_dialogues_only
+ ? currentTtsJob.mes.replace(/\*[^\*]*?(\*|$)/g, '') // remove asterisks content
+ : currentTtsJob.mes.replaceAll('*', '') // remove just the asterisks
const char = currentTtsJob.name
try {
@@ -280,6 +281,7 @@ function loadSettings() {
'checked',
extension_settings.tts.enabled
)
+ $('#tts_narrate_dialogues').prop('checked', extension_settings.tts.narrate_dialogues_only)
}
const defaultSettings = {
@@ -367,6 +369,11 @@ function onEnableClick() {
}
+function onNarrateDialoguesClick() {
+ extension_settings.tts.narrate_dialogues_only = $('#tts_narrate_dialogues').prop('checked');
+ saveSettingsDebounced()
+}
+
//##############//
// TTS Provider //
//##############//
@@ -442,6 +449,10 @@ $(document).ready(function () {
Enabled
+