major: fadblock 1.3 [bump]

0x48piraj · Oct 21, 2023 · 7369f9c · 7369f9c
1 parent f6bf34e
commit 7369f9c
Show file tree

Hide file tree

Showing 21 changed files with 33 additions and 3 deletions.
diff --git a/src/chrome/js/background.js b/src/chrome/js/background.js
@@ -30,13 +30,18 @@ const taimuRipu = async () => {
     const setTimeoutHandler = () => {
       const isAd = videoContainer?.classList.contains("ad-interrupting") || videoContainer?.classList.contains("ad-showing");
       const skipLock = document.querySelector(".ytp-ad-preview-text")?.innerText;
+      const surveyLock = document.querySelector(".ytp-ad-survey")?.length > 0;
 
       if (isAd && skipLock) {
         const videoPlayer = document.getElementsByClassName("video-stream")[0];
         videoPlayer.muted = true; // videoPlayer.volume = 0;
         videoPlayer.currentTime = videoPlayer.duration - 0.1;
+        videoPlayer.paused && videoPlayer.play()
         // CLICK ON THE SKIP AD BTN
         document.querySelector(".ytp-ad-skip-button")?.click();
+      } else if (isAd && surveyLock) {
+        // CLICK ON THE SKIP SURVEY BTN
+        document.querySelector(".ytp-ad-skip-button")?.click();
       }
 
       resolve();

diff --git a/src/chrome/js/content.js b/src/chrome/js/content.js
@@ -5,13 +5,18 @@ const taimuRipu = async () => {
     const setTimeoutHandler = () => {
       const isAd = videoContainer?.classList.contains("ad-interrupting") || videoContainer?.classList.contains("ad-showing");
       const skipLock = document.querySelector(".ytp-ad-preview-text")?.innerText;
+      const surveyLock = document.querySelector(".ytp-ad-survey")?.length > 0;
 
       if (isAd && skipLock) {
         const videoPlayer = document.getElementsByClassName("video-stream")[0];
         videoPlayer.muted = true; // videoPlayer.volume = 0;
         videoPlayer.currentTime = videoPlayer.duration - 0.1;
+        videoPlayer.paused && videoPlayer.play()
         // CLICK ON THE SKIP AD BTN
         document.querySelector(".ytp-ad-skip-button")?.click();
+      } else if (isAd && surveyLock) {
+        // CLICK ON THE SKIP SURVEY BTN
+        document.querySelector(".ytp-ad-skip-button")?.click();
       }
 
       const staticAds = [".ytd-companion-slot-renderer", ".ytd-action-companion-ad-renderer", // in-feed video ads

diff --git a/src/chrome/manifest.json b/src/chrome/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "FadBlock: Friendly Adblock for Youtube™",
-  "version": "1.2.1",
+  "version": "1.3",
   "description": "A fast, lightweight, and undetectable YouTube Ads Blocker for Chrome.",
   "icons": {
        "16": "assets/icons/icon-16x16.png",

diff --git a/src/firefox/assets/fonts/Roboto-Black.woff b/src/firefox/assets/fonts/Roboto-Black.woff
diff --git a/src/firefox/assets/fonts/Roboto-BlackItalic.woff b/src/firefox/assets/fonts/Roboto-BlackItalic.woff
diff --git a/src/firefox/assets/fonts/Roboto-Bold.woff b/src/firefox/assets/fonts/Roboto-Bold.woff
diff --git a/src/firefox/assets/fonts/Roboto-BoldItalic.woff b/src/firefox/assets/fonts/Roboto-BoldItalic.woff
diff --git a/src/firefox/assets/fonts/Roboto-Italic.woff b/src/firefox/assets/fonts/Roboto-Italic.woff
diff --git a/src/firefox/assets/fonts/Roboto-Light.woff b/src/firefox/assets/fonts/Roboto-Light.woff
diff --git a/src/firefox/assets/fonts/Roboto-LightItalic.woff b/src/firefox/assets/fonts/Roboto-LightItalic.woff
diff --git a/src/firefox/assets/fonts/Roboto-Medium.woff b/src/firefox/assets/fonts/Roboto-Medium.woff
diff --git a/src/firefox/assets/fonts/Roboto-MediumItalic.woff b/src/firefox/assets/fonts/Roboto-MediumItalic.woff
diff --git a/src/firefox/assets/fonts/Roboto-Regular.woff b/src/firefox/assets/fonts/Roboto-Regular.woff
diff --git a/src/firefox/assets/fonts/Roboto-Thin.woff b/src/firefox/assets/fonts/Roboto-Thin.woff
diff --git a/src/firefox/assets/fonts/Roboto-ThinItalic.woff b/src/firefox/assets/fonts/Roboto-ThinItalic.woff
diff --git a/src/firefox/js/background.js b/src/firefox/js/background.js
@@ -30,13 +30,18 @@ const taimuRipu = async () => {
     const setTimeoutHandler = () => {
       const isAd = videoContainer?.classList.contains("ad-interrupting") || videoContainer?.classList.contains("ad-showing");
       const skipLock = document.querySelector(".ytp-ad-preview-text")?.innerText;
+      const surveyLock = document.querySelector(".ytp-ad-survey")?.length > 0;
 
       if (isAd && skipLock) {
         const videoPlayer = document.getElementsByClassName("video-stream")[0];
         videoPlayer.muted = true; // videoPlayer.volume = 0;
         videoPlayer.currentTime = videoPlayer.duration - 0.1;
+        videoPlayer.paused && videoPlayer.play()
         // CLICK ON THE SKIP AD BTN
         document.querySelector(".ytp-ad-skip-button")?.click();
+      } else if (isAd && surveyLock) {
+        // CLICK ON THE SKIP SURVEY BTN
+        document.querySelector(".ytp-ad-skip-button")?.click();
       }
 
       resolve();

diff --git a/src/firefox/js/content.js b/src/firefox/js/content.js
@@ -5,13 +5,18 @@ const taimuRipu = async () => {
     const setTimeoutHandler = () => {
       const isAd = videoContainer?.classList.contains("ad-interrupting") || videoContainer?.classList.contains("ad-showing");
       const skipLock = document.querySelector(".ytp-ad-preview-text")?.innerText;
+      const surveyLock = document.querySelector(".ytp-ad-survey")?.length > 0;
 
       if (isAd && skipLock) {
         const videoPlayer = document.getElementsByClassName("video-stream")[0];
         videoPlayer.muted = true; // videoPlayer.volume = 0;
         videoPlayer.currentTime = videoPlayer.duration - 0.1;
+        videoPlayer.paused && videoPlayer.play()
         // CLICK ON THE SKIP AD BTN
         document.querySelector(".ytp-ad-skip-button")?.click();
+      } else if (isAd && surveyLock) {
+        // CLICK ON THE SKIP SURVEY BTN
+        document.querySelector(".ytp-ad-skip-button")?.click();
       }
 
       const staticAds = [".ytd-companion-slot-renderer", ".ytd-action-companion-ad-renderer", // in-feed video ads

diff --git a/src/firefox/manifest.json b/src/firefox/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "FadBlock: Friendly Adblock for Youtube™",
-  "version": "1.2.1",
+  "version": "1.3",
   "description": "A fast, lightweight, and undetectable YouTube Ads Blocker for Chrome.",
   "icons": {
        "16": "assets/icons/icon-16x16.png",

diff --git a/src/opera/js/background.js b/src/opera/js/background.js
@@ -30,13 +30,18 @@ const taimuRipu = async () => {
     const setTimeoutHandler = () => {
       const isAd = videoContainer?.classList.contains("ad-interrupting") || videoContainer?.classList.contains("ad-showing");
       const skipLock = document.querySelector(".ytp-ad-preview-text")?.innerText;
+      const surveyLock = document.querySelector(".ytp-ad-survey")?.length > 0;
 
       if (isAd && skipLock) {
         const videoPlayer = document.getElementsByClassName("video-stream")[0];
         videoPlayer.muted = true; // videoPlayer.volume = 0;
         videoPlayer.currentTime = videoPlayer.duration - 0.1;
+        videoPlayer.paused && videoPlayer.play()
         // CLICK ON THE SKIP AD BTN
         document.querySelector(".ytp-ad-skip-button")?.click();
+      } else if (isAd && surveyLock) {
+        // CLICK ON THE SKIP SURVEY BTN
+        document.querySelector(".ytp-ad-skip-button")?.click();
       }
 
       resolve();

diff --git a/src/opera/js/content.js b/src/opera/js/content.js
@@ -5,13 +5,18 @@ const taimuRipu = async () => {
     const setTimeoutHandler = () => {
       const isAd = videoContainer?.classList.contains("ad-interrupting") || videoContainer?.classList.contains("ad-showing");
       const skipLock = document.querySelector(".ytp-ad-preview-text")?.innerText;
+      const surveyLock = document.querySelector(".ytp-ad-survey")?.length > 0;
 
       if (isAd && skipLock) {
         const videoPlayer = document.getElementsByClassName("video-stream")[0];
         videoPlayer.muted = true; // videoPlayer.volume = 0;
         videoPlayer.currentTime = videoPlayer.duration - 0.1;
+        videoPlayer.paused && videoPlayer.play()
         // CLICK ON THE SKIP AD BTN
         document.querySelector(".ytp-ad-skip-button")?.click();
+      } else if (isAd && surveyLock) {
+        // CLICK ON THE SKIP SURVEY BTN
+        document.querySelector(".ytp-ad-skip-button")?.click();
       }
 
       const staticAds = [".ytd-companion-slot-renderer", ".ytd-action-companion-ad-renderer", // in-feed video ads

diff --git a/src/opera/manifest.json b/src/opera/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "FadBlock: Friendly Adblock for Youtube™",
-  "version": "1.2.1",
+  "version": "1.3",
   "description": "A fast, lightweight, and undetectable YouTube Ads Blocker for Chrome.",
   "icons": {
        "16": "assets/icons/icon-16x16.png",