Merge pull request #1540 from hovancik/fix/dnd-mac

Improve macOS DND detection

Author: hovancik

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 ### Fixed
 - Linux DND detection
+- improve macOS DND detection
 - debug info when from Windows Store
 
 ## [1.17.1] - 2024-12-25

app/utils/dndManager.js

@@ -15,7 +15,7 @@ class DndManager extends EventEmitter {
       this.windowsFocusAssist = require('windows-focus-assist')
       this.windowsQuietHours = require('windows-quiet-hours')
     } else if (process.platform === 'darwin') {
-      this.macosNotificationState = require('macos-notification-state')
+      this.util = require('node:util')
     } else if (process.platform === 'linux') {
       this.bus = require('dbus-final').sessionBus()
       this.util = require('node:util')
@@ -124,7 +124,13 @@ class DndManager extends EventEmitter {
         const wqh = this.windowsQuietHours.getIsQuietHours()
         return wqh || (wfa !== -1 && wfa !== 0)
       } else if (process.platform === 'darwin') {
-        return this.macosNotificationState.getDoNotDisturb()
+        try {
+          const exec = this.util.promisify(require('node:child_process').exec)
+          const { stdout } = await exec('defaults read com.apple.controlcenter "NSStatusItem Visible FocusModes"')
+          if (stdout.replace(/[^0-9a-zA-Z]/g, '') === '1') {
+            return true
+          }
+        } catch (e) { }
       } else if (process.platform === 'linux') {
         return await this._isDndEnabledLinux()
       }

package-lock.json

@@ -70,8 +70,7 @@
       ],
       "extendInfo": {
         "LSBackgroundOnly": 1,
-        "LSUIElement": 1,
-        "NSFocusStatusUsageDescription": "Stretchly will respect Do Not Disturb mode"
+        "LSUIElement": 1
       }
     },
     "linux": {
@@ -157,7 +156,6 @@
     "i18next": "^23.16.8",
     "i18next-fs-backend": "^2.6.0",
     "luxon": "^3.5.0",
-    "macos-notification-state": "^3.0.0",
     "meeussunmoon": "^3.0.3",
     "ps-list": "7.2",
     "rtl-detect": "^1.1.2",