mirror of https://gitlab.com/bashrc2/epicyon
Desktop notification sounds are optional
parent
595bb807ce
commit
fe180abb84
|
|
@ -310,6 +310,9 @@ parser.add_argument("--positivevoting", type=str2bool, nargs='?',
|
|||
parser.add_argument("--debug", type=str2bool, nargs='?',
|
||||
const=True, default=False,
|
||||
help="Show debug messages")
|
||||
parser.add_argument("--notificationSounds", type=str2bool, nargs='?',
|
||||
const=True, default=True,
|
||||
help="Play notification sounds")
|
||||
parser.add_argument("--authenticatedFetch", type=str2bool, nargs='?',
|
||||
const=True, default=False,
|
||||
help="Enable authentication on GET requests" +
|
||||
|
|
@ -1932,7 +1935,7 @@ if args.notifications:
|
|||
runNotificationsClient(baseDir, proxyType, httpPrefix,
|
||||
nickname, domain, port, args.password,
|
||||
args.screenreader, args.language,
|
||||
args.debug)
|
||||
args.notificationSounds, args.debug)
|
||||
sys.exit()
|
||||
|
||||
if federationList:
|
||||
|
|
|
|||
|
|
@ -101,7 +101,9 @@ def _desktopNotification(notificationType: str,
|
|||
def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
|
||||
nickname: str, domain: str, port: int,
|
||||
password: str, screenreader: str,
|
||||
systemLanguage: str, debug: bool) -> None:
|
||||
systemLanguage: str,
|
||||
notificationSounds: bool,
|
||||
debug: bool) -> None:
|
||||
"""Runs the notifications and screen reader client,
|
||||
which announces new inbox items
|
||||
"""
|
||||
|
|
@ -116,6 +118,10 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
|
|||
print('Running ' + screenreader + ' for ' + nickname + '@' + domain)
|
||||
else:
|
||||
print('Running desktop notifications for ' + nickname + '@' + domain)
|
||||
if notificationSounds:
|
||||
print('Notification sounds ON')
|
||||
else:
|
||||
print('Notification sounds OFF')
|
||||
print('/q or /quit to exit')
|
||||
|
||||
domainFull = getFullDomain(domain, port)
|
||||
|
|
@ -155,47 +161,57 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
|
|||
soundsDir = 'theme/default/sounds'
|
||||
if speakerJson['notify']['dm'] != prevDM:
|
||||
if speakerJson['notify']['dm'] is True:
|
||||
_playNotificationSound(soundsDir + '/' +
|
||||
dmSoundFilename, player)
|
||||
if notificationSounds:
|
||||
_playNotificationSound(soundsDir + '/' +
|
||||
dmSoundFilename, player)
|
||||
_desktopNotification(notificationType, title,
|
||||
'New direct message ' +
|
||||
actor + '/dm')
|
||||
prevDM = speakerJson['notify']['dm']
|
||||
elif speakerJson['notify']['reply'] != prevReply:
|
||||
if speakerJson['notify']['reply'] is True:
|
||||
_playNotificationSound(soundsDir + '/' +
|
||||
replySoundFilename, player)
|
||||
if notificationSounds:
|
||||
_playNotificationSound(soundsDir + '/' +
|
||||
replySoundFilename,
|
||||
player)
|
||||
_desktopNotification(notificationType, title,
|
||||
'New reply ' +
|
||||
actor + '/tlreplies')
|
||||
prevReply = speakerJson['notify']['reply']
|
||||
elif speakerJson['notify']['calendar'] != prevCalendar:
|
||||
if speakerJson['notify']['calendar'] is True:
|
||||
_playNotificationSound(soundsDir + '/' +
|
||||
calendarSoundFilename, player)
|
||||
if notificationSounds:
|
||||
_playNotificationSound(soundsDir + '/' +
|
||||
calendarSoundFilename,
|
||||
player)
|
||||
_desktopNotification(notificationType, title,
|
||||
'New calendar event ' +
|
||||
actor + '/calendar')
|
||||
prevCalendar = speakerJson['notify']['calendar']
|
||||
elif speakerJson['notify']['followRequests'] != prevFollow:
|
||||
if speakerJson['notify']['followRequests'] is True:
|
||||
_playNotificationSound(soundsDir + '/' +
|
||||
followSoundFilename, player)
|
||||
if notificationSounds:
|
||||
_playNotificationSound(soundsDir + '/' +
|
||||
followSoundFilename,
|
||||
player)
|
||||
_desktopNotification(notificationType, title,
|
||||
'New follow request ' +
|
||||
actor + '/followers#buttonheader')
|
||||
prevFollow = speakerJson['notify']['followRequests']
|
||||
elif speakerJson['notify']['likedBy'] != prevLike:
|
||||
_playNotificationSound(soundsDir + '/' +
|
||||
likeSoundFilename, player)
|
||||
if notificationSounds:
|
||||
_playNotificationSound(soundsDir + '/' +
|
||||
likeSoundFilename, player)
|
||||
_desktopNotification(notificationType, title,
|
||||
'New like ' +
|
||||
speakerJson['notify']['likedBy'])
|
||||
prevLike = speakerJson['notify']['likedBy']
|
||||
elif speakerJson['notify']['share'] != prevShare:
|
||||
if speakerJson['notify']['share'] is True:
|
||||
_playNotificationSound(soundsDir + '/' +
|
||||
shareSoundFilename, player)
|
||||
if notificationSounds:
|
||||
_playNotificationSound(soundsDir + '/' +
|
||||
shareSoundFilename,
|
||||
player)
|
||||
_desktopNotification(notificationType, title,
|
||||
'New shared item ' +
|
||||
actor + '/shares')
|
||||
|
|
@ -257,3 +273,9 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
|
|||
keyPress = keyPress[1:]
|
||||
if keyPress == 'q' or keyPress == 'quit' or keyPress == 'exit':
|
||||
break
|
||||
elif keyPress == 'sounds on' or keyPress == 'sound':
|
||||
print('Notification sounds ON')
|
||||
notificationSounds = True
|
||||
elif keyPress == 'sounds off' or keyPress == 'nosound':
|
||||
print('Notification sounds OFF')
|
||||
notificationSounds = False
|
||||
|
|
|
|||
Loading…
Reference in New Issue