aboutsummaryrefslogtreecommitdiffstats
path: root/src/electron
diff options
context:
space:
mode:
authorLibravatar Markus Hatvan <markus_hatvan@aon.at>2021-10-28 19:28:42 +0200
committerLibravatar GitHub <noreply@github.com>2021-10-28 22:58:42 +0530
commit0848eb8ddf6cfd32f6e96aac0ff592ad978c13bd (patch)
tree1418ee325d431d10e4f969f90a75e23f58b7ad6c /src/electron
parentNew translations en-US.json (French) (#2155) (diff)
downloadferdium-app-0848eb8ddf6cfd32f6e96aac0ff592ad978c13bd.tar.gz
ferdium-app-0848eb8ddf6cfd32f6e96aac0ff592ad978c13bd.tar.zst
ferdium-app-0848eb8ddf6cfd32f6e96aac0ff592ad978c13bd.zip
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>
Diffstat (limited to 'src/electron')
-rw-r--r--src/electron/ipc-api/cld.ts4
-rw-r--r--src/electron/ipc-api/dnd.ts5
2 files changed, 6 insertions, 3 deletions
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');
5 5
6export default async () => { 6export default async () => {
7 ipcMain.handle('detect-language', async (_event, { sample }) => { 7 ipcMain.handle('detect-language', async (_event, { sample }) => {
8 if (!cld) {
9 return null;
10 }
8 try { 11 try {
9 const result = await cld.detect(sample); 12 const result = await cld.detect(sample);
10 debug('Checking language', 'probability', result.languages); 13 debug('Checking language', 'probability', result.languages);
@@ -18,6 +21,7 @@ export default async () => {
18 } 21 }
19 } catch (error) { 22 } catch (error) {
20 console.error(error); 23 console.error(error);
24 return null;
21 } 25 }
22 }); 26 });
23}; 27};
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 @@
1import { ipcMain } from 'electron'; 1import { ipcMain } from 'electron';
2import { getDoNotDisturb } from 'macos-notification-state'; 2import doNotDisturb from '@sindresorhus/do-not-disturb';
3import { isMac } from '../../environment'; 3import { isMac } from '../../environment';
4 4
5const debug = require('debug')('Ferdi:ipcApi:dnd'); 5const debug = require('debug')('Ferdi:ipcApi:dnd');
@@ -7,12 +7,11 @@ const debug = require('debug')('Ferdi:ipcApi:dnd');
7export default async () => { 7export default async () => {
8 ipcMain.handle('get-dnd', async () => { 8 ipcMain.handle('get-dnd', async () => {
9 if (!isMac) { 9 if (!isMac) {
10 debug('Not on macOS, returning', false);
11 return false; 10 return false;
12 } 11 }
13 12
14 try { 13 try {
15 const isDND = getDoNotDisturb(); 14 const isDND = await doNotDisturb.isEnabled();
16 debug('Fetching DND state, set to', isDND); 15 debug('Fetching DND state, set to', isDND);
17 return isDND; 16 return isDND;
18 } catch (error) { 17 } catch (error) {