indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

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

main
Bob Mottram 2021-03-16 17:53:33 +00:00
parent af41af8313 00596540af
commit fd4949d9f6
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
notifications_client.py
View File

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