From 2d5fb669ad4d06c7acb72d8847de9b63428f75c4 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Thu, 11 Jan 2024 19:19:16 +0100
Subject: [PATCH 1/2] (profile) potential fix for name pronunciation

---
 routes/profileEditor.vue   | 2 --
 server/routes/pronounce.js | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/routes/profileEditor.vue b/routes/profileEditor.vue
index 9944eecc1..1138b6a8a 100644
--- a/routes/profileEditor.vue
+++ b/routes/profileEditor.vue
@@ -112,11 +112,9 @@
                     </p>
                     <OpinionListInput v-model="names" :prototype="{ value: '', opinion: 'meh', pronunciation: null }"
                         :customOpinions="opinions" :maxitems="128" :maxlength="config.profile.longNames ? 255 : 32">
-                        <!--
                         <template v-slot:additional="s">
                             <PronunciationInput v-model="s.val.pronunciation"/>
                         </template>
-                        -->
                     </OpinionListInput>
                     <InlineMarkdownInstructions v-model="markdown"/>
                     <PropagateCheckbox field="names" :before="beforeChanges.names" :after="names" v-if="otherProfiles > 0" @change="propagateChanged"/>
diff --git a/server/routes/pronounce.js b/server/routes/pronounce.js
index 715d7d0aa..bd9ffe78c 100644
--- a/server/routes/pronounce.js
+++ b/server/routes/pronounce.js
@@ -8,8 +8,8 @@ import S3 from 'aws-sdk/clients/s3.js';
 
 const router = Router();
 
-router.get('/pronounce/:voice/*', handleErrorAsync(async (req, res) => {
-    const text = req.params[0];
+router.get('/pronounce/:voice/:pronunciation(*)', handleErrorAsync(async (req, res) => {
+    const text = req.params.pronunciation;
 
     if (!text || text.length > 256) {
         return res.status(404).json({error: 'Not found'});

From 922966f18da6b903274e87886d11dfba8cd7e79c Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Thu, 11 Jan 2024 19:39:21 +0100
Subject: [PATCH 2/2] (profile) another potential fix for name pronunciation

---
 components/PronunciationSpeaker.vue | 4 +++-
 server/routes/pronounce.js          | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/components/PronunciationSpeaker.vue b/components/PronunciationSpeaker.vue
index 68651d676..ec44ba791 100644
--- a/components/PronunciationSpeaker.vue
+++ b/components/PronunciationSpeaker.vue
@@ -8,6 +8,8 @@
 
 
 <script>
+import { Base64 } from 'js-base64';
+
 export default {
     props: {
         pronunciation: { default: null, type: String },
@@ -15,7 +17,7 @@ export default {
     },
     computed: {
         pronunciationLink() {
-            return `/api/pronounce/${this.voice}/${encodeURIComponent(this.pronunciation)}`;
+            return `/api/pronounce/${this.voice}/${Base64.encodeURI(this.pronunciation)}`;
         },
         name() {
             let voices;
diff --git a/server/routes/pronounce.js b/server/routes/pronounce.js
index bd9ffe78c..84765d613 100644
--- a/server/routes/pronounce.js
+++ b/server/routes/pronounce.js
@@ -1,6 +1,7 @@
 import { Router } from 'express';
 import sha1 from 'sha1';
 import { convertPronunciationStringToSsml, handleErrorAsync } from '../../src/helpers.js';
+import { Base64 } from 'js-base64';
 
 import awsConfig from '../aws.js';
 import Polly from 'aws-sdk/clients/polly.js';
@@ -8,8 +9,8 @@ import S3 from 'aws-sdk/clients/s3.js';
 
 const router = Router();
 
-router.get('/pronounce/:voice/:pronunciation(*)', handleErrorAsync(async (req, res) => {
-    const text = req.params.pronunciation;
+router.get('/pronounce/:voice/:pronunciation', handleErrorAsync(async (req, res) => {
+    const text = Base64.decode(req.params.pronunciation);
 
     if (!text || text.length > 256) {
         return res.status(404).json({error: 'Not found'});