Merge pull request #39 from MarcellPerger1/fix-w3schools

Try to reduce RAM usage for websites with ad iframes
MarcellPerger1 · Apr 7, 2024 · 468ec55 · 468ec55
2 parents 296e802 + 68d22ce
commit 468ec55
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/dist/debug/adblocker.debug.js b/dist/debug/adblocker.debug.js
diff --git a/dist/debug/bookmarklet.debug.txt b/dist/debug/bookmarklet.debug.txt
diff --git a/dist/release/adblocker.min.js b/dist/release/adblocker.min.js
diff --git a/dist/release/bookmarklet.min.txt b/dist/release/bookmarklet.min.txt
diff --git a/src/adblocker.js b/src/adblocker.js
@@ -85,10 +85,11 @@
   func: [
     {
       selector: '[class*="ad"],[id*="ad"]', 
+      /** This is the one that gets most of them, rest is just special cases */
       func(elem) {
         for (const name of [elem.id, ...elem.classList]) {
           // TODO also check lowercase followed by uppercase at end e.g. adBox
-          if(/(?<!lo|re|he)ad(vertisement)?s?(thrive)?(content)?(engine|ngin)?(container)?s?($|[-_,\s])/.test(name)) {
+          if(/(?<!lo|re|he)[aA]d(vertisement)?s?([tT]hrive)?([cC]ontent)?([eE]ngine|[nN]gin)?([cC]ontainer)?s?($|[-_,\s])/.test(name)) {
             return true;
           }
         }
@@ -105,6 +106,19 @@
         }
       }
     },
+    {
+      selector: 'html > iframe',
+      func(/** @type {HTMLIFrameElement} */elem) {
+        // Some sanity checks not to accidenally break websites
+        if(!(elem.sandbox.contains("allow-scripts") && elem.sandbox.contains("allow-same-origin") && elem.sandbox.length == 2)) {
+          return false;
+        }
+        if(!elem.src.toLowerCase().includes("gdpr")) { // Ad iframes very often include a `?gdpr=...` in the URL
+          return false;
+        }
+        return true;
+      }
+    },
   ],
   ignore: {
     selector: ["body", ".ad-layout", "#game-holder.game-holder-with-ad"],