From 0848eb8ddf6cfd32f6e96aac0ff592ad978c13bd Mon Sep 17 00:00:00 2001
From: Markus Hatvan <markus_hatvan@aon.at>
Date: Thu, 28 Oct 2021 19:28:42 +0200
Subject: build: use node 16 and npm 8 (#2157)

- change node version from 14.18.1 to 16.13.0
- change npm version from 6.14.13 to 8.1.0
- update package-lock.json to lockfileVersion 2
- use @sindresorhus/do-not-disturb instead of macos-notification-state to avoid failing CI
- run ferdi build on latest macos and windows
- skip husky in CI builds
- move 'cld' and 'node-mac-permissions' to optionalDependency

Co-authored-by: Vijay A <vraravam@users.noreply.github.com>
---
 src/electron/ipc-api/cld.ts | 4 ++++
 src/electron/ipc-api/dnd.ts | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/electron/ipc-api')

diff --git a/src/electron/ipc-api/cld.ts b/src/electron/ipc-api/cld.ts
index 4221f9b22..5e958b102 100644
--- a/src/electron/ipc-api/cld.ts
+++ b/src/electron/ipc-api/cld.ts
@@ -5,6 +5,9 @@ const debug = require('debug')('Ferdi:ipcApi:cld');
 
 export default async () => {
   ipcMain.handle('detect-language', async (_event, { sample }) => {
+    if (!cld) {
+      return null;
+    }
     try {
       const result = await cld.detect(sample);
       debug('Checking language', 'probability', result.languages);
@@ -18,6 +21,7 @@ export default async () => {
       }
     } catch (error) {
       console.error(error);
+      return null;
     }
   });
 };
diff --git a/src/electron/ipc-api/dnd.ts b/src/electron/ipc-api/dnd.ts
index afaef9a66..d8958d9b0 100644
--- a/src/electron/ipc-api/dnd.ts
+++ b/src/electron/ipc-api/dnd.ts
@@ -1,5 +1,5 @@
 import { ipcMain } from 'electron';
-import { getDoNotDisturb } from 'macos-notification-state';
+import doNotDisturb from '@sindresorhus/do-not-disturb';
 import { isMac } from '../../environment';
 
 const debug = require('debug')('Ferdi:ipcApi:dnd');
@@ -7,12 +7,11 @@ 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();
+      const isDND = await doNotDisturb.isEnabled();
       debug('Fetching DND state, set to', isDND);
       return isDND;
     } catch (error) {
-- 
cgit v1.2.3-54-g00ecf