Merge remote-tracking branch 'origin/develop' into release

3 files changed, 19 insertions, 1 deletions

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;
     }
   });
 };
diff --git a/src/electron/ipc-api/focusState.js b/src/electron/ipc-api/focusState.js
new file mode 100644
index 000000000..0b4a0d8f3
--- /dev/null
+++ b/src/electron/ipc-api/focusState.js
@@ -0,0 +1,9 @@
+export default (params) => {
+  params.mainWindow.on('focus', () => {
+    params.mainWindow.webContents.send('isWindowFocused', true);
+  });
+
+  params.mainWindow.on('blur', () => {
+    params.mainWindow.webContents.send('isWindowFocused', false);
+  });
+};
diff --git a/src/electron/ipc-api/index.js b/src/electron/ipc-api/index.js
index 999ac7d2d..5da1edc39 100644
--- a/src/electron/ipc-api/index.js
+++ b/src/electron/ipc-api/index.js
@@ -5,6 +5,7 @@ import download from './download';
 import localServer from './localServer';
 import cld from './cld';
 import dnd from './dnd';
+import focusState from './focusState';
 
 export default (params) => {
   settings(params);
@@ -14,4 +15,5 @@ export default (params) => {
   localServer(params);
   cld(params);
   dnd();
+  focusState(params);
 };