Honor “do not disturb” on Windows and macOS #966

app/internal_packages/activity/lib/activity-event-store.jsx

@@ -155,6 +155,7 @@ class ActivityEventStore extends MailspringStore {
       const recipientName = action.recipient
         ? action.recipient.displayName()
         : localized('Someone');
+
       NativeNotifications.displayNotification({
         title: localized(`New %@`, config.verb),
         subtitle: localized(`%@ recently %@ %@`, recipientName, config.predicate, action.title),

app/internal_packages/unread-notifications/lib/main.es6

@@ -149,10 +149,12 @@ export class Notifier {
       },
     });
 
-    if (!this.activeNotifications[thread.id]) {
-      this.activeNotifications[thread.id] = [notification];
-    } else {
-      this.activeNotifications[thread.id].push(notification);
+    if (notification) {
+      if (!this.activeNotifications[thread.id]) {
+        this.activeNotifications[thread.id] = [notification];
+      } else {
+        this.activeNotifications[thread.id].push(notification);
+      }
     }
   }
 
@@ -170,6 +172,16 @@ export class Notifier {
     }
   }
 
+  _playNewMailSound = _.debounce(
+    () => {
+      if (!AppEnv.config.get('core.notifications.sounds')) return;
+      if (NativeNotifications.doNotDisturb()) return;
+      SoundRegistry.playSound('new-mail');
+    },
+    5000,
+    true
+  );
+
   _onNewMessagesReceived(newMessages) {
     if (newMessages.length === 0) {
       return Promise.resolve();
@@ -207,12 +219,7 @@ export class Notifier {
           this.unnotifiedQueue.push({ message: msg, thread: threads[msg.threadId] });
         }
         if (!this.hasScheduledNotify) {
-          if (AppEnv.config.get('core.notifications.sounds')) {
-            this._playNewMailSound =
-              this._playNewMailSound ||
-              _.debounce(() => SoundRegistry.playSound('new-mail'), 5000, true);
-            this._playNewMailSound();
-          }
+          this._playNewMailSound();
           this._notifyMessages();
         }
       }

app/package.json

@@ -73,6 +73,8 @@
     "windows-shortcuts": "emorikawa/windows-shortcuts#b0a0fc7"
   },
   "optionalDependencies": {
-    "node-mac-notifier": "0.0.13"
+    "macos-notification-state": "^1.1.0",
+    "node-mac-notifier": "1.1.0",
+    "windows-quiet-hours": "^1.2.5"
   }
 }

app/src/native-notifications.es6

@@ -1,6 +1,8 @@
 /* eslint global-require: 0 */
+const platform = process.platform;
+
 let MacNotifierNotification = null;
-if (process.platform === 'darwin') {
+if (platform === 'darwin') {
   try {
     MacNotifierNotification = require('node-mac-notifier');
   } catch (err) {
@@ -22,9 +24,24 @@ class NativeNotifications {
       });
     }
   }
+
+  doNotDisturb() {
+    if (platform === 'win32' && require('windows-quiet-hours').getIsQuietHours()) {
+      return true;
+    }
+    if (platform === 'darwin' && require('macos-notification-state').getDoNotDisturb()) {
+      return true;
+    }
+    return false;
+  }
+
   displayNotification({ title, subtitle, body, tag, canReply, onActivate = () => {} } = {}) {
     let notif = null;
 
+    if (this.doNotDisturb()) {
+      return null;
+    }
+
     if (MacNotifierNotification) {
       if (tag && this._macNotificationsByTag[tag]) {
         this._macNotificationsByTag[tag].close();