diff options
author | toasted-nutbread <toasted-nutbread@users.noreply.github.com> | 2020-02-22 14:50:21 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-22 14:50:21 -0500 |
commit | f8f03f3af0ab031cc58bf5ad3f782c8d45137430 (patch) | |
tree | 3116b3a9429077d77f16d374835ab768d8b0d9d4 /ext/mixed/js/audio.js | |
parent | f3c4b0e1e14cbdfb86c692e89144c762801b2339 (diff) | |
parent | 418e7f9968ba8a6e302ec1e1b6d7dafe4b85fd97 (diff) |
Merge pull request #362 from toasted-nutbread/more-type-refactoring
More type refactoring
Diffstat (limited to 'ext/mixed/js/audio.js')
-rw-r--r-- | ext/mixed/js/audio.js | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/ext/mixed/js/audio.js b/ext/mixed/js/audio.js index 47db5c75..fe5982dd 100644 --- a/ext/mixed/js/audio.js +++ b/ext/mixed/js/audio.js @@ -72,19 +72,15 @@ class TextToSpeechAudio { const m = /^tts:[^#?]*\?([^#]*)/.exec(ttsUri); if (m === null) { return null; } - const searchParameters = {}; - for (const group of m[1].split('&')) { - const sep = group.indexOf('='); - if (sep < 0) { continue; } - searchParameters[decodeURIComponent(group.substring(0, sep))] = decodeURIComponent(group.substring(sep + 1)); - } - - if (!searchParameters.text) { return null; } + const searchParameters = new URLSearchParams(m[1]); + const text = searchParameters.get('text'); + let voice = searchParameters.get('voice'); + if (text === null || voice === null) { return null; } - const voice = audioGetTextToSpeechVoice(searchParameters.voice); + voice = audioGetTextToSpeechVoice(voice); if (voice === null) { return null; } - return new TextToSpeechAudio(searchParameters.text, voice); + return new TextToSpeechAudio(text, voice); } } |