diff --git a/src/chrome/js/background.js b/src/chrome/js/background.js index 541287b..d5cf207 100644 --- 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 index 2484ec4..b7d9887 100644 --- 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 index 130f5fa..fbc3e29 100644 --- 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 deleted file mode 100644 index 82a6a42..0000000 Binary files a/src/firefox/assets/fonts/Roboto-Black.woff and /dev/null differ diff --git a/src/firefox/assets/fonts/Roboto-BlackItalic.woff b/src/firefox/assets/fonts/Roboto-BlackItalic.woff deleted file mode 100644 index f794cda..0000000 Binary files a/src/firefox/assets/fonts/Roboto-BlackItalic.woff and /dev/null differ diff --git a/src/firefox/assets/fonts/Roboto-Bold.woff b/src/firefox/assets/fonts/Roboto-Bold.woff deleted file mode 100644 index 8626abd..0000000 Binary files a/src/firefox/assets/fonts/Roboto-Bold.woff and /dev/null differ diff --git a/src/firefox/assets/fonts/Roboto-BoldItalic.woff b/src/firefox/assets/fonts/Roboto-BoldItalic.woff deleted file mode 100644 index f375675..0000000 Binary files a/src/firefox/assets/fonts/Roboto-BoldItalic.woff and /dev/null differ diff --git a/src/firefox/assets/fonts/Roboto-Italic.woff b/src/firefox/assets/fonts/Roboto-Italic.woff deleted file mode 100644 index f892563..0000000 Binary files a/src/firefox/assets/fonts/Roboto-Italic.woff and /dev/null differ diff --git a/src/firefox/assets/fonts/Roboto-Light.woff b/src/firefox/assets/fonts/Roboto-Light.woff deleted file mode 100644 index 6bee3fe..0000000 Binary files a/src/firefox/assets/fonts/Roboto-Light.woff and /dev/null differ diff --git a/src/firefox/assets/fonts/Roboto-LightItalic.woff b/src/firefox/assets/fonts/Roboto-LightItalic.woff deleted file mode 100644 index 07bb14d..0000000 Binary files a/src/firefox/assets/fonts/Roboto-LightItalic.woff and /dev/null differ diff --git a/src/firefox/assets/fonts/Roboto-Medium.woff b/src/firefox/assets/fonts/Roboto-Medium.woff deleted file mode 100644 index 61b97d7..0000000 Binary files a/src/firefox/assets/fonts/Roboto-Medium.woff and /dev/null differ diff --git a/src/firefox/assets/fonts/Roboto-MediumItalic.woff b/src/firefox/assets/fonts/Roboto-MediumItalic.woff deleted file mode 100644 index e739234..0000000 Binary files a/src/firefox/assets/fonts/Roboto-MediumItalic.woff and /dev/null differ diff --git a/src/firefox/assets/fonts/Roboto-Regular.woff b/src/firefox/assets/fonts/Roboto-Regular.woff deleted file mode 100644 index 6ad7a39..0000000 Binary files a/src/firefox/assets/fonts/Roboto-Regular.woff and /dev/null differ diff --git a/src/firefox/assets/fonts/Roboto-Thin.woff b/src/firefox/assets/fonts/Roboto-Thin.woff deleted file mode 100644 index 004be18..0000000 Binary files a/src/firefox/assets/fonts/Roboto-Thin.woff and /dev/null differ diff --git a/src/firefox/assets/fonts/Roboto-ThinItalic.woff b/src/firefox/assets/fonts/Roboto-ThinItalic.woff deleted file mode 100644 index fd7b014..0000000 Binary files a/src/firefox/assets/fonts/Roboto-ThinItalic.woff and /dev/null differ diff --git a/src/firefox/js/background.js b/src/firefox/js/background.js index 61acdf9..6f19ac8 100644 --- 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 index 2484ec4..b7d9887 100644 --- 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 index b61a169..e57d457 100644 --- 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 index 541287b..d5cf207 100644 --- 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 index 2484ec4..b7d9887 100644 --- 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 index 130f5fa..fbc3e29 100644 --- 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",