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

main
Bob Mottram 2021-03-15 20:49:10 +00:00
commit 1e827d61e9
2 changed files with 5 additions and 2 deletions

View File

@ -486,7 +486,8 @@ def _showLocalBox(notifyJson: {}, boxName: str,
if len(notifyJson['followRequestsList']) > 0: if len(notifyJson['followRequestsList']) > 0:
print('') print('')
sayStr = indent + 'You have a follow request from ' + \ sayStr = indent + 'You have a follow request from ' + \
'\33[7m' + notifyJson['followRequestsList'][0] + '\33[0m' '\33[7m' + \
notifyJson['followRequestsList'][0].strip() + '\33[0m'
_sayCommand(sayStr, sayStr, screenreader, systemLanguage, _sayCommand(sayStr, sayStr, screenreader, systemLanguage,
espeak) espeak)
sayStr = indent + 'Use the \33[3maccept\33[0m or ' + \ sayStr = indent + 'Use the \33[3maccept\33[0m or ' + \

View File

@ -502,7 +502,9 @@ def _postToSpeakerJson(baseDir: str, httpPrefix: str,
follows = fp.readlines() follows = fp.readlines()
if len(follows) > 0: if len(follows) > 0:
followRequestsExist = True followRequestsExist = True
followRequestsList = follows.split('\n') for i in range(len(follows)):
follows[i] = follows[i].strip()
followRequestsList = follows
postDM = False postDM = False
dmFilename = accountsDir + '/.newDM' dmFilename = accountsDir + '/.newDM'
if os.path.isfile(dmFilename): if os.path.isfile(dmFilename):