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

main
Bob Mottram 2021-03-16 17:53:33 +00:00
commit fd4949d9f6
1 changed files with 12 additions and 9 deletions

View File

@ -507,7 +507,7 @@ def _showLocalBox(notifyJson: {}, boxName: str,
' to ' + str(startPostIndex + ctr) + '. '
if newDMs and boxName != 'dm':
sayStr += \
'Use \33[3mshow dm\33[0m to view DM posts.'
'Use \33[3mshow dm\33[0m to view direct messages.'
elif newReplies and boxName != 'replies':
sayStr += \
'Use \33[3mshow replies\33[0m to view reply posts.'
@ -794,6 +794,7 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
newRepliesExist = False
newDMsExist = False
currPostId = ''
firstTime = True
while (1):
session = createSession(proxyType)
notifyJson = None
@ -815,15 +816,17 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
if not os.path.isdir(soundsDir):
soundsDir = 'theme/default/sounds'
# If new DM has not been viewed via web interface
if not speakerJson.get('direct'):
if speakerJson['notify']['dm']:
speakerJson['direct'] = True
if firstTime:
# If new DM has not been viewed via web interface
if not speakerJson.get('direct'):
if speakerJson['notify']['dm']:
speakerJson['direct'] = True
# If new reply has not been viewed via web interface
if not speakerJson.get('replyToYou'):
if speakerJson['notify']['reply']:
speakerJson['replyToYou'] = True
# If new reply has not been viewed via web interface
if not speakerJson.get('replyToYou'):
if speakerJson['notify']['reply']:
speakerJson['replyToYou'] = True
firstTime = False
if speakerJson.get('direct'):
if speakerJson['direct'] is True: