Add dnd polling - macos only

package.json

@@ -25,6 +25,8 @@
 		"publish-snap": "del dist && tsc && electron-builder --linux && snapcraft push --release=stable dist/*.snap"
 	},
 	"dependencies": {
+		"@sindresorhus/do-not-disturb": "^0.2.0",
+		"@types/event-emitter": "^0.3.3",
 		"@types/is-online": "^8.0.0",
 		"electron-context-menu": "^0.11.0",
 		"electron-debug": "^2.1.0",
@@ -36,9 +38,10 @@
 		"electron-updater": "^4.0.6",
 		"electron-util": "^0.11.0",
 		"element-ready": "^3.0.0",
+		"event-emitter": "^0.3.5",
 		"facebook-locales": "^1.0.591",
-		"lodash": "^4.17.11",
 		"is-online": "^8.0.0",
+		"lodash": "^4.17.11",
 		"p-wait-for": "^2.0.1"
 	},
 	"devDependencies": {

source/do-not-disturb.ts

@@ -0,0 +1,25 @@
+import {is} from 'electron-util';
+import macosDND from '@sindresorhus/do-not-disturb';
+import emitter from './event-emitter';
+
+const pollingInterval = 3000;
+const getDoNotDisturb = async (): Promise<boolean> => (is.macos ? macosDND.isEnabled() : false);
+
+const startPolling = async (): Promise<void> => {
+	let currentValue = await getDoNotDisturb();
+
+	setInterval(async () => {
+		const newValue = await getDoNotDisturb();
+
+		if (newValue !== currentValue) {
+			currentValue = newValue;
+			emitter.emit('dndprefs_changed', newValue);
+		}
+	}, pollingInterval);
+};
+
+if (is.macos) {
+	startPolling();
+}
+
+export {getDoNotDisturb};

source/event-emitter.ts

@@ -0,0 +1,3 @@
+import ee from 'event-emitter';
+
+export default ee();

source/index.ts

@@ -23,14 +23,15 @@ import electronContextMenu from 'electron-context-menu';
 import isDev from 'electron-is-dev';
 import electronDebug from 'electron-debug';
 import {darkMode, is} from 'electron-util';
-import {getDoNotDisturb} from 'electron-notification-state';
 import {bestFacebookLocaleFor} from 'facebook-locales';
 import updateAppMenu from './menu';
 import config from './config';
 import tray from './tray';
 import {sendAction, sendBackgroundAction} from './util';
 import {process as processEmojiUrl} from './emoji';
 import ensureOnline from './ensure-online';
+import {getDoNotDisturb} from './do-not-disturb';
+import emitter from './event-emitter';
 import './touch-bar'; // eslint-disable-line import/no-unassigned-import
 
 ipcMain.setMaxListeners(100);
@@ -101,9 +102,7 @@ async function updateBadge(conversations: Conversation[]): Promise<void> {
 		}
 
 		if (is.macos) {
-			const isDNDEnabled = await getDoNotDisturb();
-
-			if (!isDNDEnabled && config.get('bounceDockOnMessage') && prevMessageCount !== messageCount) {
+			if (config.get('bounceDockOnMessage') && prevMessageCount !== messageCount) {
 				app.dock.bounce('informational');
 				prevMessageCount = messageCount;
 			}
@@ -367,6 +366,16 @@ function createMainWindow(): BrowserWindow {
 			mainWindow.show();
 		}
 
+		if (is.macos) {
+			emitter.on('dndprefs_changed', (doNotDisturb: boolean) => {
+				webContents.send('toggle-sounds', !doNotDisturb);
+				webContents.send(
+					'toggle-mute-notifications',
+					config.get('notificationsMuted') || doNotDisturb
+				);
+			});
+		}
+
 		const isDNDEnabled = await getDoNotDisturb();
 
 		webContents.send('toggle-sounds', !isDNDEnabled);

source/sindresorhus-do-not-disturb.d.ts

@@ -0,0 +1 @@
+declare module '@sindresorhus/do-not-disturb';