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 18:13:01 +00:00
parent a0fa6c6899 87d4b02f6b
commit 25393a7c6f
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
notifications_client.py
View File

@ -369,7 +369,8 @@ def _readLocalBoxPost(boxName: str, index: int,
content = speakerJson['content']
sayStr = 'Reading ' + boxName + ' post ' + str(index) + '.'
_sayCommand(sayStr, sayStr, screenreader, systemLanguage, espeak)
sayStr2 = sayStr.replace(' dm ', ' DM ')
_sayCommand(sayStr, sayStr2, screenreader, systemLanguage, espeak)
if speakerJson.get('id') and isPGPEncrypted(content):
sayStr = 'Encrypted message. Please enter your passphrase.'
@ -820,37 +821,37 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
if not os.path.isdir(soundsDir):
soundsDir = 'theme/default/sounds'
indicatorDM = speakerJson.get('direct')
indicatorReplies = speakerJson.get('replyToYou')
if firstTime:
# If new DM has not been viewed via web interface
if not speakerJson.get('direct'):
if speakerJson['notify']['dm']:
speakerJson['direct'] = True
indicatorDM = True
# If new reply has not been viewed via web interface
if not speakerJson.get('replyToYou'):
if speakerJson['notify']['reply']:
speakerJson['replyToYou'] = True
indicatorReplies = True
firstTime = False
if speakerJson.get('direct'):
if speakerJson['direct'] is True:
if currPostId != speakerJson['id']:
if notificationSounds:
_playNotificationSound(soundsDir + '/' +
dmSoundFilename, player)
_desktopNotification(notificationType, title,
'New direct message ' +
actor + '/dm')
elif speakerJson['notify'].get('replyToYou'):
if speakerJson['notify']['replyToYou'] is True:
if currPostId != speakerJson['id']:
if notificationSounds:
_playNotificationSound(soundsDir + '/' +
replySoundFilename,
player)
_desktopNotification(notificationType, title,
'New reply ' +
actor + '/tlreplies')
if indicatorDM:
if currPostId != speakerJson['id']:
if notificationSounds:
_playNotificationSound(soundsDir + '/' +
dmSoundFilename, player)
_desktopNotification(notificationType, title,
'New direct message ' +
actor + '/dm')
elif indicatorReplies:
if currPostId != speakerJson['id']:
if notificationSounds:
_playNotificationSound(soundsDir + '/' +
replySoundFilename,
player)
_desktopNotification(notificationType, title,
'New reply ' +
actor + '/tlreplies')
elif speakerJson['notify']['calendar'] != prevCalendar:
if speakerJson['notify']['calendar'] is True:
if notificationSounds: