From be2d658a2e121d972d99203a4f1ef7953fadb933 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sun, 30 Jun 2024 22:01:34 +0300
Subject: [PATCH] Update TTS extension to use new popup

---
 public/scripts/extensions/tts/azure.js | 7 ++++---
 public/scripts/extensions/tts/coqui.js | 4 ++--
 public/scripts/extensions/tts/novel.js | 5 +++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/public/scripts/extensions/tts/azure.js b/public/scripts/extensions/tts/azure.js
index 6ff49d9c9..88d3f4771 100644
--- a/public/scripts/extensions/tts/azure.js
+++ b/public/scripts/extensions/tts/azure.js
@@ -1,4 +1,5 @@
-import { callPopup, getRequestHeaders } from '../../../script.js';
+import { getRequestHeaders } from '../../../script.js';
+import { POPUP_TYPE, callGenericPopup } from '../../popup.js';
 import { SECRET_KEYS, findSecret, secret_state, writeSecret } from '../../secrets.js';
 import { getPreviewString, saveTtsProviderSettings } from './index.js';
 export { AzureTtsProvider };
@@ -69,13 +70,13 @@ class AzureTtsProvider {
             const popupText = 'Azure TTS API Key';
             const savedKey = secret_state[SECRET_KEYS.AZURE_TTS] ? await findSecret(SECRET_KEYS.AZURE_TTS) : '';
 
-            const key = await callPopup(popupText, 'input', savedKey);
+            const key = await callGenericPopup(popupText, POPUP_TYPE.INPUT, savedKey);
 
             if (key == false || key == '') {
                 return;
             }
 
-            await writeSecret(SECRET_KEYS.AZURE_TTS, key);
+            await writeSecret(SECRET_KEYS.AZURE_TTS, String(key));
 
             toastr.success('API Key saved');
             $('#azure_tts_key').addClass('success');
diff --git a/public/scripts/extensions/tts/coqui.js b/public/scripts/extensions/tts/coqui.js
index b16fa2cf9..a4c1cecf3 100644
--- a/public/scripts/extensions/tts/coqui.js
+++ b/public/scripts/extensions/tts/coqui.js
@@ -5,8 +5,8 @@ TODO:
 */
 
 import { doExtrasFetch, extension_settings, getApiUrl, modules } from '../../extensions.js';
-import { callPopup } from '../../../script.js';
 import { initVoiceMap } from './index.js';
+import { POPUP_TYPE, callGenericPopup } from '../../popup.js';
 
 export { CoquiTtsProvider };
 
@@ -246,7 +246,7 @@ class CoquiTtsProvider {
         }
 
         // Ask user for voiceId name to save voice
-        const voiceName = await callPopup('<h3>Name of Coqui voice to add to voice select dropdown:</h3>', 'input');
+        const voiceName = await callGenericPopup('Name of Coqui voice to add to voice select dropdown:', POPUP_TYPE.INPUT);
 
         const model_origin = $('#coqui_model_origin').val();
         const model_language = $('#coqui_api_language').val();
diff --git a/public/scripts/extensions/tts/novel.js b/public/scripts/extensions/tts/novel.js
index 175bdd07a..6bd08e4fa 100644
--- a/public/scripts/extensions/tts/novel.js
+++ b/public/scripts/extensions/tts/novel.js
@@ -1,4 +1,5 @@
-import { getRequestHeaders, callPopup } from '../../../script.js';
+import { getRequestHeaders } from '../../../script.js';
+import { POPUP_TYPE, callGenericPopup } from '../../popup.js';
 import { splitRecursive } from '../../utils.js';
 import { getPreviewString, saveTtsProviderSettings } from './index.js';
 import { initVoiceMap } from './index.js';
@@ -56,7 +57,7 @@ class NovelTtsProvider {
 
     // Add a new Novel custom voice to provider
     async addCustomVoice() {
-        const voiceName = await callPopup('<h3>Custom Voice name:</h3>', 'input');
+        const voiceName = await callGenericPopup('Custom Voice name:',  POPUP_TYPE.INPUT);
         this.settings.customVoices.push(voiceName);
         this.populateCustomVoices();
         initVoiceMap(); // Update TTS extension voiceMap