From d882b006c31b8bf13ffe928350ee629b14c293c0 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 19 Aug 2020 15:54:13 +0200 Subject: [PATCH] Incorporated various feedbacks from the ABP team Also made a critical hotfix for sporttv.is --- .../DandelionSproutsNorskeFiltre.tpl | 32 ++-- .../NordicFiltersABP-Inclusion.txt | 69 ++------ .../NordicFiltersABP.txt | 91 +++++----- .../NordicFiltersAdGuard.txt | 91 +++++----- .../NordicFiltersBrave.txt | 32 ++-- .../NordicFiltersPrivacy.txt | 91 +++++----- .../NordicFiltersPrivoxy.action | 29 ++-- .../XYZPrepareFilters.py | 164 +++++++++++++++++- 8 files changed, 365 insertions(+), 234 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 98bd57397..5fb1f2369 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 18August2020v3-Alpha +# Version: 19August2020v2-Alpha # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 @@ -381,18 +381,6 @@ _toppbanner_ # 🇬🇧: ——— Tries to make the web browser load files in HTTPS, if the website itself doesn't automatically redirect from HTTP to its HTTPS version ——— # Credit to https://raw.githubusercontent.com/Cybo1927/Hosts/master/Anti/Anti%2520Third-Party%2520HTTP/for/showing me the existence of this particular CSP command. # Though in all fairness, you'd get better results from using https://github.com/ilGur1132/Smart-HTTPS/as/your/main/solution/for these kinds of HTTPS upgrades. -# 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— -# Takk til THEtomaso (https://github.com/THEtomaso)/for/de/fleste/av/disse/oppføringene. -# 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— -# Tak til THEtomaso (https://github.com/THEtomaso)/for/de/fleste/af/disse/regler. -# 🇬🇧: ——— De-blurrers for paid articles (so that the last few lines of a preview doesn't fade out) ——— -# Thanks to THEtomaso (https://github.com/THEtomaso)/for/most/of/these/entries. --d dagligvarehandelen.no veil.png -# dagbladet.no,elbil24.no -# digi.no, tu.no, medier24.no, porten.no -# https://www.klikk.no/side3/vimenn/viggo-bloffet-hele-norge-6857944 -# https://www.vg.no/nyheter/i/y3Mka2//(08/04/2020) -# https://www.vg.no/nyheter/innenriks/i/3JbRzv/ (09 04 2020) # 🇳🇴: Anti-'CPU-massakrering' # 🇮🇸: And-örgjörvislatrun # 🇬🇧: Anti-'CPU slaughtering' @@ -435,6 +423,10 @@ _toppbanner_ # 🇳🇴: Falske innlastinger som sløser bort tid # 🇩🇰: Falske indlastinger, der søler bort tid # 🇬🇧: Fake loading screens that waste time +# "Generic Hide" ++d bondebladet.screen9.tv ++d eurosport.no ++d eurosport.dk # 🇬🇧: Category: Compatibility entries for ABP users, EasyList, and or functionality whitelisting # 🇳🇴: Hurtigfikser for Internet Explorer 11 # 🇮🇸: Skyndilausn fyrir Internet Explorer 11 @@ -684,6 +676,18 @@ _toppbanner_ -d brigitteheilmann.dk -d storustovu.dk -d campingnews.dk +# 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— +# Takk til THEtomaso (https://github.com/THEtomaso)/for/de/fleste/av/disse/oppføringene. +# 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— +# Tak til THEtomaso (https://github.com/THEtomaso)/for/de/fleste/af/disse/regler. +# 🇬🇧: ——— De-blurrers for paid articles (so that the last few lines of a preview doesn't fade out) ——— +# Thanks to THEtomaso (https://github.com/THEtomaso)/for/most/of/these/entries. +-d dagligvarehandelen.no veil.png +# dagbladet.no,elbil24.no +# digi.no, tu.no, medier24.no, porten.no +# https://www.klikk.no/side3/vimenn/viggo-bloffet-hele-norge-6857944 +# https://www.vg.no/nyheter/i/y3Mka2//(08/04/2020) +# https://www.vg.no/nyheter/innenriks/i/3JbRzv/ (09 04 2020) # 🇳🇴 🇩🇰: ——— Anti-anti-reklameblokkering ——— # 🇮🇸: ——— And-and-auglýsingshindrun ——— # 🇬🇧: ——— Anti-anti-adblocking ——— @@ -692,8 +696,6 @@ _toppbanner_ -d dni-adops-proxy-prod-adopsmediaconverter.mercury.dnitv.com -d elderlyscissors.com -d imasdk.googleapis.com pal.js -+d bondebladet.screen9.tv -+d eurosport.* +d sixscissors.com +d bildeler.name +d reservedele.name diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index 135388b4e..60ee375b8 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 180820203 +! Version: 190820202 ! Title: 🏔️ Dandelion Sprouts vestnordiske filtre for ryddigere nettsider (for Adblock Plus - Møter ABP sine inkluderingsregler) ! Translated title: Dandelion Sprout's West Nordic filters for tidier websites (for Adblock Plus with ABP inclusion compliance) ! Expires: 12 hours @@ -65,7 +65,7 @@ e24.no##.bg-xAdrow e24.no##.content-marketing-container e24.no##a[href*="/go.click?"] ekstrabladet.dk##.advertorials -ekstrabladet.dk##a[href^="https://click-dk.plista.com/csc?"] + ekstrabladet.dk#?#div[class^="df-article "]:-abp-has(span:-abp-contains(Annoncørbetalt indhold)) feltet.dk###struct_topBanner feltet.dk##.box_300_default @@ -86,7 +86,6 @@ hvat.fo##.vev-wrap itavisen.no##.article-ad-video itavisen.no##.itavi-homepage-video-player-instream itavisen.no##.sponsored -itavisen.no#?#.item:not(:-abp-contains(TEST)):-abp-has(.meta:-abp-contains(/^Annonse$/)) itavisen.no#?#.spklw-post:-abp-has(a[href*=smartadserver]) jn.fo###the_banners kanalen.no##.bannergroup @@ -153,14 +152,12 @@ tvh.no##.article-contentmarketing tvkampen.com,tvsporten.dk#$#abort-on-property-write onload tvkampen.com,tvsporten.dk##a.p-icon.partner utrop.no#?#.td-pb-span4:-abp-contains(ANNONSØRINNHOLD) -vartoslo.no#?#.vc_column-inner:-abp-has(.vo-annonse):not(:-abp-has(div[class^=td_module_])):not(:-abp-has(#sb_instagram)) vb.is##.spons veier24.no,tu.no,digi.no##.top-poster-wrap vg.no#$#abort-current-inline-script Math.floor g00 vg.no##.betting-widgets vg.no##.tipster vg.no##.wid-betting -vg.no#?#.partner-studio:not(:-abp-has(a[href*="/nordiskfilm/"])) vg.no,e24.no,gamer.no,tek.no,digi.no#$#abort-on-property-write __AB__ vgtv.no##.apnx-container vgtv.no##.video-branding @@ -658,7 +655,6 @@ gamer.no##.aaa-980x150 gamer.no##.aaa-placeholder gamer.no##.pst-placeholder gaysir.no##.ad_wrapper_content -gjerrigknark.com#?#.dividerBlock:not(:-abp-has(.dividerBlockNewsletterSubscribe)) godt.no##[class^=advert] google.no,google.dk,google.is###cnsi ~ [jsaction*=dismiss] gratiskryssord.no###adSign @@ -686,7 +682,7 @@ hwt.dk#?#.box.text-center:-abp-has(script[src^="//ads."]) information.dk##.masthead installator.dk##.addon--ad itavisen.no##.\35 00Add:not(.homepage-video-area) -itavisen.no##.ad:before +itavisen.no##.ad::before itavisen.no#?#*:-abp-has(> .comcontent) itavisen.no##.fifth-article-ad itavisen.no##.itavi-after-content @@ -738,11 +734,7 @@ markedsforing.dk##.banner-annonce markedsforing.dk#?#.row-second:-abp-has(div[class*=banner-annonce]) matematikbogen.dk##td:nth-of-type(3) matoppskrift.no#?##sticky:-abp-has(> .adsbygoogle) -matoppskrift.no#?#.text-center:not(:-abp-has(img)) -mbl.is#?#.col-sm-6.col-12:-abp-has(.augl):not(:-abp-has(.fluid)) medier24.no##.ad-toppbanner-article -menn.is#?#.vc_column-inner:-abp-has(.mobile-ad):not(:-abp-has(a)) -menn.is#?#.vc_column:-abp-has(.mobile-ad):not(:-abp-has(a)) meremobil.dk##.a-single meremobil.dk#?##header > div:-abp-has(div[id*=gpt-ad-]) min-mave.dk##.topAdBannerFixed @@ -825,7 +817,7 @@ sognavis.no##.row.hidden-print:not(.vspace) spillespill.no###bannerAdmeenRectangleTopContainer spillespill.no##.banner-leaderboard spillespill.no##.push -sporttv.is#?#*:-abp-has(> .row div[class^="auglysing-"]) +sporttv.is#?#.row *:-abp-has(> div[class^="auglysing-"]) sporttv.is##div.col-xs-4.items:nth-of-type(5) > .box sporttv.is#?#.box:-abp-has(div[class^=auglysing-]) sporttv.is,utdanningsnytt.no##.banner-right @@ -840,15 +832,13 @@ studievalg.no###top-announce superchat.dk###topbanner_container superchat.dk#?#*:-abp-has(> div[id^=div-ppas]) sva.no##.code-block-1 -sva.no#?#.widget_text:not(:-abp-has(a)) -sva.no#?#section:not(:-abp-has(a)) sveip.net#?#*:-abp-has(> .adsbygoogle) sveip.net##.app_ad2 sveip.no##.notnews sysla.no##.ad-nexus-ad tek.no###application > div[class]:nth-of-type(1):nth-last-of-type(2) tek.no#?#*:-abp-has(> #topboard) -tek.no##body:before +tek.no##body::before tek.no##div[class^=styles__] tek.no##section[class*=canvas] tek.no#?#article > div:-abp-contains(/^annonse$/) @@ -930,7 +920,6 @@ babyklar.dk##.top_header babyklar.dk##.text_box altomcamping.dk##.article-content > div[style^=width] hjartalif.is#?#aside.WP_Editor_Widget:-abp-has(script) -hjartalif.is#?#.tdc-row:not(:-abp-has(a)) kjarninn.is#?#.boxlist:-abp-has(.adspot-article-wrapper) gaming.fo###sticky_ad vg.no#?#.bundle li[class^=css-]:-abp-has(div[data-ad-subtype]) @@ -950,7 +939,7 @@ canariajournalen.no##.ad-separator canariajournalen.no##.ad-separator-top thainytt.no##.blog-entry > .stacks_out thaiguiden.no#?#*:-abp-has(> * > * > * > * > .adsbygoogle) -tek.no##div:-abp-properties(min-height: 165px) +tek.no#?#div:-abp-properties(min-height: 165px) teknologia.no#?#.widget_text:-abp-has(.adsbygoogle) opn.no###sidebar_2 #sidebarelement_2 kondis.no##.wallpaperad @@ -1102,8 +1091,6 @@ tnt-tv.no,tnt-tv.dk##.logos tnt-tv.no,tnt-tv.dk##.tabs_placeholder avvir.no###block-block-1 > p:nth-of-type(4) dyrevennene.no##.td-footer-wrapper -yrkesbil.no#?#tr:-abp-contains(/^\xA0$/):not(:-abp-contains(/\S/)):not(:-abp-has(img)) -yrkesbil.no#?#td:-abp-contains(/^\xA0$/):not(:-abp-contains(/\S/)):not(:-abp-has(img)) kvf.fo##.panels-flexible-row-grein-rnd-13 oyggjatidindi.com##.bottom_space @@ -1163,7 +1150,7 @@ danishfamilysearch.dk#@#iframe[width="300"][height="250"] ! https://old.reddit.com/r/uBlockOrigin/comments/gye2f2/cant_watch_videos_on_a_specific_website_with/ft9zlse/ @@||cmp.ekstrabladet.dk/get_site_data$xmlhttprequest,~third-party @@||dialogue.sp-prod.net/messagingWithoutDetection.js$script,domain=ekstrabladet.dk -@@||notice.sp-prod.net^$frame,domain=ekstrabladet.dk +@@||notice.sp-prod.net^$subdocument,domain=ekstrabladet.dk @@||sp-prod.net^$xmlhttprequest,domain=ekstrabladet.dk ! @@ -1175,42 +1162,6 @@ danishfamilysearch.dk#@#iframe[width="300"][height="250"] ! Though in all fairness, you'd get better results from using https://github.com/ilGur1132/Smart-HTTPS as your main solution for these kinds of HTTPS upgrades. $csp=upgrade-insecure-requests,domain=skessuhorn.is|sporttv.is|bobilverden.no|win-xp.no -! 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— -! Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. -! 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— -! Tak til THEtomaso (https://github.com/THEtomaso) for de fleste af disse regler. -! 🇬🇧: ——— De-blurrers for paid articles (so that the last few lines of a preview doesn't fade out) ——— -! Thanks to THEtomaso (https://github.com/THEtomaso) for most of these entries. -##.Article-header-body:before -##.paywall-fade -##.polarisSpid.widget:before -aftenbladet.no,fvn.no##.overlay-wrap:before -aftenposten.no##.widget-salesposter:before -dagogtid.no##.dot-shorttext:before -dinepenger.no##.article-body:after -dn.no##.vrs-image-block__image-description-overlay -fiskeribladet.no##.teaser_overlay -information.dk##.greyed-text - -morgenbladet.no##.preview-overlay -nationen.no##.article-container.locked:after -politiken.dk##.card.stopsign__article.stopsign:before -vg.no##p[data-test-tag=lead-text] ~ p[class] ~ div[class]:before -borsen.dk##.indent-wrapper > .overlay -dknyt.dk,kommunen.dk##.fade-out -h-a.no##.faded-content:before -||dagligvarehandelen.no/sites/all/themes/custom/ledelseas/gfx/veil.png$image -! dagbladet.no,elbil24.no -##.CTA-body-faded -! digi.no, tu.no, medier24.no, porten.no -##.faded-article-content:after -! https://www.klikk.no/side3/vimenn/viggo-bloffet-hele-norge-6857944 -##.paywall-gradient -! https://www.vg.no/nyheter/i/y3Mka2/ (08/04/2020) -vg.no##div[data-test-tag=timestamp] + div:before -! https://www.vg.no/nyheter/innenriks/i/3JbRzv/ (09/04/2020) -vg.no##div[data-test-tag=timestamp] + p + div:before - ! 🇳🇴: Anti-'CPU-massakrering' ! 🇮🇸: And-örgjörvislatrun ! 🇬🇧: Anti-'CPU slaughtering' @@ -1310,7 +1261,6 @@ resett.no##a[href*="ekstrahus.no"] resett.no##.td-ss-main-sidebar resett.no##a[href*="pureorganic.no"] /*-annonse-*$image,domain=resett.no -resett.no#?#.code-block:-abp-contains(Reklame):not(:-abp-contains(butikk)) norgesavisen.no##.td-fix-index frihetskamp.net##a[href*="greenpilled.com"] frihetskamp.net##a[href*="nordenstil.no"] @@ -1326,6 +1276,11 @@ frihetskamp.net##a[href*="nordenstil.no"] nettavisen.no###topover-loader nettavisen.no###topover +! "Generic Hide" +@@||bondebladet.screen9.tv^$generichide +@@||eurosport.no^$generichide +@@||eurosport.dk^$generichide + ! 🇬🇧: Category: Compatibility entries for ABP users, EasyList, and/or functionality whitelisting ! 🇳🇴: Hurtigfikser for Internet Explorer 11 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index d96095a7f..8650dc327 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 180820203 +! Version: 190820202 ! Title: 🏔️ Dandelion Sprouts vestnordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus) ! Translated title: Dandelion Sprout's West Nordic filters for tidier websites (for AdBlock and Adblock Plus) ! Expires: 12 hours @@ -686,7 +686,7 @@ hwt.dk#?#.box.text-center:-abp-has(script[src^="//ads."]) information.dk##.masthead installator.dk##.addon--ad itavisen.no##.\35 00Add:not(.homepage-video-area) -itavisen.no##.ad:before +itavisen.no##.ad::before itavisen.no#?#*:-abp-has(> .comcontent) itavisen.no##.fifth-article-ad itavisen.no##.itavi-after-content @@ -825,7 +825,7 @@ sognavis.no##.row.hidden-print:not(.vspace) spillespill.no###bannerAdmeenRectangleTopContainer spillespill.no##.banner-leaderboard spillespill.no##.push -sporttv.is#?#*:-abp-has(> .row div[class^="auglysing-"]) +sporttv.is#?#.row *:-abp-has(> div[class^="auglysing-"]) sporttv.is##div.col-xs-4.items:nth-of-type(5) > .box sporttv.is#?#.box:-abp-has(div[class^=auglysing-]) sporttv.is,utdanningsnytt.no##.banner-right @@ -848,7 +848,7 @@ sveip.no##.notnews sysla.no##.ad-nexus-ad tek.no###application > div[class]:nth-of-type(1):nth-last-of-type(2) tek.no#?#*:-abp-has(> #topboard) -tek.no##body:before +tek.no##body::before tek.no##div[class^=styles__] tek.no##section[class*=canvas] tek.no#?#article > div:-abp-contains(/^annonse$/) @@ -950,7 +950,7 @@ canariajournalen.no##.ad-separator canariajournalen.no##.ad-separator-top thainytt.no##.blog-entry > .stacks_out thaiguiden.no#?#*:-abp-has(> * > * > * > * > .adsbygoogle) -tek.no##div:-abp-properties(min-height: 165px) +tek.no#?#div:-abp-properties(min-height: 165px) teknologia.no#?#.widget_text:-abp-has(.adsbygoogle) opn.no###sidebar_2 #sidebarelement_2 kondis.no##.wallpaperad @@ -1163,7 +1163,7 @@ danishfamilysearch.dk#@#iframe[width="300"][height="250"] ! https://old.reddit.com/r/uBlockOrigin/comments/gye2f2/cant_watch_videos_on_a_specific_website_with/ft9zlse/ @@||cmp.ekstrabladet.dk/get_site_data$xmlhttprequest,~third-party @@||dialogue.sp-prod.net/messagingWithoutDetection.js$script,domain=ekstrabladet.dk -@@||notice.sp-prod.net^$frame,domain=ekstrabladet.dk +@@||notice.sp-prod.net^$subdocument,domain=ekstrabladet.dk @@||sp-prod.net^$xmlhttprequest,domain=ekstrabladet.dk ! @@ -1176,42 +1176,6 @@ danishfamilysearch.dk#@#iframe[width="300"][height="250"] ! Though in all fairness, you'd get better results from using https://github.com/ilGur1132/Smart-HTTPS as your main solution for these kinds of HTTPS upgrades. $csp=upgrade-insecure-requests,domain=skessuhorn.is|sporttv.is|bobilverden.no|win-xp.no -! 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— -! Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. -! 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— -! Tak til THEtomaso (https://github.com/THEtomaso) for de fleste af disse regler. -! 🇬🇧: ——— De-blurrers for paid articles (so that the last few lines of a preview doesn't fade out) ——— -! Thanks to THEtomaso (https://github.com/THEtomaso) for most of these entries. -##.Article-header-body:before -##.paywall-fade -##.polarisSpid.widget:before -aftenbladet.no,fvn.no##.overlay-wrap:before -aftenposten.no##.widget-salesposter:before -dagogtid.no##.dot-shorttext:before -dinepenger.no##.article-body:after -dn.no##.vrs-image-block__image-description-overlay -fiskeribladet.no##.teaser_overlay -information.dk##.greyed-text - -morgenbladet.no##.preview-overlay -nationen.no##.article-container.locked:after -politiken.dk##.card.stopsign__article.stopsign:before -vg.no##p[data-test-tag=lead-text] ~ p[class] ~ div[class]:before -borsen.dk##.indent-wrapper > .overlay -dknyt.dk,kommunen.dk##.fade-out -h-a.no##.faded-content:before -||dagligvarehandelen.no/sites/all/themes/custom/ledelseas/gfx/veil.png$image -! dagbladet.no,elbil24.no -##.CTA-body-faded -! digi.no, tu.no, medier24.no, porten.no -##.faded-article-content:after -! https://www.klikk.no/side3/vimenn/viggo-bloffet-hele-norge-6857944 -##.paywall-gradient -! https://www.vg.no/nyheter/i/y3Mka2/ (08/04/2020) -vg.no##div[data-test-tag=timestamp] + div:before -! https://www.vg.no/nyheter/innenriks/i/3JbRzv/ (09/04/2020) -vg.no##div[data-test-tag=timestamp] + p + div:before - ! 🇳🇴: Anti-'CPU-massakrering' ! 🇮🇸: And-örgjörvislatrun ! 🇬🇧: Anti-'CPU slaughtering' @@ -1327,6 +1291,11 @@ frihetskamp.net##a[href*="nordenstil.no"] nettavisen.no###topover-loader nettavisen.no###topover +! "Generic Hide" +@@||bondebladet.screen9.tv^$generichide +@@||eurosport.no^$generichide +@@||eurosport.dk^$generichide + ! 🇬🇧: Category: Compatibility entries for ABP users, EasyList, and/or functionality whitelisting ! 🇳🇴: Hurtigfikser for Internet Explorer 11 @@ -1620,6 +1589,42 @@ trendsales.dk##.top__banner ||brigitteheilmann.dk^ ||storustovu.dk^ ||campingnews.dk^ +! 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— +! Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. +! 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— +! Tak til THEtomaso (https://github.com/THEtomaso) for de fleste af disse regler. +! 🇬🇧: ——— De-blurrers for paid articles (so that the last few lines of a preview doesn't fade out) ——— +! Thanks to THEtomaso (https://github.com/THEtomaso) for most of these entries. +##.Article-header-body::before +##.paywall-fade +##.polarisSpid.widget::before +aftenbladet.no,fvn.no##.overlay-wrap::before +aftenposten.no##.widget-salesposter::before +dagogtid.no##.dot-shorttext::before +dinepenger.no##.article-body::after +dn.no##.vrs-image-block__image-description-overlay +fiskeribladet.no##.teaser_overlay +information.dk##.greyed-text + +morgenbladet.no##.preview-overlay +nationen.no##.article-container.locked::after +politiken.dk##.card.stopsign__article.stopsign::before +vg.no##p[data-test-tag=lead-text] ~ p[class] ~ div[class]::before +borsen.dk##.indent-wrapper > .overlay +dknyt.dk,kommunen.dk##.fade-out +h-a.no##.faded-content::before +||dagligvarehandelen.no/sites/all/themes/custom/ledelseas/gfx/veil.png$image +! dagbladet.no,elbil24.no +##.CTA-body-faded +! digi.no, tu.no, medier24.no, porten.no +##.faded-article-content::after +! https://www.klikk.no/side3/vimenn/viggo-bloffet-hele-norge-6857944 +##.paywall-gradient +! https://www.vg.no/nyheter/i/y3Mka2/ (08/04/2020) +vg.no##div[data-test-tag=timestamp] + div::before +! https://www.vg.no/nyheter/innenriks/i/3JbRzv/ (09/04/2020) +vg.no##div[data-test-tag=timestamp] + p + div::before + ! 🇳🇴/🇩🇰: ——— Anti-anti-reklameblokkering ——— ! 🇮🇸: ——— And-and-auglýsingshindrun ——— ! 🇬🇧: ——— Anti-anti-adblocking ——— @@ -1640,8 +1645,6 @@ abcnyheter.no##div[style^="bottom: 0px;"] ||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,~third-party @@.dk/assets/templates/*/ads.png$image,domain=maskinbladet.dk|agrar-plus.dk|fritidsmarkedet.dk|dagensbyggeri.dk|maskinteknik.dk|gronteknik.dk @@/js/ads.js$~third-party,domain=tvkampen.com|tvsporten.dk -@@||bondebladet.screen9.tv^$generichide -@@||eurosport.*^$generichide @@||fwmrm.net/ad/$script,domain=dplay.no|dplay.dk @@||sixscissors.com^$third-party,domain=itavisen.no @@||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 5b746c7e1..f151504c7 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 18August2020v3 +! Version: 19August2020v2 ! 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 @@ -990,7 +990,7 @@ canariajournalen.no##.ad-separator canariajournalen.no##.ad-separator-top thainytt.no##.blog-entry > .stacks_out thaiguiden.no##.adsbygoogle:upward(5) -tek.no##div:matches-css(min-height: 165px) +tek.no#?#div:matches-css(min-height: 165px) teknologia.no#?#.widget_text:has(.adsbygoogle) opn.no###sidebar_2 #sidebarelement_2 kondis.no##.wallpaperad @@ -1230,46 +1230,6 @@ danishfamilysearch.dk#@#iframe[width="300"][height="250"] ! Though in all fairness, you'd get better results from using https://github.com/ilGur1132/Smart-HTTPS as your main solution for these kinds of HTTPS upgrades. $csp=upgrade-insecure-requests,domain=skessuhorn.is|sporttv.is|bobilverden.no|win-xp.no -! 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— -! Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. -! 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— -! Tak til THEtomaso (https://github.com/THEtomaso) for de fleste af disse regler. -! 🇬🇧: ——— De-blurrers for paid articles (so that the last few lines of a preview doesn't fade out) ——— -! Thanks to THEtomaso (https://github.com/THEtomaso) for most of these entries. -##.Article-header-body:before -##.paywall-fade -##.polarisSpid.widget:before -aftenbladet.no,fvn.no##.overlay-wrap:before -aftenposten.no##.widget-salesposter:before -dagogtid.no##.dot-shorttext:before -dinepenger.no##.article-body:after -dn.no##.vrs-image-block__image-description-overlay -fiskeribladet.no##.teaser_overlay -information.dk##.greyed-text -information.dk##.paywall-box:style(margin-top: 0px !important) -mm.dk##.fadeout -mm.dk##.promotion:style(top: 0px !important) -morgenbladet.no##.preview-overlay -nationen.no##.article-container.locked:after -politiken.dk##.card.stopsign__article.stopsign:before -vg.no##p[data-test-tag=lead-text] ~ p[class] ~ div[class]:before -borsen.dk##.paywall:style(top: 0px !important) -borsen.dk##.indent-wrapper > .overlay -dknyt.dk,kommunen.dk##.fade-out -h-a.no##.faded-content:before -h-a.no##.faded-content:style(overflow: unset !important) -||dagligvarehandelen.no/sites/all/themes/custom/ledelseas/gfx/veil.png$image -! dagbladet.no,elbil24.no -##.CTA-body-faded -! digi.no, tu.no, medier24.no, porten.no -##.faded-article-content:after -! https://www.klikk.no/side3/vimenn/viggo-bloffet-hele-norge-6857944 -##.paywall-gradient -! https://www.vg.no/nyheter/i/y3Mka2/ (08/04/2020) -vg.no##div[data-test-tag=timestamp] + div:before -! https://www.vg.no/nyheter/innenriks/i/3JbRzv/ (09/04/2020) -vg.no##div[data-test-tag=timestamp] + p + div:before - ! 🇳🇴: Anti-'CPU-massakrering' ! 🇮🇸: And-örgjörvislatrun ! 🇬🇧: Anti-'CPU slaughtering' @@ -1401,6 +1361,11 @@ elkjop.no,elgiganten.dk###C-value:style(fill: #ed8631 !important) nettavisen.no###topover-loader nettavisen.no###topover +! "Generic Hide" +@@||bondebladet.screen9.tv^$generichide +@@||eurosport.no^$generichide +@@||eurosport.dk^$generichide + ! 🇬🇧: Category: Compatibility entries for ABP users, EasyList, and/or functionality whitelisting ! 🇳🇴: Hurtigfikser for Internet Explorer 11 @@ -1702,6 +1667,46 @@ trendsales.dk##.top__banner ||storustovu.dk^ !+ NOT_OPTIMIZED ||campingnews.dk^ +! 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— +! Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. +! 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— +! Tak til THEtomaso (https://github.com/THEtomaso) for de fleste af disse regler. +! 🇬🇧: ——— De-blurrers for paid articles (so that the last few lines of a preview doesn't fade out) ——— +! Thanks to THEtomaso (https://github.com/THEtomaso) for most of these entries. +##.Article-header-body:before +##.paywall-fade +##.polarisSpid.widget:before +aftenbladet.no,fvn.no##.overlay-wrap:before +aftenposten.no##.widget-salesposter:before +dagogtid.no##.dot-shorttext:before +dinepenger.no##.article-body:after +dn.no##.vrs-image-block__image-description-overlay +fiskeribladet.no##.teaser_overlay +information.dk##.greyed-text +information.dk##.paywall-box:style(margin-top: 0px !important) +mm.dk##.fadeout +mm.dk##.promotion:style(top: 0px !important) +morgenbladet.no##.preview-overlay +nationen.no##.article-container.locked:after +politiken.dk##.card.stopsign__article.stopsign:before +vg.no##p[data-test-tag=lead-text] ~ p[class] ~ div[class]:before +borsen.dk##.paywall:style(top: 0px !important) +borsen.dk##.indent-wrapper > .overlay +dknyt.dk,kommunen.dk##.fade-out +h-a.no##.faded-content:before +h-a.no##.faded-content:style(overflow: unset !important) +||dagligvarehandelen.no/sites/all/themes/custom/ledelseas/gfx/veil.png$image +! dagbladet.no,elbil24.no +##.CTA-body-faded +! digi.no, tu.no, medier24.no, porten.no +##.faded-article-content:after +! https://www.klikk.no/side3/vimenn/viggo-bloffet-hele-norge-6857944 +##.paywall-gradient +! https://www.vg.no/nyheter/i/y3Mka2/ (08/04/2020) +vg.no##div[data-test-tag=timestamp] + div:before +! https://www.vg.no/nyheter/innenriks/i/3JbRzv/ (09/04/2020) +vg.no##div[data-test-tag=timestamp] + p + div:before + ! 🇳🇴/🇩🇰: ——— Anti-anti-reklameblokkering ——— ! 🇮🇸: ——— And-and-auglýsingshindrun ——— ! 🇬🇧: ——— Anti-anti-adblocking ——— @@ -1727,8 +1732,6 @@ abcnyheter.no##div[style^="bottom: 0px;"] ||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,~third-party @@.dk/assets/templates/*/ads.png$image,domain=maskinbladet.dk|agrar-plus.dk|fritidsmarkedet.dk|dagensbyggeri.dk|maskinteknik.dk|gronteknik.dk @@/js/ads.js$~third-party,domain=tvkampen.com|tvsporten.dk -@@||bondebladet.screen9.tv^$generichide -@@||eurosport.*^$generichide @@||fwmrm.net/ad/$script,domain=dplay.* @@||sixscissors.com^$third-party,domain=itavisen.no @@||www.tv2.no/s/js/ads.js$script,~third-party diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt index d2ebead65..e0309a8f4 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 18August2020v3-Beta +! Version: 19August2020v2-Beta ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Brave Browser) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Brave Browser) ! Expires: 12 hours @@ -431,18 +431,6 @@ contentMarketing$app=no.sol ! Credit to https://raw.githubusercontent.com/Cybo1927/Hosts/master/Anti/Anti%2520Third-Party%2520HTTP for showing me the existence of this particular CSP command. ! Though in all fairness, you'd get better results from using https://github.com/ilGur1132/Smart-HTTPS as your main solution for these kinds of HTTPS upgrades. $csp=upgrade-insecure-requests,domain=skessuhorn.is|sporttv.is|bobilverden.no|win-xp.no -! 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— -! Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. -! 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— -! Tak til THEtomaso (https://github.com/THEtomaso) for de fleste af disse regler. -! 🇬🇧: ——— De-blurrers for paid articles (so that the last few lines of a preview doesn't fade out) ——— -! Thanks to THEtomaso (https://github.com/THEtomaso) for most of these entries. -||dagligvarehandelen.no/sites/all/themes/custom/ledelseas/gfx/veil.png$image -! dagbladet.no,elbil24.no -! digi.no, tu.no, medier24.no, porten.no -! https://www.klikk.no/side3/vimenn/viggo-bloffet-hele-norge-6857944 -! https://www.vg.no/nyheter/i/y3Mka2/ (08/04/2020) -! https://www.vg.no/nyheter/innenriks/i/3JbRzv/ (09/04/2020) ! 🇳🇴: Anti-'CPU-massakrering' ! 🇮🇸: And-örgjörvislatrun ! 🇬🇧: Anti-'CPU slaughtering' @@ -499,6 +487,10 @@ gamereactor.*##+js(ra, autoplay) ! 🇳🇴: Falske innlastinger som sløser bort tid ! 🇩🇰: Falske indlastinger, der søler bort tid ! 🇬🇧: Fake loading screens that waste time +! "Generic Hide" +@@||bondebladet.screen9.tv^$generichide +@@||eurosport.no^$generichide +@@||eurosport.dk^$generichide ! 🇬🇧: Category: Compatibility entries for ABP users, EasyList, and/or functionality whitelisting ! https://github.com/AdguardTeam/AdguardForWindows/issues/3209 !#if adguard_app_windows @@ -772,6 +764,18 @@ gamereactor.*##+js(ra, autoplay) ||brigitteheilmann.dk^ ||storustovu.dk^ ||campingnews.dk^ +! 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— +! Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. +! 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— +! Tak til THEtomaso (https://github.com/THEtomaso) for de fleste af disse regler. +! 🇬🇧: ——— De-blurrers for paid articles (so that the last few lines of a preview doesn't fade out) ——— +! Thanks to THEtomaso (https://github.com/THEtomaso) for most of these entries. +||dagligvarehandelen.no/sites/all/themes/custom/ledelseas/gfx/veil.png$image +! dagbladet.no,elbil24.no +! digi.no, tu.no, medier24.no, porten.no +! https://www.klikk.no/side3/vimenn/viggo-bloffet-hele-norge-6857944 +! https://www.vg.no/nyheter/i/y3Mka2/ (08/04/2020) +! https://www.vg.no/nyheter/innenriks/i/3JbRzv/ (09/04/2020) ! 🇳🇴/🇩🇰: ——— Anti-anti-reklameblokkering ——— ! 🇮🇸: ——— And-and-auglýsingshindrun ——— ! 🇬🇧: ——— Anti-anti-adblocking ——— @@ -790,8 +794,6 @@ vg.no##+js(aeld, load, concat) ||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,1p @@.dk/assets/templates/*/ads.png$image,domain=maskinbladet.dk|agrar-plus.dk|fritidsmarkedet.dk|dagensbyggeri.dk|maskinteknik.dk|gronteknik.dk @@/js/ads.js$1p,domain=tvkampen.com|tvsporten.dk -@@||bondebladet.screen9.tv^$generichide -@@||eurosport.*^$generichide @@||fwmrm.net/ad/$script,domain=dplay.no|dplay.dk @@||sixscissors.com^$3p,domain=itavisen.no @@||www.tv2.no/s/js/ads.js$script,1p diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 56023902c..65e896492 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 18August2020v3 +! Version: 19August2020v2 ! 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 @@ -990,7 +990,7 @@ canariajournalen.no##.ad-separator canariajournalen.no##.ad-separator-top thainytt.no##.blog-entry > .stacks_out thaiguiden.no##.adsbygoogle:upward(5) -tek.no##div:matches-css(min-height: 165px) +tek.no#?#div:matches-css(min-height: 165px) teknologia.no#?#.widget_text:-abp-has(.adsbygoogle) opn.no###sidebar_2 #sidebarelement_2 kondis.no##.wallpaperad @@ -1230,46 +1230,6 @@ danishfamilysearch.dk#@#iframe[width="300"][height="250"] ! Though in all fairness, you'd get better results from using https://github.com/ilGur1132/Smart-HTTPS as your main solution for these kinds of HTTPS upgrades. $csp=upgrade-insecure-requests,domain=skessuhorn.is|sporttv.is|bobilverden.no|win-xp.no -! 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— -! Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. -! 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— -! Tak til THEtomaso (https://github.com/THEtomaso) for de fleste af disse regler. -! 🇬🇧: ——— De-blurrers for paid articles (so that the last few lines of a preview doesn't fade out) ——— -! Thanks to THEtomaso (https://github.com/THEtomaso) for most of these entries. -##.Article-header-body:before -##.paywall-fade -##.polarisSpid.widget:before -aftenbladet.no,fvn.no##.overlay-wrap:before -aftenposten.no##.widget-salesposter:before -dagogtid.no##.dot-shorttext:before -dinepenger.no##.article-body:after -dn.no##.vrs-image-block__image-description-overlay -fiskeribladet.no##.teaser_overlay -information.dk##.greyed-text -information.dk##.paywall-box:style(margin-top: 0px !important) -mm.dk##.fadeout -mm.dk##.promotion:style(top: 0px !important) -morgenbladet.no##.preview-overlay -nationen.no##.article-container.locked:after -politiken.dk##.card.stopsign__article.stopsign:before -vg.no##p[data-test-tag=lead-text] ~ p[class] ~ div[class]:before -borsen.dk##.paywall:style(top: 0px !important) -borsen.dk##.indent-wrapper > .overlay -dknyt.dk,kommunen.dk##.fade-out -h-a.no##.faded-content:before -h-a.no##.faded-content:style(overflow: unset !important) -||dagligvarehandelen.no/sites/all/themes/custom/ledelseas/gfx/veil.png$image -! dagbladet.no,elbil24.no -##.CTA-body-faded -! digi.no, tu.no, medier24.no, porten.no -##.faded-article-content:after -! https://www.klikk.no/side3/vimenn/viggo-bloffet-hele-norge-6857944 -##.paywall-gradient -! https://www.vg.no/nyheter/i/y3Mka2/ (08/04/2020) -vg.no##div[data-test-tag=timestamp] + div:before -! https://www.vg.no/nyheter/innenriks/i/3JbRzv/ (09/04/2020) -vg.no##div[data-test-tag=timestamp] + p + div:before - ! 🇳🇴: Anti-'CPU-massakrering' ! 🇮🇸: And-örgjörvislatrun ! 🇬🇧: Anti-'CPU slaughtering' @@ -1401,6 +1361,11 @@ elkjop.no,elgiganten.dk###C-value:style(fill: #ed8631 !important) nettavisen.no###topover-loader nettavisen.no###topover +! "Generic Hide" +@@||bondebladet.screen9.tv^$generichide +@@||eurosport.no^$generichide +@@||eurosport.dk^$generichide + ! 🇬🇧: Category: Compatibility entries for ABP users, EasyList, and/or functionality whitelisting ! 🇳🇴: Hurtigfikser for Internet Explorer 11 @@ -1702,6 +1667,46 @@ trendsales.dk##.top__banner ||storustovu.dk^ !+ NOT_OPTIMIZED ||campingnews.dk^ +! 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— +! Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. +! 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— +! Tak til THEtomaso (https://github.com/THEtomaso) for de fleste af disse regler. +! 🇬🇧: ——— De-blurrers for paid articles (so that the last few lines of a preview doesn't fade out) ——— +! Thanks to THEtomaso (https://github.com/THEtomaso) for most of these entries. +##.Article-header-body:before +##.paywall-fade +##.polarisSpid.widget:before +aftenbladet.no,fvn.no##.overlay-wrap:before +aftenposten.no##.widget-salesposter:before +dagogtid.no##.dot-shorttext:before +dinepenger.no##.article-body:after +dn.no##.vrs-image-block__image-description-overlay +fiskeribladet.no##.teaser_overlay +information.dk##.greyed-text +information.dk##.paywall-box:style(margin-top: 0px !important) +mm.dk##.fadeout +mm.dk##.promotion:style(top: 0px !important) +morgenbladet.no##.preview-overlay +nationen.no##.article-container.locked:after +politiken.dk##.card.stopsign__article.stopsign:before +vg.no##p[data-test-tag=lead-text] ~ p[class] ~ div[class]:before +borsen.dk##.paywall:style(top: 0px !important) +borsen.dk##.indent-wrapper > .overlay +dknyt.dk,kommunen.dk##.fade-out +h-a.no##.faded-content:before +h-a.no##.faded-content:style(overflow: unset !important) +||dagligvarehandelen.no/sites/all/themes/custom/ledelseas/gfx/veil.png$image +! dagbladet.no,elbil24.no +##.CTA-body-faded +! digi.no, tu.no, medier24.no, porten.no +##.faded-article-content:after +! https://www.klikk.no/side3/vimenn/viggo-bloffet-hele-norge-6857944 +##.paywall-gradient +! https://www.vg.no/nyheter/i/y3Mka2/ (08/04/2020) +vg.no##div[data-test-tag=timestamp] + div:before +! https://www.vg.no/nyheter/innenriks/i/3JbRzv/ (09/04/2020) +vg.no##div[data-test-tag=timestamp] + p + div:before + ! 🇳🇴/🇩🇰: ——— Anti-anti-reklameblokkering ——— ! 🇮🇸: ——— And-and-auglýsingshindrun ——— ! 🇬🇧: ——— Anti-anti-adblocking ——— @@ -1727,8 +1732,6 @@ abcnyheter.no##div[style^="bottom: 0px;"] ||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,1p @@.dk/assets/templates/*/ads.png$image,domain=maskinbladet.dk|agrar-plus.dk|fritidsmarkedet.dk|dagensbyggeri.dk|maskinteknik.dk|gronteknik.dk @@/js/ads.js$1p,domain=tvkampen.com|tvsporten.dk -@@||bondebladet.screen9.tv^$generichide -@@||eurosport.*^$generichide @@||fwmrm.net/ad/$script,domain=dplay.no|dplay.dk @@||sixscissors.com^$3p,domain=itavisen.no @@||www.tv2.no/s/js/ads.js$script,1p diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 2c82b8bc3..978ae8b38 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 18August2020v3-Alpha +# Version: 19August2020v2-Alpha # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy) # Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy) # Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md @@ -550,19 +550,6 @@ {+block{🇬🇧: ——— Tries to make the web browser load files in HTTPS, if the website itself doesn't automatically redirect from HTTP to its HTTPS version ———}} # Credit to https://raw.githubusercontent.com/Cybo1927/Hosts/master/Anti/Anti%2520Third-Party%2520HTTP for showing me the existence of this particular CSP command. # Though in all fairness, you'd get better results from using https://github.com/ilGur1132/Smart-HTTPS as your main solution for these kinds of HTTPS upgrades. -# 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— -# Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. -# 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— -# Tak til THEtomaso (https://github.com/THEtomaso) for de fleste af disse regler. -{+block{🇬🇧: ——— De-blurrers for paid articles (so that the last few lines of a preview doesn't fade out) ———}} -# Thanks to THEtomaso (https://github.com/THEtomaso) for most of these entries. -{+block} -.dagligvarehandelen.no/sites/all/themes/custom/ledelseas/gfx/veil.png -# dagbladet.no,elbil24.no -# digi.no, tu.no, medier24.no, porten.no -{+block{https://www.klikk.no/side3/vimenn/viggo-bloffet-hele-norge-6857944}} -{+block{https://www.vg.no/nyheter/i/y3Mka2/ (08/04/2020)}} -{+block{https://www.vg.no/nyheter/innenriks/i/3JbRzv/ (09/04/2020)}} # 🇳🇴: Anti-'CPU-massakrering' # 🇮🇸: And-örgjörvislatrun {+block{🇬🇧: Anti-'CPU slaughtering'}} @@ -630,6 +617,7 @@ # 🇳🇴: Falske innlastinger som sløser bort tid # 🇩🇰: Falske indlastinger, der søler bort tid {+block{🇬🇧: Fake loading screens that waste time}} +# "Generic Hide" {+block{🇬🇧: Category: Compatibility entries for ABP users, EasyList, and/or functionality whitelisting}} # 🇳🇴: Hurtigfikser for Internet Explorer 11 # 🇮🇸: Skyndilausn fyrir Internet Explorer 11 @@ -902,6 +890,19 @@ .brigitteheilmann.dk .storustovu.dk .campingnews.dk +# 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— +# Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. +# 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— +# Tak til THEtomaso (https://github.com/THEtomaso) for de fleste af disse regler. +{+block{🇬🇧: ——— De-blurrers for paid articles (so that the last few lines of a preview doesn't fade out) ———}} +# Thanks to THEtomaso (https://github.com/THEtomaso) for most of these entries. +{+block} +.dagligvarehandelen.no/sites/all/themes/custom/ledelseas/gfx/veil.png +# dagbladet.no,elbil24.no +# digi.no, tu.no, medier24.no, porten.no +{+block{https://www.klikk.no/side3/vimenn/viggo-bloffet-hele-norge-6857944}} +{+block{https://www.vg.no/nyheter/i/y3Mka2/ (08/04/2020)}} +{+block{https://www.vg.no/nyheter/innenriks/i/3JbRzv/ (09/04/2020)}} # 🇳🇴/🇩🇰: ——— Anti-anti-reklameblokkering ——— # 🇮🇸: ——— And-and-auglýsingshindrun ——— {+block{🇬🇧: ——— Anti-anti-adblocking ———}} diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 90c6623b8..0e93ffaae 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -494,6 +494,66 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(1\)", + r"\1#?#\2\3*:-abp-has(> \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(2\)", + r"\1#?#\2\3*:-abp-has(> * > \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(3\)", + r"\1#?#\2\3*:-abp-has(> * > * > \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(4\)", + r"\1#?#\2\3*:-abp-has(> * > * > * > \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(5\)", + r"\1#?#\2\3*:-abp-has(> * > * > * > * > \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(6\)", + r"\1#?#\2\3*:-abp-has(> * > * > * > * > * > \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(7\)", + r"\1#?#\2\3*:-abp-has(> * > * > * > * > * > * > \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(8\)", + r"\1#?#\2\3*:-abp-has(> * > * > * > * > * > * > * > \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(9\)", + r"\1#?#\2\3*:-abp-has(> * > * > * > * > * > * > * > * > \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(10\)", + r"\1#?#\2\3*:-abp-has(> * > * > * > * > * > * > * > * > * > \4)", + line + ) + line = re.sub( r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(1\)", r"\1#?#*:-abp-has(> \2)", @@ -620,6 +680,24 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r":before", + r"::before", + line + ) + + line = re.sub( + r":after", + r"::after", + line + ) + + line = re.sub( + r"([$,])frame(,|$)", + r"\1subdocument\2", + line + ) + if is_supported_abp(line): text += line + '\r\n' @@ -1527,7 +1605,7 @@ import re SOURCES = ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianList.txt'] UNSUPPORTED_ABP = ['$important', ',important', '$redirect=', ',redirect=', - ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^', '!#i', '$app'] + ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^', '!#i', '$app', ':not(:-abp-'] OUTPUT = 'xyzzyxeyeo.txt' OUTPUT_ABP = 'NordicFiltersABP-Inclusion.txt' @@ -1834,6 +1912,66 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(1\)", + r"\1#?#\2\3*:-abp-has(> \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(2\)", + r"\1#?#\2\3*:-abp-has(> * > \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(3\)", + r"\1#?#\2\3*:-abp-has(> * > * > \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(4\)", + r"\1#?#\2\3*:-abp-has(> * > * > * > \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(5\)", + r"\1#?#\2\3*:-abp-has(> * > * > * > * > \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(6\)", + r"\1#?#\2\3*:-abp-has(> * > * > * > * > * > \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(7\)", + r"\1#?#\2\3*:-abp-has(> * > * > * > * > * > * > \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(8\)", + r"\1#?#\2\3*:-abp-has(> * > * > * > * > * > * > * > \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(9\)", + r"\1#?#\2\3*:-abp-has(> * > * > * > * > * > * > * > * > \4)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*)( |\|)(.*):(upward|nth-ancestor)\(10\)", + r"\1#?#\2\3*:-abp-has(> * > * > * > * > * > * > * > * > * > \4)", + line + ) + line = re.sub( r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(1\)", r"\1#?#*:-abp-has(> \2)", @@ -1990,6 +2128,30 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r":before", + r"::before", + line + ) + + line = re.sub( + r":after", + r"::after", + line + ) + + line = re.sub( + r"([$,])frame(,|$)", + r"\1subdocument\2", + line + ) + + line = re.sub( + r"^ekstrabladet\.dk##a\[href\^=\"https://click-dk\.plista\.com/csc\?\"\]$", + r"", + line + ) + if is_supported_abp(line): text += line + '\r\n'