7 files changed, 42 insertions, 11 deletions

diff --git a/src/webview/contextMenu.js b/src/webview/contextMenu.js
index d3b976554..acd62d675 100644
--- a/src/webview/contextMenu.js
+++ b/src/webview/contextMenu.js
@@ -8,7 +8,7 @@ import {
 import { isDevMode, isMac } from '../environment';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 
-const debug = require('debug')('Franz:contextMenu');
+const debug = require('debug')('Ferdi:contextMenu');
 
 const { Menu } = remote;
 
diff --git a/src/webview/darkmode.js b/src/webview/darkmode.js
index 73c7007c6..ab629435c 100644
--- a/src/webview/darkmode.js
+++ b/src/webview/darkmode.js
@@ -3,7 +3,7 @@
 import path from 'path';
 import fs from 'fs-extra';
 
-const debug = require('debug')('Franz:DarkMode');
+const debug = require('debug')('Ferdi:DarkMode');
 
 const chars = [...'abcdefghijklmnopqrstuvwxyz'];
 
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/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js
index be29142af..877e45e35 100644
--- a/src/webview/lib/RecipeWebview.js
+++ b/src/webview/lib/RecipeWebview.js
@@ -39,9 +39,15 @@ class RecipeWebview {
     if (this.countCache.direct === direct
       && this.countCache.indirect === indirect) return;
 
+    // Parse number to integer
+    // This will correct errors that recipes may introduce, e.g.
+    // by sending a String instead of an integer
+    const directInt = parseInt(direct, 10);
+    const indirectInt = parseInt(indirect, 10);
+
     const count = {
-      direct: direct > 0 ? direct : 0,
-      indirect: indirect > 0 ? indirect : 0,
+      direct: directInt > 0 ? directInt : 0,
+      indirect: indirectInt > 0 ? indirectInt : 0,
     };
 
     ipcRenderer.sendToHost('messages', count);
diff --git a/src/webview/notifications.js b/src/webview/notifications.js
index f8fe53e1b..021f05cc3 100644
--- a/src/webview/notifications.js
+++ b/src/webview/notifications.js
@@ -1,7 +1,7 @@
 import { ipcRenderer } from 'electron';
 import uuidV1 from 'uuid/v1';
 
-const debug = require('debug')('Franz:Notifications');
+const debug = require('debug')('Ferdi:Notifications');
 
 class Notification {
   static permission = 'granted';
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index e3e13b726..3f2338b68 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -1,8 +1,15 @@
 import { ipcRenderer } from 'electron';
 import path from 'path';
 import { autorun, computed, observable } from 'mobx';
+import fs from 'fs-extra';
 import { loadModule } from 'cld3-asm';
 import { debounce } from 'lodash';
+import {
+  enable as enableDarkMode,
+  disable as disableDarkMode,
+} from 'darkreader';
+
+import ignoreList from './darkmode/ignore';
 
 import RecipeWebview from './lib/RecipeWebview';
 
@@ -14,7 +21,7 @@ import './notifications';
 import { DEFAULT_APP_SETTINGS } from '../config';
 import { isDevMode } from '../environment';
 
-const debug = require('debug')('Franz:Plugin');
+const debug = require('debug')('Ferdi:Plugin');
 
 class RecipeController {
   @observable settings = {
@@ -110,12 +117,27 @@ class RecipeController {
       }
     }
 
-    if (this.settings.service.isDarkModeEnabled) {
+    if (this.settings.service.isDarkModeEnabled || this.settings.app.darkMode) {
       debug('Enable dark mode');
-      injectDarkModeStyle(this.settings.service.recipe.path);
-    } else if (isDarkModeStyleInjected()) {
+
+      // Check if recipe has a darkmode.css
+      const darkModeStyle = path.join(this.settings.service.recipe.path, 'darkmode.css');
+      const darkModeExists = fs.pathExistsSync(darkModeStyle);
+
+      if (darkModeExists) {
+        injectDarkModeStyle(this.settings.service.recipe.path);
+      } else if (!ignoreList.includes(window.location.host)) {
+        // Use darkreader instead
+        enableDarkMode();
+      }
+    } else {
       debug('Remove dark mode');
-      removeDarkModeStyle();
+
+      if (isDarkModeStyleInjected()) {
+        removeDarkModeStyle();
+      } else {
+        disableDarkMode();
+      }
     }
   }
 
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index 06cbd283a..27380676d 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -6,7 +6,7 @@ import { readFileSync } from 'fs';
 import { DICTIONARY_PATH } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 
-const debug = require('debug')('Franz:spellchecker');
+const debug = require('debug')('Ferdi:spellchecker');
 
 let provider;
 let currentDict;