From 9f2277735764c07929e4b9e6fa5a11ae916bb2c6 Mon Sep 17 00:00:00 2001
From: Vijay A <avijayr@protonmail.com>
Date: Fri, 13 Aug 2021 08:05:12 +0530
Subject: chore: Replace old '@meetfranz/electron-notification-state' with
 'macos-notification-state'

---
 package-lock.json           | 31 ++-----------------------------
 package.json                |  2 +-
 src/electron/ipc-api/dnd.js |  9 ++++++++-
 3 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e04d61d4f..333a26af1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5697,16 +5697,6 @@
       "resolved": "https://registry.npmjs.org/@mdi/react/-/react-1.5.0.tgz",
       "integrity": "sha512-NztRgUxSYD+ImaKN94Tg66VVVqXj4SmlDGzZoz48H9riJ+Awha56sfXH2fegw819NWo7KI3oeS1Es0lNQqwr0w=="
     },
-    "@meetfranz/electron-notification-state": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@meetfranz/electron-notification-state/-/electron-notification-state-1.0.0.tgz",
-      "integrity": "sha512-0gCEV7DfoasuMA9uY9sN1ufrzSFg/fXB0gHbxagid8EilAjGsbkSSLSl2rweZcIBz+ZgR35Yp7DlAVw/I3cIfA==",
-      "requires": {
-        "macos-notification-state": "^1.1.0",
-        "windows-notification-state": "^1.3.0",
-        "windows-quiet-hours": "^1.2.2"
-      }
-    },
     "@meetfranz/forms": {
       "version": "file:packages/forms",
       "requires": {
@@ -22356,7 +22346,8 @@
     "nan": {
       "version": "2.15.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
-      "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="
+      "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
+      "optional": true
     },
     "nanoid": {
       "version": "3.1.23",
@@ -30578,24 +30569,6 @@
         }
       }
     },
-    "windows-notification-state": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/windows-notification-state/-/windows-notification-state-1.3.4.tgz",
-      "integrity": "sha512-Z2n6YLARi14AGqaY5zAlMnhButzjRjlQui0k73nXe4tVRg2U918zLeC3ZxM/i4JKho/GqV85rgQsMfLWnbTUCA==",
-      "requires": {
-        "bindings": "^1.5.0",
-        "nan": "^2.14.0"
-      }
-    },
-    "windows-quiet-hours": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/windows-quiet-hours/-/windows-quiet-hours-1.2.7.tgz",
-      "integrity": "sha512-PjKM2/RQhZ3ikG4COq0vPpXvmJsxckcg2YN3xmQv8kZl5l1uu00a/epSGDeY6tczDPkzBhoThBz1FKRqxBA7cQ==",
-      "requires": {
-        "bindings": "^1.3.0",
-        "nan": "^2.7.0"
-      }
-    },
     "windows-release": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
diff --git a/package.json b/package.json
index ca86526f2..19994894e 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,6 @@
     "@electron/remote": "1.2.1",
     "@mdi/font": "5.9.55",
     "@mdi/js": "4.6.95",
-    "@meetfranz/electron-notification-state": "1.0.0",
     "@meetfranz/forms": "file:packages/forms",
     "@meetfranz/theme": "file:packages/theme",
     "@meetfranz/ui": "file:packages/ui",
@@ -96,6 +95,7 @@
     "jsonwebtoken": "8.5.1",
     "jss": "10.7.1",
     "lodash": "4.17.21",
+    "macos-notification-state": "1.3.5",
     "macos-version": "5.2.1",
     "marked": "0.7.0",
     "mime-types": "2.1.32",
diff --git a/src/electron/ipc-api/dnd.js b/src/electron/ipc-api/dnd.js
index da4d7781e..6fb8999a3 100644
--- a/src/electron/ipc-api/dnd.js
+++ b/src/electron/ipc-api/dnd.js
@@ -1,16 +1,23 @@
 import { ipcMain } from 'electron';
-import { getDoNotDisturb } from '@meetfranz/electron-notification-state';
+import { getDoNotDisturb } from 'macos-notification-state';
+import { isMac } from '../../environment';
 
 const debug = require('debug')('Ferdi:ipcApi:dnd');
 
 export default async () => {
   ipcMain.handle('get-dnd', async () => {
+    if (!isMac) {
+      debug('Not on macOS, returning', false);
+      return false;
+    }
+
     try {
       const isDND = getDoNotDisturb();
       debug('Fetching DND state, set to', isDND);
       return isDND;
     } catch (e) {
       console.error(e);
+      return false;
     }
   });
 };
-- 
cgit v1.2.3-54-g00ecf