Don't deliver local notifications when user status is DND

Signed-off-by: Marcel Müller <[email protected]>
nextcloud · Oct 31, 2022 · 22431b4 · 22431b4
1 parent 541be93
commit 22431b4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/NextcloudTalk/NCAPIController.h b/NextcloudTalk/NCAPIController.h
@@ -96,7 +96,7 @@ typedef void (^SetUserStatusCompletionBlock)(NSError *error);
 
 typedef void (^GetServerCapabilitiesCompletionBlock)(NSDictionary *serverCapabilities, NSError *error);
 typedef void (^GetServerNotificationCompletionBlock)(NSDictionary *notification, NSError *error, NSInteger statusCode);
-typedef void (^GetServerNotificationsCompletionBlock)(NSArray *notifications, NSString *ETag, NSError *error);
+typedef void (^GetServerNotificationsCompletionBlock)(NSArray *notifications, NSString *ETag, NSString *userStatus, NSError *error);
 
 typedef void (^SubscribeToNextcloudServerCompletionBlock)(NSDictionary *responseDict, NSError *error);
 typedef void (^UnsubscribeToNextcloudServerCompletionBlock)(NSError *error);

diff --git a/NextcloudTalk/NCAPIController.m b/NextcloudTalk/NCAPIController.m
@@ -2417,11 +2417,11 @@ - (NSURLSessionDataTask *)getServerNotificationsForAccount:(TalkAccount *)accoun
             NSDictionary *headers = [self getResponseHeaders:response];
 
             if (block) {
-                block(notifications, [headers objectForKey:@"ETag"], nil);
+                block(notifications, [headers objectForKey:@"ETag"], [headers objectForKey:@"x-nextcloud-user-status"], nil);
             }
         } else {
             if (block) {
-                block(nil, nil, error);
+                block(nil, nil, nil, error);
             }
         }
     }];

diff --git a/NextcloudTalk/NCNotificationController.m b/NextcloudTalk/NCNotificationController.m
@@ -32,6 +32,7 @@
 #import "NCRoomsManager.h"
 #import "NCSettingsController.h"
 #import "NCUserInterfaceController.h"
+#import "NCUserStatus.h"
 
 NSString * const NCNotificationControllerWillPresentNotification    = @"NCNotificationControllerWillPresentNotification";
 NSString * const NCLocalNotificationJoinChatNotification            = @"NCLocalNotificationJoinChatNotification";
@@ -295,12 +296,15 @@ - (void)checkForNewNotificationsWithCompletionBlock:(CheckForNewNotificationsCom
 
         dispatch_group_enter(notificationsGroup);
 
-        [[NCAPIController sharedInstance] getServerNotificationsForAccount:account withLastETag:account.lastNotificationETag withCompletionBlock:^(NSArray *notifications, NSString* ETag, NSError *error) {
+        [[NCAPIController sharedInstance] getServerNotificationsForAccount:account withLastETag:account.lastNotificationETag withCompletionBlock:^(NSArray *notifications, NSString* ETag, NSString *userStatus, NSError *error) {
             if (error) {
                 dispatch_group_leave(notificationsGroup);
                 return;
             }
 
+            // Don't show notifications if the user has status "do not disturb"
+            BOOL suppressNotifications = (serverCapabilities.userStatus && [userStatus isEqualToString:kUserStatusDND]);
+
             NSInteger lastNotificationId = 0;
             NSMutableArray *activeServerNotificationsIds = [NSMutableArray new];
 
@@ -318,7 +322,11 @@ - (void)checkForNewNotificationsWithCompletionBlock:(CheckForNewNotificationsCom
                     lastNotificationId = serverNotification.notificationId;
                 }
 
-                if (account.lastNotificationId != 0 && serverNotification.notificationId > account.lastNotificationId && serverNotification.notificationType != kNCNotificationTypeChat) {
+                if (suppressNotifications || serverNotification.notificationType != kNCNotificationTypeChat) {
+                    continue;
+                }
+
+                if (account.lastNotificationId != 0 && serverNotification.notificationId > account.lastNotificationId) {
                     // Don't show notifications if this is the first time we retrieve notifications for this account
                     // Otherwise after adding a new account all unread notifications from the server would be shown