Merge branch 'main' of ssh://code.freedombone.net:2222/bashrc/epicyon into main

main
Bob Mottram 2021-03-16 12:36:03 +00:00
commit 8c82666a50
1 changed files with 11 additions and 1 deletions

View File

@ -336,6 +336,12 @@ def _getSpeakerJsonFromIndex(boxName: str, index: int) -> {}:
return loadJson(speakerJsonFilename) return loadJson(speakerJsonFilename)
def _safeMessage(content: str) -> str:
"""Removes anything potentially unsafe from a string
"""
return content.replace('`', '').replace('$(', '$ (')
def _readLocalBoxPost(boxName: str, index: int, def _readLocalBoxPost(boxName: str, index: int,
systemLanguage: str, systemLanguage: str,
screenreader: str, espeak) -> {}: screenreader: str, espeak) -> {}:
@ -374,6 +380,9 @@ def _readLocalBoxPost(boxName: str, index: int,
_sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak)
return return
_safeMessage(content)
_safeMessage(messageStr)
time.sleep(2) time.sleep(2)
# say the speaker's name # say the speaker's name
@ -438,7 +447,6 @@ def _showLocalBox(notifyJson: {}, boxName: str,
print(indent + titleStr + '\n') print(indent + titleStr + '\n')
if not index: if not index:
print('')
sayStr = indent + 'You have no ' + boxName + ' posts yet.' sayStr = indent + 'You have no ' + boxName + ' posts yet.'
_sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak) _sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak)
print('') print('')
@ -887,6 +895,8 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
time.sleep(2) time.sleep(2)
# speak the post content # speak the post content
_safeMessage(content)
_safeMessage(messageStr)
_sayCommand(content, messageStr, screenreader, _sayCommand(content, messageStr, screenreader,
systemLanguage, espeak, systemLanguage, espeak,
nameStr, gender) nameStr, gender)