Update the DOM blocker filters (#920)

resources/content_blocking/filters.ts

@@ -221,7 +221,7 @@ const filters: FilterList = {
   },
   listKr: {
     title: 'List-KR',
-    file: 'https://raw.githubusercontent.com/List-KR/List-KR/master/filter.txt',
+    file: 'https://raw.githubusercontent.com/List-KR/List-KR/master/filter-uBlockOrigin.txt',
   },
   adBlockFinland: {
     title: 'Adblock List for Finland',

rollup.config.ts

@@ -4,6 +4,8 @@ import jsonPlugin from '@rollup/plugin-json'
 import nodeResolvePlugin from '@rollup/plugin-node-resolve'
 import typescriptPlugin from '@rollup/plugin-typescript'
 import terserPlugin from '@rollup/plugin-terser'
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore Otherwise ts-node reject to run make_selectors_tester.ts
 import dtsPlugin from 'rollup-plugin-dts'
 import licensePlugin from 'rollup-plugin-license'
 import terserConfig from './terser.config'

src/sources/dom_blockers.ts

@@ -23,24 +23,24 @@ export function getFilters(): Filters {
       '#Iklan-Melayang',
       '#Kolom-Iklan-728',
       '#SidebarIklan-wrapper',
-      fromB64('YVt0aXRsZT0iN25hZ2EgcG9rZXIiIGld'),
       '[title="ALIENBOLA" i]',
+      fromB64('I0JveC1CYW5uZXItYWRz'),
     ],
-    abpvn: [
-      '#quangcaomb',
-      fromB64('Lmlvc0Fkc2lvc0Fkcy1sYXlvdXQ='),
-      '.quangcao',
-      fromB64('W2hyZWZePSJodHRwczovL3I4OC52bi8iXQ=='),
-      fromB64('W2hyZWZePSJodHRwczovL3piZXQudm4vIl0='),
-    ],
+    abpvn: ['.quangcao', '#mobileCatfish', fromB64('LmNsb3NlLWFkcw=='), '[id^="bn_bottom_fixed_"]', '#pmadv'],
     adBlockFinland: [
       '.mainostila',
       fromB64('LnNwb25zb3JpdA=='),
       '.ylamainos',
       fromB64('YVtocmVmKj0iL2NsaWNrdGhyZ2guYXNwPyJd'),
       fromB64('YVtocmVmXj0iaHR0cHM6Ly9hcHAucmVhZHBlYWsuY29tL2FkcyJd'),
     ],
-    adBlockPersian: ['#navbar_notice_50', '.kadr', 'TABLE[width="140px"]', '#divAgahi', fromB64('I2FkMl9pbmxpbmU=')],
+    adBlockPersian: [
+      '#navbar_notice_50',
+      '.kadr',
+      'TABLE[width="140px"]',
+      '#divAgahi',
+      fromB64('YVtocmVmXj0iaHR0cDovL2cxLnYuZndtcm0ubmV0L2FkLyJd'),
+    ],
     adBlockWarningRemoval: [
       '#adblock-honeypot',
       '.adblocker-root',
@@ -49,46 +49,40 @@ export function getFilters(): Filters {
       fromB64('I2FkX2Jsb2NrZXI='),
     ],
     adGuardAnnoyances: [
-      'amp-embed[type="zen"]',
       '.hs-sosyal',
       '#cookieconsentdiv',
       'div[class^="app_gdpr"]',
       '.as-oil',
+      '[data-cypress="soft-push-notification-modal"]',
     ],
     adGuardBase: [
       '.BetterJsPopOverlay',
       fromB64('I2FkXzMwMFgyNTA='),
       fromB64('I2Jhbm5lcmZsb2F0MjI='),
-      fromB64('I2FkLWJhbm5lcg=='),
       fromB64('I2NhbXBhaWduLWJhbm5lcg=='),
+      fromB64('I0FkLUNvbnRlbnQ='),
     ],
     adGuardChinese: [
       fromB64('LlppX2FkX2FfSA=='),
-      fromB64('YVtocmVmKj0iL29kMDA1LmNvbSJd'),
       fromB64('YVtocmVmKj0iLmh0aGJldDM0LmNvbSJd'),
-      '.qq_nr_lad',
       '#widget-quan',
+      fromB64('YVtocmVmKj0iLzg0OTkyMDIwLnh5eiJd'),
+      fromB64('YVtocmVmKj0iLjE5NTZobC5jb20vIl0='),
     ],
     adGuardFrench: [
-      fromB64('I2Jsb2NrLXZpZXdzLWFkcy1zaWRlYmFyLWJsb2NrLWJsb2Nr'),
       '#pavePub',
       fromB64('LmFkLWRlc2t0b3AtcmVjdGFuZ2xl'),
       '.mobile_adhesion',
       '.widgetadv',
+      fromB64('LmFkc19iYW4='),
     ],
-    adGuardGerman: [
-      fromB64('LmJhbm5lcml0ZW13ZXJidW5nX2hlYWRfMQ=='),
-      fromB64('LmJveHN0YXJ0d2VyYnVuZw=='),
-      fromB64('LndlcmJ1bmcz'),
-      fromB64('YVtocmVmXj0iaHR0cDovL3d3dy5laXMuZGUvaW5kZXgucGh0bWw/cmVmaWQ9Il0='),
-      fromB64('YVtocmVmXj0iaHR0cHM6Ly93d3cudGlwaWNvLmNvbS8/YWZmaWxpYXRlSWQ9Il0='),
-    ],
+    adGuardGerman: ['aside[data-portal-id="leaderboard"]'],
     adGuardJapanese: [
       '#kauli_yad_1',
       fromB64('YVtocmVmXj0iaHR0cDovL2FkMi50cmFmZmljZ2F0ZS5uZXQvIl0='),
       fromB64('Ll9wb3BJbl9pbmZpbml0ZV9hZA=='),
       fromB64('LmFkZ29vZ2xl'),
-      fromB64('LmFkX3JlZ3VsYXIz'),
+      fromB64('Ll9faXNib29zdFJldHVybkFk'),
     ],
     adGuardMobile: [
       fromB64('YW1wLWF1dG8tYWRz'),
@@ -102,7 +96,7 @@ export function getFilters(): Filters {
       fromB64('LnJlY2xhbWE='),
       'div[id^="smi2adblock"]',
       fromB64('ZGl2W2lkXj0iQWRGb3hfYmFubmVyXyJd'),
-      fromB64('I2FkX3NxdWFyZQ=='),
+      '#psyduckpockeball',
     ],
     adGuardSocial: [
       fromB64('YVtocmVmXj0iLy93d3cuc3R1bWJsZXVwb24uY29tL3N1Ym1pdD91cmw9Il0='),
@@ -111,13 +105,7 @@ export function getFilters(): Filters {
       '#inlineShare',
       '.popup-social',
     ],
-    adGuardSpanishPortuguese: [
-      '#barraPublicidade',
-      '#Publicidade',
-      '#publiEspecial',
-      '#queTooltip',
-      fromB64('W2hyZWZePSJodHRwOi8vYWRzLmdsaXNwYS5jb20vIl0='),
-    ],
+    adGuardSpanishPortuguese: ['#barraPublicidade', '#Publicidade', '#publiEspecial', '#queTooltip', '.cnt-publi'],
     adGuardTrackingProtection: [
       '#qoo-counter',
       fromB64('YVtocmVmXj0iaHR0cDovL2NsaWNrLmhvdGxvZy5ydS8iXQ=='),
@@ -132,33 +120,27 @@ export function getFilters(): Filters {
       fromB64('YVtocmVmXj0iaHR0cDovL2l6bGVuemkuY29tL2NhbXBhaWduLyJd'),
       fromB64('YVtocmVmXj0iaHR0cDovL3d3dy5pbnN0YWxsYWRzLm5ldC8iXQ=='),
     ],
-    bulgarian: [
-      fromB64('dGQjZnJlZW5ldF90YWJsZV9hZHM='),
-      '#ea_intext_div',
-      '.lapni-pop-over',
-      '#xenium_hot_offers',
-      fromB64('I25ld0Fk'),
-    ],
+    bulgarian: [fromB64('dGQjZnJlZW5ldF90YWJsZV9hZHM='), '#ea_intext_div', '.lapni-pop-over', '#xenium_hot_offers'],
     easyList: [
-      fromB64('I0FEX0NPTlRST0xfMjg='),
-      fromB64('LnNlY29uZC1wb3N0LWFkcy13cmFwcGVy'),
-      '.universalboxADVBOX03',
-      fromB64('LmFkdmVydGlzZW1lbnQtNzI4eDkw'),
-      fromB64('LnNxdWFyZV9hZHM='),
+      '.yb-floorad',
+      fromB64('LndpZGdldF9wb19hZHNfd2lkZ2V0'),
+      fromB64('LnRyYWZmaWNqdW5reS1hZA=='),
+      '.textad_headline',
+      fromB64('LnNwb25zb3JlZC10ZXh0LWxpbmtz'),
     ],
     easyListChina: [
-      fromB64('YVtocmVmKj0iLndlbnNpeHVldGFuZy5jb20vIl0='),
       fromB64('LmFwcGd1aWRlLXdyYXBbb25jbGljayo9ImJjZWJvcy5jb20iXQ=='),
       fromB64('LmZyb250cGFnZUFkdk0='),
       '#taotaole',
       '#aafoot.top_box',
+      '.cfa_popup',
     ],
     easyListCookie: [
-      '#AdaCompliance.app-notice',
-      '.text-center.rgpd',
-      '.panel--cookie',
-      '.js-cookies-andromeda',
-      '.elxtr-consent',
+      '.ezmob-footer',
+      '.cc-CookieWarning',
+      '[data-cookie-number]',
+      fromB64('LmF3LWNvb2tpZS1iYW5uZXI='),
+      '.sygnal24-gdpr-modal-wrap',
     ],
     easyListCzechSlovak: [
       '#onlajny-stickers',
@@ -175,11 +157,11 @@ export function getFilters(): Filters {
       '#semilo-lrectangle',
     ],
     easyListGermany: [
-      fromB64('I0FkX1dpbjJkYXk='),
-      fromB64('I3dlcmJ1bmdzYm94MzAw'),
-      fromB64('YVtocmVmXj0iaHR0cDovL3d3dy5yb3RsaWNodGthcnRlaS5jb20vP3NjPSJd'),
-      fromB64('I3dlcmJ1bmdfd2lkZXNreXNjcmFwZXJfc2NyZWVu'),
-      fromB64('YVtocmVmXj0iaHR0cDovL2xhbmRpbmcucGFya3BsYXR6a2FydGVpLmNvbS8/YWc9Il0='),
+      '#SSpotIMPopSlider',
+      fromB64('LnNwb25zb3JsaW5rZ3J1ZW4='),
+      fromB64('I3dlcmJ1bmdza3k='),
+      fromB64('I3Jla2xhbWUtcmVjaHRzLW1pdHRl'),
+      fromB64('YVtocmVmXj0iaHR0cHM6Ly9iZDc0Mi5jb20vIl0='),
     ],
     easyListItaly: [
       fromB64('LmJveF9hZHZfYW5udW5jaQ=='),
@@ -196,13 +178,7 @@ export function getFilters(): Filters {
       fromB64('aW1nW2FsdD0iSG9zdGluZ2FzIFNlcnZlcmlhaS5sdCJd'),
     ],
     estonian: [fromB64('QVtocmVmKj0iaHR0cDovL3BheTRyZXN1bHRzMjQuZXUiXQ==')],
-    fanboyAnnoyances: [
-      '#feedback-tab',
-      '#taboola-below-article',
-      '.feedburnerFeedBlock',
-      '.widget-feedburner-counter',
-      '[title="Subscribe to our blog"]',
-    ],
+    fanboyAnnoyances: ['#ac-lre-player', '.navigate-to-top', '#subscribe_popup', '.newsletter_holder', '#back-top'],
     fanboyAntiFacebook: ['.util-bar-module-firefly-visible'],
     fanboyEnhancedTrackers: [
       '.open.pushModal',
@@ -211,13 +187,7 @@ export function getFilters(): Filters {
       'div[class$="-hide"][zoompage-fontsize][style="display: block;"]',
       '.BlockNag__Card',
     ],
-    fanboySocial: [
-      '.td-tags-and-social-wrapper-box',
-      '.twitterContainer',
-      '.youtube-social',
-      'a[title^="Like us on Facebook"]',
-      'img[alt^="Share on Digg"]',
-    ],
+    fanboySocial: ['#FollowUs', '#meteored_share', '#social_follow', '.article-sharer', '.community__social-desc'],
     frellwitSwedish: [
       fromB64('YVtocmVmKj0iY2FzaW5vcHJvLnNlIl1bdGFyZ2V0PSJfYmxhbmsiXQ=='),
       fromB64('YVtocmVmKj0iZG9rdG9yLXNlLm9uZWxpbmsubWUiXQ=='),
@@ -243,8 +213,8 @@ export function getFilters(): Filters {
       '.alert-info[data-block-track*="CookieNotice"]',
       '.ModuleTemplateCookieIndicator',
       '.o--cookies--container',
-      '.cookie-msg-info-container',
       '#cookies-policy-sticky',
+      '#stickyCookieBar',
     ],
     icelandicAbp: [fromB64('QVtocmVmXj0iL2ZyYW1ld29yay9yZXNvdXJjZXMvZm9ybXMvYWRzLmFzcHgiXQ==')],
     latvian: [
@@ -287,10 +257,10 @@ export function getFilters(): Filters {
     ],
     ro: [
       fromB64('YVtocmVmXj0iLy9hZmZ0cmsuYWx0ZXgucm8vQ291bnRlci9DbGljayJd'),
-      'a[href^="/magazin/"]',
       fromB64('YVtocmVmXj0iaHR0cHM6Ly9ibGFja2ZyaWRheXNhbGVzLnJvL3Ryay9zaG9wLyJd'),
       fromB64('YVtocmVmXj0iaHR0cHM6Ly9ldmVudC4ycGVyZm9ybWFudC5jb20vZXZlbnRzL2NsaWNrIl0='),
       fromB64('YVtocmVmXj0iaHR0cHM6Ly9sLnByb2ZpdHNoYXJlLnJvLyJd'),
+      'a[href^="/url/"]',
     ],
     ruAd: [
       fromB64('YVtocmVmKj0iLy9mZWJyYXJlLnJ1LyJd'),
@@ -370,6 +340,9 @@ export async function getBlockedSelectors<T extends string>(selectors: readonly
   // browser will alternate tree modification and layout reading, that is very slow.
   for (let i = 0; i < selectors.length; ++i) {
     const element = selectorToElement(selectors[i])
+    if (element.tagName === 'DIALOG') {
+      ;(element as HTMLDialogElement).show()
+    }
     const holder = d.createElement('div') // Protects from unwanted effects of `+` and `~` selectors of filters
     forceShow(holder)
     holder.appendChild(element)