From d5ecd4684d2f875b1efbb53695d92be0dd928c5a Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Mon, 20 Apr 2020 14:11:55 +0200 Subject: [PATCH] Further syntax conversion for AdGuard --- .../DandelionSproutsNorskeFiltre.tpl | 2 +- .../NordicFiltersABP.txt | 18 +-- .../NordicFiltersAdGuard.txt | 142 +++++++++--------- .../NordicFiltersBrave.txt | 2 +- .../NordicFiltersPrivacy.txt | 8 +- .../NordicFiltersPrivoxy.action | 2 +- .../XYZPrepareFilters.py | 88 +++++++++-- 7 files changed, 164 insertions(+), 98 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 79781a622..af6eb7aa2 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 20April2020v1-Alpha +# Version: 20April2020v2-Alpha # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index a75ba9cc6..e99d14fb7 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 200420201 +! Version: 200420202 ! 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 @@ -142,9 +142,9 @@ xlmoto.no##.overlay-container xlmoto.no##.overlay-wrapper xlmoto.no##.sb-overlay xstra.no##.td-fix-index -dagens.dk#?#div:-abp-has(:scope > p > a[href*=".bedrageri.com/"]) +dagens.dk#?#div:-abp-has(> p > a[href*=".bedrageri.com/"]) itavisen.no#?#.spklw-post:-abp-has(a[href*=smartadserver]) -730.no#?#*:-abp-has(:scope > * > * > .gofollow) +730.no#?#*:-abp-has(> * > * > .gofollow) |blob:https://www.veier24.no/$image ||1819.is/infosmall/$image ||3.248.18.175^ @@ -511,7 +511,7 @@ kanalfrederikshavn.dk##table[width="620"] kanalfrederikshavn.dk##td[height="237"]:not([valign]) kanalfrederikshavn.dk##td[height="237"][width="315"]:not(#colRight) kanalfrederikshavn.dk##td[width="315"][height="55"] -kanalfrederikshavn.dk#?#div:-abp-has(:scope > div > .boxbanner) +kanalfrederikshavn.dk#?#div:-abp-has(> div > .boxbanner) kart.1881.no##.panel-ad-skyscraper klikk.no##div[id^=lpc_belowArticle] kommunikationsforum.dk##.banner-top @@ -614,7 +614,7 @@ tek.no#?#article > div:-abp-contains(/^annonse$/) tek.no#?#main > div > div:-abp-contains(kommersielle partner) tek.no#?#main > section > section:-abp-contains(/^annonse$/) tek.no#?#section + div:-abp-has(span) -tek.no#?#section:-abp-has(:scope > div > div:-abp-contains(/^annonse$/)) +tek.no#?#section:-abp-has(> div > div:-abp-contains(/^annonse$/)) telefonterror.co.no,ukendtnummer.dk##.ad-comments terrengsykkel.no###wallpaperAds terrengsykkel.no##.inlineAdBlock @@ -648,7 +648,7 @@ utrop.no##.bottom-widead vafo.dk,folketidende.dk##.top_banner_container valutakurser.dk##.bottom_banner_div tek.no##body:before -tek.no#?#*:-abp-has(:scope > #topboard) +tek.no#?#*:-abp-has(> #topboard) varden.no##.top_banner vartoslo.no##.vo-annonse vb.is##.big_spons @@ -677,14 +677,14 @@ tipsbladet.dk##.col--lg-fixed-width-sidebar.col--xs-12 bilnorge.no##td[colspan="7"][style] yrkesbil.no###nettboard_art1 yrkesbil.no#?#td:-abp-has(> noscript) -yrkesbil.no#?#*:-abp-has(:scope > .forside_adholder) +yrkesbil.no#?#*:-abp-has(> .forside_adholder) yrkesbil.no#?#td:-abp-has(img[src="gifs/1pix.gif"]) yrkesbil.no##td:empty 1881.no#?#.content:-abp-has(.ad-takeover) austurfrett.is##.upperad austurfrett.is##.lowerad e24.no##div[data-ad-subtype] -itavisen.no#?#*:-abp-has(:scope > .comcontent) +itavisen.no#?#*:-abp-has(> .comcontent) m.feltet.dk##.banner_mobile klikk.no##.floatRight.columns veitingastadir.is##.footer_top > .footer-wrap > .columns @@ -980,7 +980,7 @@ gamereactor.no,gamereactor.dk#@#.afs_ads ||media.gamereactor.dk/prerolls/*$media,rewrite=abp-resource:blank-mp3,domain=gamereactor.no|gamereactor.dk ||openx.gamereactor.dk/multi.php?$script ||ssl.p.jwpcdn.com^*/gapro.js$script,domain=gamereactor.no|gamereactor.dk -viafree.no,viafree.dk#?#*:-abp-has(:scope > .vjs-playing) ~ .no-autoplay-overlay +viafree.no,viafree.dk#?#*:-abp-has(> .vjs-playing) ~ .no-autoplay-overlay viafree.no,viafree.dk##.ad-click-through viafree.no,viafree.dk##.pause-ad viafree.no,viafree.dk##.pause-ad-container diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index f6db3be84..d7448886e 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 20April2020v1 +! Version: 20April2020v2 ! 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 @@ -57,17 +57,17 @@ 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)) +ekstrabladet.dk#?#div[class^="df-article "]:has(span:-abp-contains(Annoncørbetalt indhold)) feltet.dk###struct_topBanner feltet.dk##.box_300_default feltet.dk##a[onclick^=octo_] -femina.dk#?#article.col-md-4.teaser--normal.teaser:-abp-has(div[class=annonce]) +femina.dk#?#article.col-md-4.teaser--normal.teaser:has(div[class=annonce]) flashscore.dk##div[class^=box_over_content] fotbolti.net##div[id^=banner] frisms.nu##.numbered-phones frisms.nu,mobilsiden.dk##.side-block-products gamer.no##.posta-placeholder -gamer.no#?#.column.one-half:-abp-has(.promoted-offer) +gamer.no#?#.column.one-half:has(.promoted-offer) gamer.no,tek.no,digi.no##.products-carousel gamer.no,tu.no##+js(acis, dfpConfig, loadAds) guloggratis.dk##div.item_profa @@ -76,7 +76,7 @@ itavisen.no##.itavi-homepage-video-player-instream jn.fo###the_banners kanalen.no##.bannergroup karfan.is##.td-pb-span6 -karfan.is#?#.td-pb-span4:-abp-has(img[height="400"][width="310"]) +karfan.is#?#.td-pb-span4:has(img[height="400"][width="310"]) kode24.no##.top-profile.row komogvind.dk##.spotContainer landbrugsavisen.dk##.banner @@ -89,15 +89,15 @@ marsteinen.no###horizontal-outer-widgets-2 marsteinen.no###text-14 momondo.no,monondo.dk##.type-provider.clearfix.flights nakenprat.com##+js(aopr, document.dispatchEvent) -nettavisen.no#?#.rel-article:-abp-has(span:-abp-contains(Reklame)) -nettavisen.no#?#.story:-abp-has(.vignette) -nettavisen.no#?#article:-abp-has(> a[href*="?utm_source="]) +nettavisen.no#?#.rel-article:has(span:-abp-contains(Reklame)) +nettavisen.no#?#.story:has(.vignette) +nettavisen.no#?#article:has(> a[href*="?utm_source="]) nordlysid.fo###ease_adgroup_3 nordlysid.fo##column[class*=ad-style]:not([collapse]) norskenettsider.no###g_image4 norskenettsider.no##table opp.no##.classified-ads -opp.no#?#.l-col-12:-abp-has(.classifieds-content) +opp.no#?#.l-col-12:has(.classifieds-content) rett24.no##.p_banner-responsive samler.no##div[class^=sl-banner-outside-child-] sedenne.no##div[class*="shareButtonWrap" i] @@ -105,12 +105,12 @@ sedenne.no#?#div[class*=articleItem]:-abp-contains(ANNONSE) sedenne.no#?#div[class*=articleListItem]:-abp-contains(ANNONSE) side2.no##[href*="clk.tradedoubler.com/click"] side2.no##[href*="track.adtraction.com/t/t"] -side2.no,side3.no#?#.channel-item:-abp-has(.content > [href*="/annonsebilag/"]) -side2.no,side3.no#?#a:not([href*="side3.no"]):not([href*="side2.no"]):not([href*=".blogg.no"]):-abp-has(figure[class*="img-container"]) -side3.no#?#.strossle:-abp-has(div[data-third-party-link]) +side2.no,side3.no#?#.channel-item:has(.content > [href*="/annonsebilag/"]) +side2.no,side3.no#?#a:not([href*="side3.no"]):not([href*="side2.no"]):not([href*=".blogg.no"]):has(figure[class*="img-container"]) +side3.no#?#.strossle:has(div[data-third-party-link]) skessuhorn.is##.kostad-efni smis.no#?#.widget:-abp-contains(Annonse) -sorlandsavisen.no#?#div:-abp-has(> span:-abp-contains(Annonse)) +sorlandsavisen.no#?#div:has(> span:-abp-contains(Annonse)) speed.bredbandsguiden.no###advertisement sporttv.is##div[class^=auglysing-] studenttorget.no###top-announce @@ -128,14 +128,14 @@ tvkampen.com,tvsporten.dk##+js(aopw, onload) tvkampen.com,tvsporten.dk##.custom-background:style(background-image: none !important) 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)) +vartoslo.no#?#.vc_column-inner:has(.vo-annonse):not(:has(div[class^=td_module_])):not(:has(#sb_instagram)) vb.is##.spons veier24.no,tu.no,digi.no##.top-poster-wrap vg.no##+js(acis, 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#?#.partner-studio:not(:has(a[href*="/nordiskfilm/"])) vg.no,e24.no,gamer.no,tek.no,digi.no##+js(aopw, __AB__) vgtv.no##+js(golem.de.js) vgtv.no##.apnx-container @@ -146,9 +146,9 @@ xlmoto.no##.overlay-container xlmoto.no##.overlay-wrapper xlmoto.no##.sb-overlay xstra.no##.td-fix-index -dagens.dk#?#div:-abp-has(:scope > p > a[href*=".bedrageri.com/"]) -itavisen.no#?#.spklw-post:-abp-has(a[href*=smartadserver]) -730.no##.gofollow:upward(3) +dagens.dk#?#div:has(> p > a[href*=".bedrageri.com/"]) +itavisen.no#?#.spklw-post:has(a[href*=smartadserver]) +730.no#?#*:has(> * > * > .gofollow) |blob:https://www.veier24.no/$image ||1819.is/infosmall/$image 3.248.18.175$network @@ -371,11 +371,11 @@ tv2.no##.spklw-post-attr[data-pc] 180.no,180.dk##td[class^=frame-shadow-] 1881.no##.ad-sleepy 730.no#?#.g-10:-abp-contains(Artikkelen fortsetter ) -abcnyheter.no#?#.o-grid__col:-abp-has(.c-ad) +abcnyheter.no#?#.o-grid__col:has(.c-ad) aftenbladet.no##.article-content:style(padding: 0 0 0 0) aftenposten.no##.standard-ad-container aftenposten.no,hockeymagasinet.dk###top-ads-container -altomfotball.no#?#div[style^="padding: "]:-abp-has([class^="tv2-ad"]) +altomfotball.no#?#div[style^="padding: "]:has([class^="tv2-ad"]) amino.dk###top-shadow-pad amino.dk##.ad624-60 amino.dk##.ad624x60 @@ -385,14 +385,14 @@ avisen.dk##.Ad avvir.no##.avvir-block-top.avvir-block-container ba.no###cm2-1 ba.no##.maelstrom-topbanner -ba.no#?#.am-gridComp-item:-abp-has(> .am-ad-item) +ba.no#?#.am-gridComp-item:has(> .am-ad-item) bilnorge.no###artikkel300x250right bilnorge.no###nettboard_art1 -bilnorge.no#?#tr:-abp-has(td:-abp-contains(Annonse:)) +bilnorge.no#?#tr:has(td:-abp-contains(Annonse:)) bloggomtoppbloggere.com##.eaa.widget_text bodonu.no##.sidecol.hidden-xs bold.dk###dstop -bornholm.nu#?#div.container:-abp-has(#left_sticky) +bornholm.nu#?#div.container:has(#left_sticky) borsen.dk##.native-ads borsen.dk##.native-ads-item borsen.dk##.side-banner @@ -424,11 +424,11 @@ dba.dk##.marketing-container denstoredanske.dk###banner-zone-1 digi.no,medier24.no##.ad-label-vertical dinavis.no##.newsAD -dinside.no#?#.columns.small-8:-abp-has(div[id^=ad-netboard]) +dinside.no#?#.columns.small-8:has(div[id^=ad-netboard]) diskusjon.no###diskusjon_toppbanner diskusjon.no##.prisguide-content dmi.dk##.add-container -dmi.dk#?#.large-6:-abp-has(> .section-1-ad) +dmi.dk#?#.large-6:has(> .section-1-ad) dn.no###googlead-toppbanner:style(min-height: 0 !important) dn.no##[id^=googlead-]:not(#googlead-toppbanner) dv.is##.adbox_310x400 @@ -438,15 +438,15 @@ e24.no###main > div:nth-of-type(3) e24.no##.rightColumn:style(margin-top: 10px !important) eavisa.com##.custom-a-ds eavisa.com##.post-content > .items-container -eavisa.com#?#.post-content > p:-abp-has(.adsbygoogle) -eavisa.com#?#.post-content > p:-abp-has(a[onclick^="javascript:window.open("]) +eavisa.com#?#.post-content > p:has(.adsbygoogle) +eavisa.com#?#.post-content > p:has(a[onclick^="javascript:window.open("]) ebcontent.dk###ebcontentMegaboard ehandel.com##aside ekstrabladet.dk###manipulate_monster nhi.no##.advert euroinvestor.dk,valutakurser.dk###ctl00_BannerContainerTop eyjar.net##.hausad -eyjar.net#?#.col-sm-12.col-md-8:-abp-has(a[href^="/ad/"]) +eyjar.net#?#.col-sm-12.col-md-8:has(a[href^="/ad/"]) familieklubben.no##.tracking-article-offers familieklubben.no##div.netboard familieklubben.no##div[id*=familieklubben-wde-article_] @@ -462,8 +462,8 @@ finn.no###afshcontainer finn.no##.ads__unit--banner finn.no##article[id^=ad-stream_] finn.no##div[id^=netboard_] -finn.no#?#.ad-stream__unit:-abp-has(div[id*=google-ad]) -finn.no#?#div[class^=ads__unit]:-abp-has(> div[id^=ad-stream__google]) +finn.no#?#.ad-stream__unit:has(div[id*=google-ad]) +finn.no#?#div[class^=ads__unit]:has(> div[id^=ad-stream__google]) finna.is##.augl fiskeribladet.no##div[id^=banner_billboard1_] forum.klikk.no##.ehm-megaboard @@ -478,7 +478,7 @@ gamer.no##.aaa-980x150 gamer.no##.aaa-placeholder gamer.no##.pst-placeholder gaysir.no##.ad_wrapper_content -gjerrigknark.com#?#.dividerBlock:not(:-abp-has(.dividerBlockNewsletterSubscribe)) +gjerrigknark.com#?#.dividerBlock:not(:has(.dividerBlockNewsletterSubscribe)) godt.no##[class^=advert] google.no,google.dk,google.is###cnsi ~ [jsaction*=dismiss] gratiskryssord.no###adSign @@ -501,7 +501,7 @@ historienet.no##.responsive-images hockeymagasinet.dk##.ss-left-sky-reclam hockeymagasinet.dk##.ss-right-sky-reclam hsfo.dk##.adblock -hwt.dk#?#.box.text-center:-abp-has(script[src^="//ads."]) +hwt.dk#?#.box.text-center:has(script[src^="//ads."]) information.dk##.masthead installator.dk##.addon--ad itavisen.no##.ad:before @@ -514,7 +514,7 @@ jubii.dk##.mobiletakeover-background jv.dk##.adblock jyllands-posten.dk###MegaBoard_Top jyllands-posten.dk##div[id^=MediumRectangle] -jyllands-posten.dk#?#.gridCol:-abp-has(div[class=annonceHolder]) +jyllands-posten.dk#?#.gridCol:has(div[class=annonceHolder]) kanalfrederikshavn.dk###c1670 kanalfrederikshavn.dk###c1671 kanalfrederikshavn.dk###c2283 @@ -525,7 +525,7 @@ kanalfrederikshavn.dk##table[width="620"] kanalfrederikshavn.dk##td[height="237"]:not([valign]) kanalfrederikshavn.dk##td[height="237"][width="315"]:not(#colRight) kanalfrederikshavn.dk##td[width="315"][height="55"] -kanalfrederikshavn.dk#?#div:-abp-has(:scope > div > .boxbanner) +kanalfrederikshavn.dk#?#div:has(> div > .boxbanner) kart.1881.no##.panel-ad-skyscraper klikk.no##div[id^=lpc_belowArticle] kommunikationsforum.dk##.banner-top @@ -536,38 +536,38 @@ koplr.no##.column-banner-ads kreativeideer.no##.strossle-container kreativtforum.no##.sidebar-box krs247.no##.prl-span-12 + h5 -langrenn.com#?#.bannerlocation:-abp-has(script[src*=pagead]) +langrenn.com#?#.bannerlocation:has(script[src*=pagead]) lokal-avisen.no#?#.title:-abp-contains(/ANNONSE/i) -lp.no,varden.no#?#.outline:-abp-has([class=annonse]) +lp.no,varden.no#?#.outline:has([class=annonse]) lydogbilde.no,lydogbillede.dk##.adremark lydogbilde.no,lydogbillede.dk##.background-ad:style(min-height: 0px !important) m.kanalfrederikshavn.dk##.OA m.kanalfrederikshavn.dk##.OX markedsforing.dk##.articles-baner-content markedsforing.dk##.banner-annonce -markedsforing.dk#?#.row-second:-abp-has(div[class*=banner-annonce]) -matoppskrift.no#?##sticky:-abp-has(> .adsbygoogle) -matoppskrift.no#?#.text-center:not(:-abp-has(img)) +markedsforing.dk#?#.row-second:has(div[class*=banner-annonce]) +matoppskrift.no#?##sticky:has(> .adsbygoogle) +matoppskrift.no#?#.text-center:not(:has(img)) mbl.is##.container:style(margin-top: 0px !important) mbl.is##.main-header:style(margin-top: 0px !important) -mbl.is#?#.col-sm-6.col-12:-abp-has(.augl):not(:-abp-has(.fluid)) +mbl.is#?#.col-sm-6.col-12:has(.augl):not(: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#?##header > div:-abp-has(div[id*=gpt-ad-]) +menn.is#?#.vc_column-inner:has(.mobile-ad):not(:has(a)) +menn.is#?#.vc_column:has(.mobile-ad):not(:has(a)) +meremobil.dk#?##header > div:has(div[id*=gpt-ad-]) min-mave.dk##.topAdBannerFixed min-mave.dk##.vspacer minmote.no##.ad-box minmote.no##.advert-container-inline minmote.no##.advert-horseshoe -minmote.no#?#article:-abp-has(> div[id^=advert-]) +minmote.no#?#article:has(> div[id^=advert-]) mobil.nu,mobilkunden.dk##.tower nakenprat.com##.threadbit:not([id]) nakenprat.com#?##content:style(margin-left: 0px !important) nattogdag.no##.category-annonse netdoktor.dk##.common-advert-bold newz.dk,railgun.dk##.widget_widget_ads -nord-salten.no#?#ul:-abp-has(.columnLogo) +nord-salten.no#?#ul:has(.columnLogo) nordjyske.dk##.print-to-web-row nordjyske.dk##div[class*=banner] nordjyske.dk##div[class^=jubii-] @@ -578,9 +578,9 @@ nyheder.tv2.dk##.o-article_sidebar > div.g-item onlinenytt.com##.textwidget > p parcferme.no##.code-block > p pengenytt.no##.footer-ad-wrap -pengenytt.no#?#.entry-content > h4:-abp-has(script[src$="/adsbygoogle.js"]) -pengenytt.no#?#.entry-content > h6:-abp-has(script[src$="/adsbygoogle.js"]) -pengenytt.no#?#.so-widget-sow-editor:-abp-has(a[href^="https://online.adservicemedia.dk/"]) +pengenytt.no#?#.entry-content > h4:has(script[src$="/adsbygoogle.js"]) +pengenytt.no#?#.entry-content > h6:has(script[src$="/adsbygoogle.js"]) +pengenytt.no#?#.so-widget-sow-editor:has(a[href^="https://online.adservicemedia.dk/"]) pengenytt.no#?#.textwidget:-abp-contains(Annonse) pengenytt.no#?#.widget-title:-abp-contains(Annonser) poki.no##div[class*=" advertisement-GP-"] @@ -593,7 +593,7 @@ prissok.no##.internal-poster procycling.no##.container-ad pulze.dk###topads purehelp.no##.dfptop -purehelp.no#?#.float-left:-abp-has(span[id^=ezoic-pub-ad-placeholder-]) +purehelp.no#?#.float-left:has(span[id^=ezoic-pub-ad-placeholder-]) qxl.no,qxl.dk###crosslistingLauritzAdsenseBanner qxl.no,qxl.dk###GoogleAdsenseFooter + div[style^="width: 100%;"] qxl.no,qxl.dk###lauritzListingView @@ -614,17 +614,17 @@ spillespill.no###bannerAdmeenRectangleTopContainer spillespill.no##.banner-leaderboard spillespill.no##.push sporttv.is##div.col-xs-4.items:nth-of-type(5) > .box -sporttv.is#?#.box:-abp-has(div[class^=auglysing-]) +sporttv.is#?#.box:has(div[class^=auglysing-]) sporttv.is,utdanningsnytt.no##.banner-right startsiden.no##div[class*=advertisement_] -startsiden.no#?#div[class*=articleContainer_]:-abp-has(> div[data-ga-action$=_ad]) +startsiden.no#?#div[class*=articleContainer_]:has(> div[data-ga-action$=_ad]) storm.no###topbanner studievalg.no###top-announce sva.no##.code-block-1 -sva.no#?#.widget_text:not(:-abp-has(a)) -sva.no#?#section:not(:-abp-has(a)) +sva.no#?#.widget_text:not(:has(a)) +sva.no#?#section:not(:has(a)) sveip.net##.app_ad2 -sveip.net#?#div:-abp-has(> ins.adsbygoogle) +sveip.net#?#div:has(> ins.adsbygoogle) sveip.no##.notnews sysla.no##.ad-nexus-ad tek.no###application > div[class]:nth-of-type(1):nth-last-of-type(2) @@ -634,8 +634,8 @@ tek.no##section[class^=GreatCanvas__smallArticles-]:style(width: 100% !important tek.no#?#article > div:-abp-contains(/^annonse$/) tek.no#?#main > div > div:-abp-contains(kommersielle partner) tek.no#?#main > section > section:-abp-contains(/^annonse$/) -tek.no#?#section + div:-abp-has(span) -tek.no#?#section:-abp-has(:scope > div > div:-abp-contains(/^annonse$/)) +tek.no#?#section + div:has(span) +tek.no#?#section:has(> div > div:-abp-contains(/^annonse$/)) tek.no#?#section[hidden] + section:style(column-count: 3 !important; width: 100% !important) telefonterror.co.no,ukendtnummer.dk##.ad-comments terrengsykkel.no###wallpaperAds @@ -648,14 +648,14 @@ trening.no##.dfp-netboard trening.no##.mb-top-banner-wrapper trening.no##[id^=dt-netboard] tu.no##.frontpage-top-poster-wrap -tungt.no#?#.columns:-abp-has([src="http://stillingsarena.no/stillingsarena/feeds.wa2?_cmd=feedshoriz&size=980x285"]) +tungt.no#?#.columns:has([src="http://stillingsarena.no/stillingsarena/feeds.wa2?_cmd=feedshoriz&size=980x285"]) tungt.no#?#div.large-12.row:-abp-contains(MASCUS) tunnelsyn.no#?#.widget_media_image:-abp-contains(/^ANNONSE/) tv2.dk##.tc_ad -tv2.dk#?#.o-deck:-abp-has(div[class^="ad ad-wide"]) +tv2.dk#?#.o-deck:has(div[class^="ad ad-wide"]) tv2.no##.lp-r > div tv2.no##div[data-cyp$=Advertisement] -tv2.no#?#.large-12:not(.article-figure):not(:-abp-has(a)):not(:-abp-has(img)) +tv2.no#?#.large-12:not(.article-figure):not(:has(a)):not(:has(img)) tv3.dk##.channelHeaderLogo tv3sport.dk##.panorama tvkampen.com,tvsporten.dk###before-matches @@ -670,7 +670,7 @@ utrop.no##.bottom-widead vafo.dk,folketidende.dk##.top_banner_container valutakurser.dk##.bottom_banner_div tek.no##body:before -tek.no#?#*:-abp-has(> #topboard) +tek.no#?#*:has(> #topboard) varden.no##.top_banner vartoslo.no##.vo-annonse vb.is##.big_spons @@ -685,12 +685,12 @@ vimedhund.dk,madogvenner.dk##.g-ads visir.is##.df-auto-article visir.is##.padded.limit--tight.limit:style(padding-top: 15px !important) visir.is##div.padded--no-bottom.padded--less.padded.limit:style(padding-top: 5px !important) -visitnorway.no#?##dtnContainer:-abp-has(.dtnad) +visitnorway.no#?##dtnContainer:has(.dtnad) vl.no##.ad-cols vl.no##.ad-fullwidth-container vl.no##.vlDesktopAd vredens-gnag.no##.ab-appnexus-ads-wrapper -win-xp.no#?#tr > td > div:-abp-has(a[href*="clk.tradedoubler."]) +win-xp.no#?#tr > td > div:has(a[href*="clk.tradedoubler."]) woman.dk##.gutter-bottom.article-content > div.wg-banner yrkesbil.no###side > div:nth-of-type(1) sistenytt.com###midten @@ -701,19 +701,19 @@ tipsbladet.dk##.c-single__box-inset tipsbladet.dk##.col--lg-fixed-width-sidebar.col--xs-12 bilnorge.no##td[colspan="7"][style] yrkesbil.no###nettboard_art1 -yrkesbil.no#?#td:-abp-has(> noscript) -yrkesbil.no#?#*:-abp-has(> .forside_adholder) -yrkesbil.no#?#td:-abp-has(img[src="gifs/1pix.gif"]) +yrkesbil.no#?#td:has(> noscript) +yrkesbil.no#?#*:has(> .forside_adholder) +yrkesbil.no#?#td:has(img[src="gifs/1pix.gif"]) yrkesbil.no##td:empty -1881.no#?#.content:-abp-has(.ad-takeover) +1881.no#?#.content:has(.ad-takeover) austurfrett.is##.upperad austurfrett.is##.lowerad e24.no##div[data-ad-subtype] -itavisen.no#?#*:-abp-has(> .comcontent) +itavisen.no#?#*:has(> .comcontent) m.feltet.dk##.banner_mobile klikk.no##.floatRight.columns veitingastadir.is##.footer_top > .footer-wrap > .columns -bilasolur.is#?#.col-12:-abp-has(> div[class*=advertisement-spot]) +bilasolur.is#?#.col-12:has(> div[class*=advertisement-spot]) ||yrkesbil.no/gifs/*emty.gif^ ||yrkesbil.no/gifs/1pix.gif^ ||730.no/banner/*/sonymusic/$subdocument @@ -840,8 +840,8 @@ tnt-tv.no,tnt-tv.dk##.tabs_placeholder !+ NOT_OPTIMIZED 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)) +yrkesbil.no#?#tr:-abp-contains(/^\xA0$/):not(:-abp-contains(/\S/)):not(:has(img)) +yrkesbil.no#?#td:-abp-contains(/^\xA0$/):not(:-abp-contains(/\S/)):not(:has(img)) ! 🇳🇴: ——— Distraherende bakgrunnsbilder ——— ! 🇩🇰: ——— Distraherende baggrundsbilleder ——— @@ -1026,7 +1026,7 @@ gamereactor.no,gamereactor.dk#@#.afs_ads ||media.gamereactor.dk/prerolls/*$media,redirect=noopmp3-0.1s,domain=gamereactor.no|gamereactor.dk ||openx.gamereactor.dk/multi.php?$important,script ||ssl.p.jwpcdn.com^*/gapro.js$important,script,domain=gamereactor.no|gamereactor.dk -viafree.no,viafree.dk#?#*:-abp-has(> .vjs-playing) ~ .no-autoplay-overlay +viafree.no,viafree.dk#?#*:has(> .vjs-playing) ~ .no-autoplay-overlay viafree.no,viafree.dk##.ad-click-through viafree.no,viafree.dk##.pause-ad viafree.no,viafree.dk##.pause-ad-container diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt index dc88b4390..01b1f8db4 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 20April2020v1-Alpha +! Version: 20April2020v2-Alpha ! 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 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 360412df7..3d56ffe8e 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 20April2020v1 +! Version: 20April2020v2 ! 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 @@ -146,7 +146,7 @@ xlmoto.no##.overlay-container xlmoto.no##.overlay-wrapper xlmoto.no##.sb-overlay xstra.no##.td-fix-index -dagens.dk#?#div:-abp-has(:scope > p > a[href*=".bedrageri.com/"]) +dagens.dk#?#div:-abp-has(> p > a[href*=".bedrageri.com/"]) itavisen.no#?#.spklw-post:-abp-has(a[href*=smartadserver]) 730.no##.gofollow:upward(3) |blob:https://www.veier24.no/$image @@ -525,7 +525,7 @@ kanalfrederikshavn.dk##table[width="620"] kanalfrederikshavn.dk##td[height="237"]:not([valign]) kanalfrederikshavn.dk##td[height="237"][width="315"]:not(#colRight) kanalfrederikshavn.dk##td[width="315"][height="55"] -kanalfrederikshavn.dk#?#div:-abp-has(:scope > div > .boxbanner) +kanalfrederikshavn.dk#?#div:-abp-has(> div > .boxbanner) kart.1881.no##.panel-ad-skyscraper klikk.no##div[id^=lpc_belowArticle] kommunikationsforum.dk##.banner-top @@ -635,7 +635,7 @@ tek.no#?#article > div:-abp-contains(/^annonse$/) tek.no#?#main > div > div:-abp-contains(kommersielle partner) tek.no#?#main > section > section:-abp-contains(/^annonse$/) tek.no#?#section + div:-abp-has(span) -tek.no#?#section:-abp-has(:scope > div > div:-abp-contains(/^annonse$/)) +tek.no#?#section:-abp-has(> div > div:-abp-contains(/^annonse$/)) tek.no#?#section[hidden] + section:style(column-count: 3 !important; width: 100% !important) telefonterror.co.no,ukendtnummer.dk##.ad-comments terrengsykkel.no###wallpaperAds diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 428700249..4d383aeb1 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 20April2020v1-Alpha +# Version: 20April2020v2-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 diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 284239de8..d25280381 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -180,7 +180,73 @@ def prepare_ag(lines) -> str: line = re.sub( r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(1\)", - r"\1#?#*:-abp-has(> \2)", + r"\1#?#*:has(> \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(2\)", + r"\1#?#*:has(> * > \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(3\)", + r"\1#?#*:has(> * > * > \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(4\)", + r"\1#?#*:has(> * > * > * > \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(5\)", + r"\1#?#*:has(> * > * > * > * > \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(6\)", + r"\1#?#*:has(> * > * > * > * > * > \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(7\)", + r"\1#?#*:has(> * > * > * > * > * > * > \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(8\)", + r"\1#?#*:has(> * > * > * > * > * > * > * > \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(9\)", + r"\1#?#*:has(> * > * > * > * > * > * > * > * > \2)", + line + ) + + line = re.sub( + r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(10\)", + r"\1#?#*:has(> * > * > * > * > * > * > * > * > * > \2)", + line + ) + + line = re.sub( + r"has\(:scope >", + r"has(>", + line + ) + + line = re.sub( + r":-abp-has\(", + r":has(", line ) @@ -484,61 +550,61 @@ def prepare_abp(lines) -> str: line = re.sub( r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(1\)", - r"\1#?#*:-abp-has(:scope > \2)", + r"\1#?#*:-abp-has(> \2)", line ) line = re.sub( r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(2\)", - r"\1#?#*:-abp-has(:scope > * > \2)", + r"\1#?#*:-abp-has(> * > \2)", line ) line = re.sub( r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(3\)", - r"\1#?#*:-abp-has(:scope > * > * > \2)", + r"\1#?#*:-abp-has(> * > * > \2)", line ) line = re.sub( r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(4\)", - r"\1#?#*:-abp-has(:scope > * > * > * > \2)", + r"\1#?#*:-abp-has(> * > * > * > \2)", line ) line = re.sub( r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(5\)", - r"\1#?#*:-abp-has(:scope > * > * > * > * > \2)", + r"\1#?#*:-abp-has(> * > * > * > * > \2)", line ) line = re.sub( r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(6\)", - r"\1#?#*:-abp-has(:scope > * > * > * > * > * > \2)", + r"\1#?#*:-abp-has(> * > * > * > * > * > \2)", line ) line = re.sub( r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(7\)", - r"\1#?#*:-abp-has(:scope > * > * > * > * > * > * > \2)", + r"\1#?#*:-abp-has(> * > * > * > * > * > * > \2)", line ) line = re.sub( r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(8\)", - r"\1#?#*:-abp-has(:scope > * > * > * > * > * > * > * > \2)", + r"\1#?#*:-abp-has(> * > * > * > * > * > * > * > \2)", line ) line = re.sub( r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(9\)", - r"\1#?#*:-abp-has(:scope > * > * > * > * > * > * > * > * > \2)", + r"\1#?#*:-abp-has(> * > * > * > * > * > * > * > * > \2)", line ) line = re.sub( r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(10\)", - r"\1#?#*:-abp-has(:scope > * > * > * > * > * > * > * > * > * > \2)", + r"\1#?#*:-abp-has(> * > * > * > * > * > * > * > * > * > \2)", line )