version 1.0.78

Dreamlinerm · Jan 10, 2024 · 38c8701 · 38c8701
1 parent 91d4aa4
commit 38c8701
Show file tree

Hide file tree

Showing 20 changed files with 126 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 
 <div>
             <div class="line flex">
-              <h2>1.0.77</h2>
+              <h2>1.0.78</h2>
               <ul>
                 <li>Released for Firefox on Android</li>
               </ul>

diff --git a/chrome/_locales/de/messages.json b/chrome/_locales/de/messages.json
@@ -130,6 +130,12 @@
   "PaidContentDescription": {
     "message": "Entfernen aller bezahlten Serien/Filmkategorien"
   },
+  "ContinuePositionSwitch": {
+    "message": "Kategorie \"Fortsetzen\" verschieben:"
+  },
+  "ContinuePositionDescription": {
+    "message": "Kategorie \"Fortsetzen\" an den Seitenanfang verschieben"
+  },
   "FreeveeSwitch": {
     "message": "Freevee-Werbungen überspringen:"
   },

diff --git a/chrome/_locales/en/messages.json b/chrome/_locales/en/messages.json
@@ -130,6 +130,12 @@
   "PaidContentDescription": {
     "message": "Removing every paid movie/series category"
   },
+  "ContinuePositionSwitch": {
+    "message": "Move category \"Continue\":"
+  },
+  "ContinuePositionDescription": {
+    "message": "Move category \"Continue\" to the top of the page"
+  },
   "FreeveeSwitch": {
     "message": "Skip Freevee Ads:"
   },

diff --git a/chrome/_locales/mk/messages.json b/chrome/_locales/mk/messages.json
@@ -130,6 +130,12 @@
   "PaidContentDescription": {
     "message": "Отстранување на секоја ТВ-серија/филм кој треба да се купи за да се гледа"
   },
+  "ContinuePositionSwitch": {
+    "message": "Преместете ја категоријата „Продолжи“:"
+  },
+  "ContinuePositionDescription": {
+    "message": "Преместете ја категоријата „Продолжи“ на врвот на страницата"
+  },
   "FreeveeSwitch": {
     "message": "Прескокнете ги рекламите:"
   },

diff --git a/chrome/_locales/pt_BR/messages.json b/chrome/_locales/pt_BR/messages.json
@@ -1,6 +1,6 @@
 {
   "extensionName": {
-    "message": "Streaming enhanced: Netflix Disney+ Prime Video",
+    "message": "Streaming enhanced Netflix Disney Prime Video",
     "description": "Nome da extensão"
   },
   "extensionDescription": {
@@ -130,6 +130,12 @@
   "PaidContentDescription": {
     "message": "Remoção de todas as categorias de filmes/séries pagos"
   },
+  "ContinuePositionSwitch": {
+    "message": "Mover categoria \"Continuar\":"
+  },
+  "ContinuePositionDescription": {
+    "message": "Mova a categoria \"Continuar\" para o topo da página"
+  },
   "FreeveeSwitch": {
     "message": "Ignorar anúncios:"
   },

diff --git a/chrome/cr.js b/chrome/cr.js
@@ -21,6 +21,7 @@ const defaultSettings = {
       blockFreevee: true,
       speedSlider: true,
       filterPaid: false,
+      continuePosition: true,
       showRating: true,
     },
     Netflix: {
@@ -42,7 +43,7 @@ const defaultSettings = {
   },
 };
 let settings = defaultSettings.settings;
-const version = "1.0.77";
+const version = "1.0.78";
 chrome.storage.sync.get("settings", function (result) {
   console.log(
     "%cNetflix%c/%cPrime%c Auto-Skip",

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.0.77",
+  "version": "1.0.78",
 
   "homepage_url": "https://github.com/Dreamlinerm/Netflix-Prime-Auto-Skip",
   "icons": {
@@ -35,7 +35,7 @@
       "matches": ["https://static.crunchyroll.com/vilos-v2/web/vilos/player.html*"]
     }
   ],
-  "permissions": ["storage"],
+  "permissions": ["storage", "activeTab"],
   "action": {
     "default_icon": {
       "16": "icons/NetflixAmazon Auto-Skip--16.png",

diff --git a/chrome/popup/popup.html b/chrome/popup/popup.html
@@ -30,7 +30,7 @@
           <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" />
           <div class="flex-center flex-col">
             <h2 class="title" i18n>pageTitle</h2>
-            <p style="color: grey; font-size: 1em">v.1.0.77</p>
+            <p style="color: grey; font-size: 1em">v.1.0.78</p>
           </div>
         </div>
         <a
@@ -207,6 +207,13 @@ <h2 id="openAmazonSettings" i18n>PageSpecificTitle;Prime Video</h2>
               <span class="slider round"></span>
             </label>
           </div>
+          <div class="line flex">
+            <p i18n>ContinuePositionSwitch</p>
+            <label class="switch">
+              <input type="checkbox" id="AmazonContinuePosition" />
+              <span class="slider round"></span>
+            </label>
+          </div>
           <!-- <div class="line flex">
               <p i18n>StreamLinksSwitch</p>
               <label class="switch">

diff --git a/chrome/popup/settings.html b/chrome/popup/settings.html
@@ -29,7 +29,7 @@
           <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" />
           <div class="flex-center flex-col">
             <h2 class="title" i18n>pageTitle</h2>
-            <p style="font-size: 1em">v.1.0.77</p>
+            <p style="font-size: 1em">v.1.0.78</p>
           </div>
         </div>
         <a
@@ -508,6 +508,14 @@ <h2 i18n>PageSpecificTitle;Prime Video</h2>
           </div>
           <p class="description" i18n>PaidContentDescription</p>
           <hr />
+          <div class="line flex">
+            <p i18n>ContinuePositionSwitch</p>
+            <label class="switch">
+              <input type="checkbox" id="AmazonContinuePosition" />
+              <span class="slider round"></span>
+            </label>
+          </div>
+          <p class="description" i18n>ContinuePositionDescription</p>
 
           <!-- <div class="line flex">
               <p i18n>StreamLinksSwitch</p>
@@ -752,7 +760,14 @@ <h2 i18n>ImportSettings</h2>
           <h2>Changelog</h2>
           <div>
             <div class="line flex">
-              <h2>1.0.77</h2>
+              <h2>1.0.78</h2>
+              <ul>
+                <li>Mute Netflix Ad skip</li>
+                <li>Add Feature to Prime: move continue watching to the top</li>
+              </ul>
+            </div>
+            <div class="line flex">
+              <p>1.0.77</p>
               <ul>
                 <li>Automatically use desktop mode on firefox/chrome mobile</li>
                 <li>Various mobile improvements</li>

diff --git a/chrome/popup/settings.js b/chrome/popup/settings.js
@@ -58,6 +58,7 @@ const defaultSettings = {
       blockFreevee: true,
       speedSlider: true,
       filterPaid: false,
+      continuePosition: true,
       showRating: true,
     },
     Netflix: {
@@ -198,7 +199,7 @@ function setCheckboxesToSettings() {
   //  -------------      Default        ---------------------------------------
   setButtonChecked("DefaultSkips", settings?.Amazon.filterPaid);
   // -------------      global buttons        ---------------------------------------
-  setButtonChecked("AmazonSkips", settings?.Amazon.skipAd && settings?.Amazon.filterPaid);
+  setButtonChecked("AmazonSkips", settings?.Amazon.skipAd && settings?.Amazon.filterPaid && settings?.Amazon.continuePosition);
   setButtonChecked("NetflixSkips", settings?.Netflix.skipRecap && settings?.Netflix.skipBlocked && settings?.Netflix.profile);
   setButtonChecked("DisneySkips", settings?.Disney.skipIntro);
   setButtonChecked("CrunchyrollSkips", settings?.Crunchyroll.skipIntro && settings?.Crunchyroll.releaseCalendar);
@@ -362,7 +363,10 @@ function listenForClicks() {
       else if (e.target.id === "DefaultSkips") settings.Amazon.filterPaid = !settings?.Amazon.filterPaid;
       //  -------------      Amazon        ---------------------------------------
       else if (e.target.id === "AmazonSkips")
-        settings.Amazon.skipAd = settings.Amazon.filterPaid = !(settings.Amazon.skipAd && settings.Amazon.filterPaid);
+        settings.Amazon.skipAd =
+          settings.Amazon.filterPaid =
+          settings.Amazon.continuePosition =
+            !(settings.Amazon.skipAd && settings.Amazon.filterPaid && settings.Amazon.continuePosition);
       else if (e.target.id === "NetflixSkips")
         settings.Netflix.skipRecap =
           settings.Netflix.skipBlocked =

diff --git a/chrome/skipper.js b/chrome/skipper.js
@@ -27,7 +27,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.0.77";
+const version = "1.0.78";
 if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
   /* eslint-env root:true */
   // global variables in localStorage
@@ -41,6 +41,7 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
         blockFreevee: true,
         speedSlider: true,
         filterPaid: false,
+        continuePosition: true,
         showRating: true,
       },
       Netflix: {
@@ -114,27 +115,8 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
         Amazon_FreeveeTimeout();
       }, 1000);
     }
-    // customize mobile view for desktop website
-    if (settings.Video?.userAgent && isMobile) {
-      if (!document.querySelector(AmazonVideoClass) && !url.includes("/gp/video/detail/")) {
-        // add <meta name="viewport" content="width=device-width, initial-scale=1" /> to head
-        let meta = document.createElement("meta");
-        meta.name = "viewport";
-        meta.content = "width=device-width, initial-scale=1";
-        document.head.appendChild(meta);
-
-        // make amazon more mobile friendly
-        let navBelt = document.querySelector("#nav-belt");
-        if (navBelt) {
-          navBelt.style.width = "100vw";
-          navBelt.style.display = "flex";
-          navBelt.style.flexDirection = "column";
-          navBelt.style.height = "fit-content";
-        }
-        let navMain = document.querySelector("#nav-main");
-        if (navMain) navMain.style.display = "none";
-      }
-    }
+    if (Amazon?.continuePosition) Amazon_continuePosition();
+    if (settings.Video?.userAgent && isMobile) Amazon_customizeMobileView();
   }
   chrome.storage.sync.get("settings", function (result) {
     // if there is an undefined setting, set it to the default
@@ -178,6 +160,7 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
   function AmazonSettingsChanged(oldValue, newValue) {
     if (!oldValue?.skipAd && newValue.skipAd) Amazon_AdTimeout();
     if (!oldValue?.blockFreevee && newValue.blockFreevee) Amazon_FreeveeTimeout();
+    if (!oldValue?.continuePosition && newValue.continuePosition) Amazon_continuePosition();
   }
   function DisneySettingsChanged(oldValue, newValue) {
     if (!oldValue?.showRating && newValue.showRating) startShowRatingInterval();
@@ -596,6 +579,7 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
           settings.Statistics.NetflixAdTimeSkipped += adLength;
           increaseBadge();
           if (settings.Video.epilepsy) video.style.opacity = 0;
+          video.muted = true;
           video.playbackRate = playBackRate;
           lastAdTimeText = adLength;
         } else if (adLength > 2 && video.playbackRate < 2) {
@@ -606,6 +590,7 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
           // added lastAdTimeText because other speedsliders are not working anymore
         } else if (adLength <= 2 || (!adLength && lastAdTimeText)) {
           // videospeed is speedSlider value
+          video.muted = false;
           video.playbackRate = videoSpeed;
           lastAdTimeText = 0;
           if (settings.Video.epilepsy) video.style.opacity = 1;
@@ -752,6 +737,24 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
       }
     }
   }
+  async function Amazon_continuePosition() {
+    const div = document.querySelector("._2RwnU5.dynamic-type-ramp.dv-fable-breakpoints.VYbJYb.yL46mS.kK-hEr");
+    if (div) {
+      let a = document.querySelector('.j5ZgN-.r0m8Kk._0rmWBt[data-testid="card-overlay"]');
+      let maxSectionDepth = 10;
+      while (a?.parentElement && maxSectionDepth > 0) {
+        a = a.parentElement;
+        maxSectionDepth--;
+        if (a?.classList?.contains("+OSZzQ")) break;
+      }
+      const insertBefore = div.childNodes[2];
+      if (a && insertBefore) {
+        // move continue category to the top
+        div.insertBefore(a, insertBefore);
+        // continueCategory.remove();
+      }
+    }
+  }
   async function Amazon_FilterPaid() {
     // if not on the shop page or homepremiere
     if (!url.includes("contentId=store") && !url.includes("contentId=homepremiere") && !url.includes("contentType=merch")) {
@@ -857,6 +860,29 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
       }
     }, 100);
   }
+
+  async function Amazon_customizeMobileView() {
+    console.log("customizeMobileView");
+    // customize mobile view for desktop website
+    if (!document.querySelector(AmazonVideoClass) && !url.includes("/gp/video/detail/")) {
+      // add <meta name="viewport" content="width=device-width, initial-scale=1" /> to head
+      let meta = document.createElement("meta");
+      meta.name = "viewport";
+      meta.content = "width=device-width, initial-scale=1";
+      document.head.appendChild(meta);
+
+      // make amazon more mobile friendly
+      let navBelt = document.querySelector("#nav-belt");
+      if (navBelt) {
+        navBelt.style.width = "100vw";
+        navBelt.style.display = "flex";
+        navBelt.style.flexDirection = "column";
+        navBelt.style.height = "fit-content";
+      }
+      let navMain = document.querySelector("#nav-main");
+      if (navMain) navMain.style.display = "none";
+    }
+  }
   // Crunchyroll functions
   function filterQueued(display) {
     document.querySelectorAll("div.queue-flag:not(.queued)").forEach((element) => {

diff --git a/chrome/web-ext-artifacts/streaming_enhanced_netflix_disney_prime_video-1.0.78.zip b/chrome/web-ext-artifacts/streaming_enhanced_netflix_disney_prime_video-1.0.78.zip
diff --git a/firefox/cr.js b/firefox/cr.js
@@ -43,7 +43,7 @@ const defaultSettings = {
   },
 };
 let settings = defaultSettings.settings;
-const version = "1.0.77";
+const version = "1.0.78";
 browser.storage.sync.get("settings", function (result) {
   console.log(
     "%cNetflix%c/%cPrime%c Auto-Skip",

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.0.77",
+  "version": "1.0.78",
   "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
@@ -30,7 +30,7 @@
           <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" />
           <div class="flex-center flex-col">
             <h2 class="title" i18n>pageTitle</h2>
-            <p style="color: grey; font-size: 1em">v.1.0.77</p>
+            <p style="color: grey; font-size: 1em">v.1.0.78</p>
           </div>
         </div>
         <a

diff --git a/firefox/popup/settings.html b/firefox/popup/settings.html
@@ -29,7 +29,7 @@
           <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" />
           <div class="flex-center flex-col">
             <h2 class="title" i18n>pageTitle</h2>
-            <p style="font-size: 1em">v.1.0.77</p>
+            <p style="font-size: 1em">v.1.0.78</p>
           </div>
         </div>
         <a
@@ -508,6 +508,14 @@ <h2 i18n>PageSpecificTitle;Prime Video</h2>
           </div>
           <p class="description" i18n>PaidContentDescription</p>
           <hr />
+          <div class="line flex">
+            <p i18n>ContinuePositionSwitch</p>
+            <label class="switch">
+              <input type="checkbox" id="AmazonContinuePosition" />
+              <span class="slider round"></span>
+            </label>
+          </div>
+          <p class="description" i18n>ContinuePositionDescription</p>
 
           <!-- <div class="line flex">
             <p i18n>StreamLinksSwitch</p>
@@ -759,7 +767,7 @@ <h2>1.0.78</h2>
               </ul>
             </div>
             <div class="line flex">
-              <h2>1.0.77</h2>
+              <p>1.0.77</p>
               <ul>
                 <li>Automatically use desktop mode on firefox/chrome mobile</li>
                 <li>Various mobile improvements</li>

diff --git a/firefox/skipper.js b/firefox/skipper.js
@@ -27,7 +27,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.0.77";
+const version = "1.0.78";
 if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
   /* eslint-env root:true */
   // global variables in localStorage
@@ -750,7 +750,6 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
       const insertBefore = div.childNodes[2];
       if (a && insertBefore) {
         // move continue category to the top
-        console.log(div, a, insertBefore);
         div.insertBefore(a, insertBefore);
         // continueCategory.remove();
       }

diff --git a/firefox/web-ext-artifacts/streaming_enhanced_netflix_disney_prime_video-1.0.78.zip b/firefox/web-ext-artifacts/streaming_enhanced_netflix_disney_prime_video-1.0.78.zip