Merge branch 'develop'v5.5.0-gm

1 files changed, 12 insertions, 3 deletions

diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index bad5a93b2..8125ec064 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -21,6 +21,7 @@ import ignoreList from './darkmode/ignore';
 import customDarkModeCss from './darkmode/custom';
 
 import RecipeWebview from './lib/RecipeWebview';
+import Userscript from './lib/Userscript';
 
 import spellchecker, { switchDict, disable as disableSpellchecker, getSpellcheckerLocaleByFuzzyIdentifier } from './spellchecker';
 import { injectDarkModeStyle, isDarkModeStyleInjected, removeDarkModeStyle } from './darkmode';
@@ -55,6 +56,8 @@ class RecipeController {
 
   recipe = null;
 
+  userscript = null;
+
   hasUpdatedBeforeRecipeLoaded = false;
 
   constructor() {
@@ -130,7 +133,8 @@ class RecipeController {
         const userJsModule = require(userJs);
 
         if (typeof userJsModule === 'function') {
-          userJsModule(config);
+          this.userscript = new Userscript(this.recipe, this, config);
+          userJsModule(config, this.userscript);
         }
       };
 
@@ -153,6 +157,11 @@ class RecipeController {
     debug('isDarkModeEnabled', this.settings.service.isDarkModeEnabled);
     debug('System spellcheckerLanguage', this.settings.app.spellcheckerLanguage);
     debug('Service spellcheckerLanguage', this.settings.service.spellcheckerLanguage);
+    debug('darkReaderSettigs', this.settings.service.darkReaderSettings);
+
+    if (this.userscript && this.userscript.internal_setSettings) {
+      this.userscript.internal_setSettings(this.settings);
+    }
 
     if (this.settings.app.enableSpellchecking) {
       debug('Setting spellchecker language to', this.spellcheckerLanguage);
@@ -225,7 +234,8 @@ class RecipeController {
         console.log('Injecting DarkReader');
 
         // Use darkreader instead
-        enableDarkMode({}, {
+        const { brightness, contrast, sepia } = this.settings.service.darkReaderSettings;
+        enableDarkMode({ brightness, contrast, sepia }, {
           css: customDarkModeCss[window.location.host] || '',
         });
         this.universalDarkModeInjected = true;
@@ -322,7 +332,6 @@ new RecipeController();
 // Patching window.open
 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).