From 29e3fcf8d063144f5528000d140ef42ad8c1c4f1 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 16 Mar 2021 16:10:21 +0000
Subject: [PATCH] Change notification detection

---
 notifications_client.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/notifications_client.py b/notifications_client.py
index a55cd3537..259d64b08 100644
--- a/notifications_client.py
+++ b/notifications_client.py
@@ -767,8 +767,6 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
     domainFull = getFullDomain(domain, port)
     actor = httpPrefix + '://' + domainFull + '/users/' + nickname
     prevSay = ''
-    prevDM = False
-    prevReply = False
     prevCalendar = False
     prevFollow = False
     prevLike = ''
@@ -810,17 +808,16 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
                             speakerJson['notify']['theme'] + '/sounds'
                         if not os.path.isdir(soundsDir):
                             soundsDir = 'theme/default/sounds'
-                if speakerJson['notify']['dm'] != prevDM:
-                    if speakerJson['notify']['dm'] is True:
+                if speakerJson['notify'].get('direct'):
+                    if speakerJson['notify']['direct'] is True:
                         if notificationSounds:
                             _playNotificationSound(soundsDir + '/' +
                                                    dmSoundFilename, player)
                         _desktopNotification(notificationType, title,
                                              'New direct message ' +
                                              actor + '/dm')
-                    prevDM = speakerJson['notify']['dm']
-                elif newRepliesExist != prevReply:
-                    if newRepliesExist:
+                elif speakerJson['notify'].get('replyToYou'):
+                    if speakerJson['notify']['replyToYou'] is True:
                         if notificationSounds:
                             _playNotificationSound(soundsDir + '/' +
                                                    replySoundFilename,
@@ -828,7 +825,6 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
                         _desktopNotification(notificationType, title,
                                              'New reply ' +
                                              actor + '/tlreplies')
-                        prevReply = newRepliesExist
                 elif speakerJson['notify']['calendar'] != prevCalendar:
                     if speakerJson['notify']['calendar'] is True:
                         if notificationSounds: