version 1.1.20

Dreamlinerm · Jul 5, 2024 · dabc558 · dabc558
1 parent 8ddb24c
commit dabc558
Show file tree

Hide file tree

Showing 14 changed files with 90 additions and 48 deletions.
diff --git a/chrome/cr.js b/chrome/cr.js
@@ -55,7 +55,7 @@ const defaultSettings = {
   },
 };
 let settings = { ...defaultSettings.settings };
-const version = "1.1.19";
+const version = "1.1.20";
 chrome.storage.sync.get("settings", function (result) {
   console.log(
     "%cNetflix%c/%cPrime%c Auto-Skip",
@@ -67,11 +67,15 @@ chrome.storage.sync.get("settings", function (result) {
   console.log("version:", version);
   // overwrite default settings with user settings
   // List of keys to merge individually
-  Object.keys(defaultSettings.settings).forEach((key) => {
-    if (result?.settings[key]) {
-      settings[key] = { ...defaultSettings.settings[key], ...result.settings[key] };
-    }
-  });
+  settings.Amazon = { ...defaultSettings.settings.Amazon, ...result?.settings?.Amazon };
+  settings.Netflix = { ...defaultSettings.settings.Netflix, ...result?.settings?.Netflix };
+  settings.Disney = { ...defaultSettings.settings.Disney, ...result?.settings?.Disney };
+  settings.Crunchyroll = { ...defaultSettings.settings.Crunchyroll, ...result?.settings?.Crunchyroll };
+  settings.HBO = { ...defaultSettings.settings.HBO, ...result?.settings?.HBO };
+  settings.Video = { ...defaultSettings.settings.Video, ...result?.settings?.Video };
+  settings.Statistics = { ...defaultSettings.settings.Statistics, ...result?.settings?.Statistics };
+  settings.General = { ...defaultSettings.settings.General, ...result?.settings?.General };
+
   CrunchyrollObserver.observe(document, config);
   if (settings?.Video?.playOnFullScreen) startPlayOnFullScreen();
 });

diff --git a/chrome/manifest.json b/chrome/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
-  "version": "1.1.19",
+  "version": "1.1.20",
 
   "homepage_url": "https://github.com/Dreamlinerm/Netflix-Prime-Auto-Skip",
   "icons": {

diff --git a/chrome/popup/popup.html b/chrome/popup/popup.html
@@ -32,7 +32,7 @@
         <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" alt="Logo">
         <div class="flex-center flex-col">
           <h2 class="title" data-i18n>pageTitle</h2>
-          <p style="color: grey; font-size: 1em">v.1.1.19</p>
+          <p style="color: grey; font-size: 1em">v.1.1.20</p>
         </div>
       </div>
       <a target="_blank" class="flex-center flex-col" style="text-align: center; text-decoration: none"

diff --git a/chrome/popup/settings.html b/chrome/popup/settings.html
@@ -30,7 +30,7 @@
         <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" alt="Logo">
         <div class="flex-center flex-col">
           <h2 class="title" data-i18n>pageTitle</h2>
-          <p style="font-size: 1em">v.1.1.19</p>
+          <p style="font-size: 1em">v.1.1.20</p>
         </div>
       </div>
       <a target="_blank" class="flex-center flex-col" style="text-align: center; text-decoration: none"
@@ -681,7 +681,13 @@ <h2 data-i18n>ImportSettings</h2>
         <h2>Changelog</h2>
         <div>
           <div class="line flex">
-            <h2>1.1.18-19</h2>
+            <h2>1.1.20</h2>
+            <ul>
+              <li>Fixed settings error</li>
+            </ul>
+          </div>
+          <div class="line flex">
+            <p>1.1.18-19</p>
             <ul>
               <li>Profile Pick not working
                 the same in deployed version</li>

diff --git a/chrome/popup/settings.js b/chrome/popup/settings.js
@@ -110,11 +110,15 @@ let settings = { ...defaultSettings.settings };
 chrome.storage.sync.get("settings", function (result) {
   // overwrite default settings with user settings
   // List of keys to merge individually
-  Object.keys(defaultSettings.settings).forEach((key) => {
-    if (result?.settings[key]) {
-      settings[key] = { ...defaultSettings.settings[key], ...result.settings[key] };
-    }
-  });
+  settings.Amazon = { ...defaultSettings.settings.Amazon, ...result?.settings?.Amazon };
+  settings.Netflix = { ...defaultSettings.settings.Netflix, ...result?.settings?.Netflix };
+  settings.Disney = { ...defaultSettings.settings.Disney, ...result?.settings?.Disney };
+  settings.Crunchyroll = { ...defaultSettings.settings.Crunchyroll, ...result?.settings?.Crunchyroll };
+  settings.HBO = { ...defaultSettings.settings.HBO, ...result?.settings?.HBO };
+  settings.Video = { ...defaultSettings.settings.Video, ...result?.settings?.Video };
+  settings.Statistics = { ...defaultSettings.settings.Statistics, ...result?.settings?.Statistics };
+  settings.General = { ...defaultSettings.settings.General, ...result?.settings?.General };
+
   // delete every setting that is not in defaultSettings
   let changedSettings;
   for (const key in settings) {

diff --git a/chrome/skipper.js b/chrome/skipper.js
@@ -29,7 +29,7 @@ const isMobile = /mobile|streamingEnhanced/i.test(ua);
 const isEdge = /edg/i.test(ua);
 // const isFirefox = /firefox/i.test(ua);
 // const isChrome = /chrome/i.test(ua);
-const version = "1.1.19";
+const version = "1.1.20";
 if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll || isHBO) {
   /* eslint-env root:true */
   // global variables in localStorage
@@ -149,11 +149,15 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll || isHBO
   chrome.storage.sync.get("settings", function (result) {
     // overwrite default settings with user settings
     // List of keys to merge individually
-    Object.keys(defaultSettings.settings).forEach((key) => {
-      if (result?.settings[key]) {
-        settings[key] = { ...defaultSettings.settings[key], ...result.settings[key] };
-      }
-    });
+    settings.Amazon = { ...defaultSettings.settings.Amazon, ...result?.settings?.Amazon };
+    settings.Netflix = { ...defaultSettings.settings.Netflix, ...result?.settings?.Netflix };
+    settings.Disney = { ...defaultSettings.settings.Disney, ...result?.settings?.Disney };
+    settings.Crunchyroll = { ...defaultSettings.settings.Crunchyroll, ...result?.settings?.Crunchyroll };
+    settings.HBO = { ...defaultSettings.settings.HBO, ...result?.settings?.HBO };
+    settings.Video = { ...defaultSettings.settings.Video, ...result?.settings?.Video };
+    settings.Statistics = { ...defaultSettings.settings.Statistics, ...result?.settings?.Statistics };
+    settings.General = { ...defaultSettings.settings.General, ...result?.settings?.General };
+
     logStartOfAddon();
     getDBCache();
 
@@ -786,6 +790,7 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll || isHBO
   }
   function Amazon_Intro() {
     if (settings.Amazon?.skipIntro) {
+      console.log("Amazon_Intro");
       // skips intro and recap
       // recap on lucifer season 3 episode 3
       // intro lucifer season 3 episode 4

diff --git a/firefox/badge.js b/firefox/badge.js
@@ -124,11 +124,15 @@ if (isMobile) {
   browser.storage.sync.get("settings", function (result) {
     // overwrite default settings with user settings
     // List of keys to merge individually
-    Object.keys(defaultSettings.settings).forEach((key) => {
-      if (result?.settings[key]) {
-        settings[key] = { ...defaultSettings.settings[key], ...result.settings[key] };
-      }
-    });
+    settings.Amazon = { ...defaultSettings.settings.Amazon, ...result?.settings?.Amazon };
+    settings.Netflix = { ...defaultSettings.settings.Netflix, ...result?.settings?.Netflix };
+    settings.Disney = { ...defaultSettings.settings.Disney, ...result?.settings?.Disney };
+    settings.Crunchyroll = { ...defaultSettings.settings.Crunchyroll, ...result?.settings?.Crunchyroll };
+    settings.HBO = { ...defaultSettings.settings.HBO, ...result?.settings?.HBO };
+    settings.Video = { ...defaultSettings.settings.Video, ...result?.settings?.Video };
+    settings.Statistics = { ...defaultSettings.settings.Statistics, ...result?.settings?.Statistics };
+    settings.General = { ...defaultSettings.settings.General, ...result?.settings?.General };
+
     ChangeUserAgent();
     console.log("userAgent", settings.Video.userAgent);
   });

diff --git a/firefox/cr.js b/firefox/cr.js
@@ -55,7 +55,7 @@ const defaultSettings = {
   },
 };
 let settings = { ...defaultSettings.settings };
-const version = "1.1.19";
+const version = "1.1.20";
 browser.storage.sync.get("settings", function (result) {
   console.log(
     "%cNetflix%c/%cPrime%c Auto-Skip",
@@ -67,11 +67,15 @@ browser.storage.sync.get("settings", function (result) {
   console.log("version:", version);
   // overwrite default settings with user settings
   // List of keys to merge individually
-  Object.keys(defaultSettings.settings).forEach((key) => {
-    if (result?.settings[key]) {
-      settings[key] = { ...defaultSettings.settings[key], ...result.settings[key] };
-    }
-  });
+  settings.Amazon = { ...defaultSettings.settings.Amazon, ...result?.settings?.Amazon };
+  settings.Netflix = { ...defaultSettings.settings.Netflix, ...result?.settings?.Netflix };
+  settings.Disney = { ...defaultSettings.settings.Disney, ...result?.settings?.Disney };
+  settings.Crunchyroll = { ...defaultSettings.settings.Crunchyroll, ...result?.settings?.Crunchyroll };
+  settings.HBO = { ...defaultSettings.settings.HBO, ...result?.settings?.HBO };
+  settings.Video = { ...defaultSettings.settings.Video, ...result?.settings?.Video };
+  settings.Statistics = { ...defaultSettings.settings.Statistics, ...result?.settings?.Statistics };
+  settings.General = { ...defaultSettings.settings.General, ...result?.settings?.General };
+
   CrunchyrollObserver.observe(document, config);
   if (settings?.Video?.playOnFullScreen) startPlayOnFullScreen();
 });

diff --git a/firefox/manifest.json b/firefox/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
-  "version": "1.1.19",
+  "version": "1.1.20",
   "homepage_url": "https://github.com/Dreamlinerm/Netflix-Prime-Auto-Skip",
   "icons": {
     "16": "icons/NetflixAmazon Auto-Skip.svg",

diff --git a/firefox/popup/popup.html b/firefox/popup/popup.html
@@ -32,7 +32,7 @@
         <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" alt="Logo">
         <div class="flex-center flex-col">
           <h2 class="title" data-i18n>pageTitle</h2>
-          <p style="color: grey; font-size: 1em">v.1.1.19</p>
+          <p style="color: grey; font-size: 1em">v.1.1.20</p>
         </div>
       </div>
       <a target="_blank" class="flex-center flex-col" style="text-align: center; text-decoration: none"

diff --git a/firefox/popup/settings.html b/firefox/popup/settings.html
@@ -30,7 +30,7 @@
         <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" alt="Logo">
         <div class="flex-center flex-col">
           <h2 class="title" data-i18n>pageTitle</h2>
-          <p style="font-size: 1em">v.1.1.19</p>
+          <p style="font-size: 1em">v.1.1.20</p>
         </div>
       </div>
       <a target="_blank" class="flex-center flex-col" style="text-align: center; text-decoration: none"
@@ -681,7 +681,13 @@ <h2 data-i18n>ImportSettings</h2>
         <h2>Changelog</h2>
         <div>
           <div class="line flex">
-            <h2>1.1.18-19</h2>
+            <h2>1.1.20</h2>
+            <ul>
+              <li>Fixed settings error</li>
+            </ul>
+          </div>
+          <div class="line flex">
+            <p>1.1.18-19</p>
             <ul>
               <li>Profile Pick not working
                 the same in deployed version</li>

diff --git a/firefox/popup/settings.js b/firefox/popup/settings.js
@@ -110,11 +110,15 @@ let settings = { ...defaultSettings.settings };
 browser.storage.sync.get("settings", function (result) {
   // overwrite default settings with user settings
   // List of keys to merge individually
-  Object.keys(defaultSettings.settings).forEach((key) => {
-    if (result?.settings[key]) {
-      settings[key] = { ...defaultSettings.settings[key], ...result.settings[key] };
-    }
-  });
+  settings.Amazon = { ...defaultSettings.settings.Amazon, ...result?.settings?.Amazon };
+  settings.Netflix = { ...defaultSettings.settings.Netflix, ...result?.settings?.Netflix };
+  settings.Disney = { ...defaultSettings.settings.Disney, ...result?.settings?.Disney };
+  settings.Crunchyroll = { ...defaultSettings.settings.Crunchyroll, ...result?.settings?.Crunchyroll };
+  settings.HBO = { ...defaultSettings.settings.HBO, ...result?.settings?.HBO };
+  settings.Video = { ...defaultSettings.settings.Video, ...result?.settings?.Video };
+  settings.Statistics = { ...defaultSettings.settings.Statistics, ...result?.settings?.Statistics };
+  settings.General = { ...defaultSettings.settings.General, ...result?.settings?.General };
+
   // delete every setting that is not in defaultSettings
   let changedSettings;
   for (const key in settings) {

diff --git a/firefox/skipper.js b/firefox/skipper.js
@@ -29,7 +29,7 @@ const isMobile = /mobile|streamingEnhanced/i.test(ua);
 const isEdge = /edg/i.test(ua);
 // const isFirefox = /firefox/i.test(ua);
 // const isChrome = /chrome/i.test(ua);
-const version = "1.1.19";
+const version = "1.1.20";
 if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll || isHBO) {
   /* eslint-env root:true */
   // global variables in localStorage
@@ -149,11 +149,15 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll || isHBO
   browser.storage.sync.get("settings", function (result) {
     // overwrite default settings with user settings
     // List of keys to merge individually
-    Object.keys(defaultSettings.settings).forEach((key) => {
-      if (result?.settings[key]) {
-        settings[key] = { ...defaultSettings.settings[key], ...result.settings[key] };
-      }
-    });
+    settings.Amazon = { ...defaultSettings.settings.Amazon, ...result?.settings?.Amazon };
+    settings.Netflix = { ...defaultSettings.settings.Netflix, ...result?.settings?.Netflix };
+    settings.Disney = { ...defaultSettings.settings.Disney, ...result?.settings?.Disney };
+    settings.Crunchyroll = { ...defaultSettings.settings.Crunchyroll, ...result?.settings?.Crunchyroll };
+    settings.HBO = { ...defaultSettings.settings.HBO, ...result?.settings?.HBO };
+    settings.Video = { ...defaultSettings.settings.Video, ...result?.settings?.Video };
+    settings.Statistics = { ...defaultSettings.settings.Statistics, ...result?.settings?.Statistics };
+    settings.General = { ...defaultSettings.settings.General, ...result?.settings?.General };
+
     logStartOfAddon();
     getDBCache();
 
@@ -786,6 +790,7 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll || isHBO
   }
   function Amazon_Intro() {
     if (settings.Amazon?.skipIntro) {
+      console.log("Amazon_Intro");
       // skips intro and recap
       // recap on lucifer season 3 episode 3
       // intro lucifer season 3 episode 4

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "streaming-enhanced",
-  "version": "1.1.19",
+  "version": "1.1.20",
   "description": "Automatically skip Ads, Intros, Credits and add Speed Control, etc. on Netflix, Prime video, Disney+ & Hotstar and Crunchyroll.",
   "scripts": {
     "start": "web-ext run",