Merge pull request #2245 from dennisrijsdijk/v5-lexicon-fix

fix: amazon polly effects from before update not working
crowbartools · Sep 22, 2023 · 855fea1 · 855fea1
2 parents a5d5ded + 66c5289
commit 855fea1
Showing 1 changed file with 29 additions and 23 deletions.
diff --git a/src/backend/integrations/builtin/aws/text-to-speech-polly-effect.js b/src/backend/integrations/builtin/aws/text-to-speech-polly-effect.js
@@ -515,30 +515,36 @@ const playSound = {
             effect.text = effect.text.replace("&", "&amp;");
         }
 
-        let listLexiconsResponse = null;
-        let lexicons = [];
-        let lexiconError;
-
-        do {
-            try {
-                const listLexiconsCommand = new ListLexiconsCommand({
-                    NextToken: listLexiconsResponse ? listLexiconsResponse.NextToken : undefined
-                });
-                listLexiconsResponse = await polly.send(listLexiconsCommand);
-                listLexiconsResponse.Lexicons.forEach(lexicon => lexicons.push(lexicon.Name));
-            } catch (e) {
-                lexicons = [];
-                lexiconError = e;
-                listLexiconsResponse = null;
-                break;
-            }
-        } while (listLexiconsResponse && listLexiconsResponse.NextToken);
-
-        if (lexiconError) {
-            logger.error("Error while trying to fetch lexicons before speech synthesis, proceeding without lexicons.");
+        if (effect.lexicons == null) {
             effect.lexicons = [];
-        } else {
-            effect.lexicons = effect.lexicons.filter(lexicon => lexicons.includes(lexicon));
+        }
+
+        if (effect.lexicons.length !== 0) {
+            let listLexiconsResponse = null;
+            let lexicons = [];
+            let lexiconError;
+
+            do {
+                try {
+                    const listLexiconsCommand = new ListLexiconsCommand({
+                        NextToken: listLexiconsResponse ? listLexiconsResponse.NextToken : undefined
+                    });
+                    listLexiconsResponse = await polly.send(listLexiconsCommand);
+                    listLexiconsResponse.Lexicons.forEach(lexicon => lexicons.push(lexicon.Name));
+                } catch (e) {
+                    lexicons = [];
+                    lexiconError = e;
+                    listLexiconsResponse = null;
+                    break;
+                }
+            } while (listLexiconsResponse && listLexiconsResponse.NextToken);
+
+            if (lexiconError) {
+                logger.error("Error while trying to fetch lexicons before speech synthesis, proceeding without lexicons.");
+                effect.lexicons = [];
+            } else {
+                effect.lexicons = effect.lexicons.filter(lexicon => lexicons.includes(lexicon));
+            }
         }
 
         const synthSpeechCommand = new SynthesizeSpeechCommand({