Merge branch 'master' into feat/macos-signing

# Conflicts:
#	gulpfile.babel.js

5 files changed, 35 insertions, 4 deletions

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 919ddca9f..142eb7b02 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -180,7 +180,7 @@ export function dictionaries(done) {
   });
 
   _shell(
-    `npm install --prefix ${path.join(__dirname, 'temp')} ${packages}`,
+    `npm install --prefix "${path.join(__dirname, 'temp')}" ${packages}`,
     () => {
       moveSync(
         path.join(__dirname, 'temp', 'node_modules'),
diff --git a/package-lock.json b/package-lock.json
index 4c70068cb..c4f36099b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ferdi",
-  "version": "5.3.4-beta.1",
+  "version": "5.3.4-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a3199a5cc..5fb2da096 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "ferdi",
   "productName": "Ferdi",
   "appId": "com.kytwb.ferdi",
-  "version": "5.3.4-beta.1",
+  "version": "5.3.4-beta.2",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "kytwb",
   "main": "index.js",
diff --git a/src/webview/darkmode/ignore.js b/src/webview/darkmode/ignore.js
new file mode 100644
index 000000000..110df364f
--- /dev/null
+++ b/src/webview/darkmode/ignore.js
@@ -0,0 +1,3 @@
+export default [
+  'discordapp.com',
+];
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index fca00fde2..b30199f03 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -9,6 +9,8 @@ import {
   disable as disableDarkMode,
 } from 'darkreader';
 
+import ignoreList from './darkmode/ignore';
+
 import RecipeWebview from './lib/RecipeWebview';
 
 import spellchecker, { switchDict, disable as disableSpellchecker, getSpellcheckerLocaleByFuzzyIdentifier } from './spellchecker';
@@ -123,7 +125,7 @@ class RecipeController {
 
       if (darkModeExists) {
         injectDarkModeStyle(this.settings.service.recipe.path);
-      } else {
+      } else if (!ignoreList.includes(window.location.host)) {
         // Use darkreader instead
         enableDarkMode();
       }
@@ -194,6 +196,32 @@ new RecipeController();
 const originalWindowOpen = window.open;
 
 window.open = (url, frameName, features) => {
+  if (!url && !frameName && !features) {
+    // The service hasn't yet supplied a URL (as used in Skype).
+    // Return a new dummy window object and wait for the service to change the properties
+    const newWindow = {
+      location: {
+        href: '',
+      },
+    };
+
+    const checkInterval = setInterval(() => {
+      // Has the service changed the URL yet?
+      if (newWindow.location.href !== '') {
+        // Open the new URL
+        window.open(newWindow.location.href);
+        clearInterval(checkInterval);
+      }
+    }, 0);
+
+    setTimeout(() => {
+      // Stop checking for location changes after 1 second
+      clearInterval(checkInterval);
+    }, 1000);
+
+    return newWindow;
+  }
+
   // We need to differentiate if the link should be opened in a popup or in the systems default browser
   if (!frameName && !features) {
     return ipcRenderer.sendToHost('new-window', url);