From 56646dcc82dbab3eeb3b41fd2da470417f172d6f Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 5 Mar 2020 22:37:38 +0100 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 5 +- .../NordicFiltersABP.txt | 12 ++-- .../NordicFiltersAdGuard.txt | 13 ++-- .../NordicFiltersPrivacy.txt | 13 ++-- .../NordicFiltersPrivoxy.action | 5 +- .../XYZPrepareFilters.py | 66 +++++++++++++++++-- 6 files changed, 89 insertions(+), 25 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index aa2af6d20..0e50796dd 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 27February2020v2-Beta +# Version: 05March2020v2-Beta # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 @@ -43,7 +43,7 @@ msFilterList -d ads.no -d adservicemedia.dk -d akamai.net --d akamaihd.net video-assets +-d akamaihd.net -d amino.dk 240x140-forside-hardcoded*.jpg -d austevollforlag.no yachtmarine2014. -d banner.landbrugsavisen.dk reklame.aspx @@ -92,6 +92,7 @@ msFilterList -d webhotell.enivest.no -d feltet.dk Feltet.dk -d langrenn.com getfile.php +-d dnitv.com - annonse_ -d tv2a.dk -d tunnelsyn1.files.wordpress.com sotra-trelast-isolasjon diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index b86b5dd14..3c0578b6c 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 270220202 +! Version: 050320202 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdBlock and Adblock Plus) ! Expires: 12 hours @@ -174,7 +174,7 @@ rett24.no##.p_banner-responsive ||adserver.*.dk^ ||adservicemedia.dk ||akamai.net^$script,domain=eniro.se|eniro.no|eniro.dk -||akamaihd.net/video-assets/$media,rewrite=abp-resource:blank-mp3,domain=dplay.no +||akamaihd.net^$media,domain=dplay.no|dplay.dk ||amino.dk/images/partners/agera/240x140-forside-hardcoded*.jpg$image ||annonser.*.no^ ||austevollforlag.no/wp-content/*/yachtmarine2014.$image @@ -226,6 +226,7 @@ rett24.no##.p_banner-responsive ||webhotell.enivest.no^ ||feltet.dk/octo_cms/files/Feltet.dk//^$image ||langrenn.com/getbanner.php/*/getfile.php/$image +||dnitv.com^$media,domain=dplay.dk utrop.no##.lazyautosizes utrop.no#?#.td-pb-span4:-abp-contains(ANNONSØRINNHOLD) /annonse_$image @@ -604,6 +605,7 @@ kanalfrederikshavn.dk###c1670 m.kanalfrederikshavn.dk##.OA m.kanalfrederikshavn.dk##.OX tv2.no#?#.large-12:not(.article-figure):not(:-abp-has(a)):not(:-abp-has(img)) +finn.no##article[id^=ad-stream_] fyens.dk##.adblock__text jv.dk##.adblock friflyt.no###ads_fullwidth_container @@ -770,7 +772,7 @@ krom.is#@#.share-container ! 🇮🇸: ——— And-and-auglýsingshindrun ——— ! 🇬🇧: ——— Anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion ——— @@*.dk/assets/templates/*/ads.png$image,domain=maskinbladet.dk|agrar-plus.dk|fritidsmarkedet.dk|dagensbyggeri.dk|maskinteknik.dk|gronteknik.dk -@@||5e529.v.fwmrm.net/ad/$script,domain=dplay.no|dplay.dk +@@||fwmrm.net/ad/$script,domain=dplay.no|dplay.dk @@||bondebladet.screen9.tv^$generichide @@||eurosport.*^$generichide @@||sixscissors.com^$third-party,domain=itavisen.no @@ -782,9 +784,9 @@ langaa-guiden.dk,madforfattigroeve.dk##div[class][style*="z-index: 9999999; opac langaa-guiden.dk,madforfattigroeve.dk##div[class][style^="z-index: 999999; background: rgba"] minmote.no,godt.no##.adblock-info tv2.no#$#abort-current-inline-script adblockDetector -||dni-adops-proxy-prod-adopsmediaconverter.mercury.dnitv.com/$media,rewrite=abp-resource:blank-mp3,domain=dplay.dk|dplay.no +||dni-adops-proxy-prod-adopsmediaconverter.mercury.dnitv.com/$media,rewrite=abp-resource:blank-mp3,domain=dplay.no|dplay.dk ||elderlyscissors.com^ -||imasdk.googleapis.com/pal/sdkloader/pal.js$script,rewrite=abp-resource:blank-js,domain=dplay.dk|dplay.no +||imasdk.googleapis.com/pal/sdkloader/pal.js$script,rewrite=abp-resource:blank-js,domain=dplay.no|dplay.dk ||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,~third-party @@/js/ads.js$~third-party,domain=tvkampen.com|tvsporten.dk @@||www.tv2.no/s/js/ads.js$script,~third-party diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index d9ab8a412..e5e600c36 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 27February2020v2 +! Version: 05March2020v2 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard) ! Expires: 12 hours @@ -177,7 +177,7 @@ rett24.no##.p_banner-responsive ||adserver.*.dk^ ||adservicemedia.dk ||akamai.net^$script,domain=eniro.se|eniro.no|eniro.dk -||akamaihd.net/video-assets/$media,mp4,domain=dplay.no +||akamaihd.net^$media,domain=dplay.no|dplay.dk ||amino.dk/images/partners/agera/240x140-forside-hardcoded*.jpg$image ||annonser.*.no^ ||austevollforlag.no/wp-content/*/yachtmarine2014.$image @@ -229,6 +229,8 @@ rett24.no##.p_banner-responsive ||webhotell.enivest.no^ ||feltet.dk/octo_cms/files/Feltet.dk//^$image ||langrenn.com/getbanner.php/*/getfile.php/$image +||dnitv.com^$media,domain=dplay.dk +dplay.*##[class^=notificationArea] utrop.no##.lazyautosizes utrop.no#?#.td-pb-span4:-abp-contains(ANNONSØRINNHOLD) /annonse_$image @@ -620,6 +622,7 @@ kanalfrederikshavn.dk###c1670 m.kanalfrederikshavn.dk##.OA m.kanalfrederikshavn.dk##.OX tv2.no#?#.large-12:not(.article-figure):not(:-abp-has(a)):not(:-abp-has(img)) +finn.no##article[id^=ad-stream_] fyens.dk##.adblock__text jv.dk##.adblock friflyt.no###ads_fullwidth_container @@ -787,7 +790,7 @@ krom.is#@#.share-container ! 🇮🇸: ——— And-and-auglýsingshindrun ——— ! 🇬🇧: ——— Anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion ——— @@*.dk/assets/templates/*/ads.png$image,domain=maskinbladet.dk|agrar-plus.dk|fritidsmarkedet.dk|dagensbyggeri.dk|maskinteknik.dk|gronteknik.dk -@@||5e529.v.fwmrm.net/ad/$script,domain=dplay.no|dplay.dk +@@||fwmrm.net/ad/$script,domain=dplay.no|dplay.dk @@||bondebladet.screen9.tv^$generichide @@||eurosport.*^$generichide @@||sixscissors.com^$third-party,domain=itavisen.no @@ -803,9 +806,9 @@ minmote.no,godt.no##.adblock-info techstart.dk##+js(set, adblock, false) tv2.no##+js(acis, adblockDetector) vg.no##+js(aeld, load, concat) -||dni-adops-proxy-prod-adopsmediaconverter.mercury.dnitv.com/$media,redirect=noopmp3-0.1s,domain=dplay.dk|dplay.no +||dni-adops-proxy-prod-adopsmediaconverter.mercury.dnitv.com/$media,redirect=noopmp3-0.1s,domain=dplay.no|dplay.dk ||elderlyscissors.com^ -||imasdk.googleapis.com/pal/sdkloader/pal.js$script,redirect=noopjs,domain=dplay.dk|dplay.no +||imasdk.googleapis.com/pal/sdkloader/pal.js$script,redirect=noopjs,domain=dplay.no|dplay.dk ||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,~third-party @@/js/ads.js$~third-party,domain=tvkampen.com|tvsporten.dk @@||www.tv2.no/s/js/ads.js$script,~third-party diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 72840a53b..9f79422c4 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 27February2020v2 +! Version: 05March2020v2 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) ! Expires: 12 hours @@ -177,7 +177,7 @@ rett24.no##.p_banner-responsive ||adserver.*.dk^ ||adservicemedia.dk ||akamai.net^$script,domain=eniro.se|eniro.no|eniro.dk -||akamaihd.net/video-assets/$media,redirect=noopmp4-1s,domain=dplay.no +||akamaihd.net^$media,domain=dplay.no|dplay.dk ||amino.dk/images/partners/agera/240x140-forside-hardcoded*.jpg$image ||annonser.*.no^ ||austevollforlag.no/wp-content/*/yachtmarine2014.$image @@ -229,6 +229,8 @@ rett24.no##.p_banner-responsive ||webhotell.enivest.no^ ||feltet.dk/octo_cms/files/Feltet.dk//^$image ||langrenn.com/getbanner.php/*/getfile.php/$image +||dnitv.com^$media,domain=dplay.dk +dplay.*##[class^=notificationArea] utrop.no##.lazyautosizes utrop.no#?#.td-pb-span4:-abp-contains(ANNONSØRINNHOLD) /annonse_$image @@ -620,6 +622,7 @@ kanalfrederikshavn.dk###c1670 m.kanalfrederikshavn.dk##.OA m.kanalfrederikshavn.dk##.OX tv2.no#?#.large-12:not(.article-figure):not(:-abp-has(a)):not(:-abp-has(img)) +finn.no##article[id^=ad-stream_] fyens.dk##.adblock__text jv.dk##.adblock friflyt.no###ads_fullwidth_container @@ -787,7 +790,7 @@ krom.is#@#.share-container ! 🇮🇸: ——— And-and-auglýsingshindrun ——— ! 🇬🇧: ——— Anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion ——— @@*.dk/assets/templates/*/ads.png$image,domain=maskinbladet.dk|agrar-plus.dk|fritidsmarkedet.dk|dagensbyggeri.dk|maskinteknik.dk|gronteknik.dk -@@||5e529.v.fwmrm.net/ad/$script,domain=dplay.no|dplay.dk +@@||fwmrm.net/ad/$script,domain=dplay.no|dplay.dk @@||bondebladet.screen9.tv^$generichide @@||eurosport.*^$generichide @@||sixscissors.com^$3p,domain=itavisen.no @@ -803,9 +806,9 @@ minmote.no,godt.no##.adblock-info techstart.dk##+js(set, adblock, false) tv2.no##+js(acis, adblockDetector) vg.no##+js(aeld, load, concat) -||dni-adops-proxy-prod-adopsmediaconverter.mercury.dnitv.com/$media,redirect=noopmp3-0.1s,domain=dplay.dk|dplay.no +||dni-adops-proxy-prod-adopsmediaconverter.mercury.dnitv.com/$media,redirect=noopmp3-0.1s,domain=dplay.no|dplay.dk ||elderlyscissors.com^ -||imasdk.googleapis.com/pal/sdkloader/pal.js$script,redirect=noopjs,domain=dplay.dk|dplay.no +||imasdk.googleapis.com/pal/sdkloader/pal.js$script,redirect=noopjs,domain=dplay.no|dplay.dk ||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,1p @@/js/ads.js$1p,domain=tvkampen.com|tvsporten.dk @@||www.tv2.no/s/js/ads.js$script,1p diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index a9db7220f..58b6256c6 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 27February2020v2-Alpha +# Version: 05March2020v2-Alpha # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy) # Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy) # Expires: 12 hours @@ -58,7 +58,7 @@ contentMarketing .adserver.*.dk .adservicemedia.dk .akamai.net -.akamaihd.net/video-assets/ +.akamaihd.net .amino.dk/images/partners/agera/240x140-forside-hardcoded*.jpg .annonser.*.no .austevollforlag.no/wp-content/*/yachtmarine2014. @@ -110,6 +110,7 @@ contentMarketing .webhotell.enivest.no .feltet.dk/octo_cms/files/Feltet.dk// .langrenn.com/getbanner.php/*/getfile.php/ +.dnitv.com /annonse_ # .tv2a.dk diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 5477beaef..fd84b9f48 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -450,12 +450,6 @@ def prepare_abp(lines) -> str: line ) - line = re.sub( - r"##\+js\(acis, (.*)\)", - r"#$#abort-current-inline-script \1", - line - ) - line = re.sub( r"(#\$#.*),", r"\1", @@ -474,6 +468,66 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"([a-z*])#[?]?#(.*):nth-ancestor(1)", + r"\1#?#*:-abp-has(:scope > \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):nth-ancestor(2)", + r"\1#?#*:-abp-has(:scope > * > \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):nth-ancestor(3)", + r"\1#?#*:-abp-has(:scope > * > * > \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):nth-ancestor(4)", + r"\1#?#*:-abp-has(:scope > * > * > * > \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):nth-ancestor(5)", + r"\1#?#*:-abp-has(:scope > * > * > * > * > \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):nth-ancestor(6)", + r"\1#?#*:-abp-has(:scope > * > * > * > * > * > \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):nth-ancestor(7)", + r"\1#?#*:-abp-has(:scope > * > * > * > * > * > * > \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):nth-ancestor(8)", + r"\1#?#*:-abp-has(:scope > * > * > * > * > * > * > * > \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):nth-ancestor(9)", + r"\1#?#*:-abp-has(:scope > * > * > * > * > * > * > * > * > \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):nth-ancestor(10)", + r"\1#?#*:-abp-has(:scope > * > * > * > * > * > * > * > * > * > \2)", + line + ) + if is_supported_abp(line): text += line + '\r\n'