diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 7378c7532..3feb9795a 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -144,9 +144,9 @@ xlmoto.no##.overlay-container xlmoto.no##.overlay-wrapper xlmoto.no##.sb-overlay xstra.no##.td-fix-index -dagens.dk#?#*:has(> * > a[href*=".bedrageri.com/"]) +dagens.dk##a[href*=".bedrageri.com/"]:upward(2) itavisen.no#?#.spklw-post:has(a[href*=smartadserver]) -730.no#?#*:has(> * > * > .gofollow) +730.no##.gofollow:upward(3) itavisen.no##.sponsored brudleyp.fo,hvat.fo##.vev torg.fo##.add @@ -352,7 +352,7 @@ portal.fo##.full-width-vev.all portal.fo,fiskur.fo###footer-adds portal.fo##.ablock ! Bet365 widget triggered for Norwegian audiences only -goal.com#?#*:has(> * > .js-betting-widget.is-country-no) +goal.com##.js-betting-widget.is-country-no:upward(2) ! jyllands-posten.dk ##.annonceringBox @@ -438,7 +438,7 @@ dinside.no#?#.columns.small-8:has(div[id^=ad-netboard]) diskusjon.no###diskusjon_toppbanner diskusjon.no##.prisguide-content dmi.dk##.add-container -dmi.dk#?#*:has(> .section-1-ad) +dmi.dk##.section-1-ad:upward(1) dn.no###googlead-toppbanner:style(min-height: 0 !important) dn.no##[id^=googlead-]:not(#googlead-toppbanner) dv.is##.adbox_310x400 @@ -534,7 +534,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#?#*:has(> * > .boxbanner) +kanalfrederikshavn.dk##.boxbanner:upward(2) kart.1881.no##.panel-ad-skyscraper klikk.no##div[id^=lpc_belowArticle] kommunikationsforum.dk##.banner-top @@ -569,7 +569,7 @@ min-mave.dk##.vspacer minmote.no##.ad-box minmote.no##.advert-container-inline minmote.no##.advert-horseshoe -minmote.no#?#*:has(> div[id^=advert-]) +minmote.no##div[id^=advert-]:upward(1) mobil.nu,mobilkunden.dk##.tower nakenprat.com##.threadbit:not([id]) nakenprat.com#?##content:style(margin-left: 0 !important) @@ -626,14 +626,14 @@ sporttv.is##div.col-xs-4.items:nth-of-type(5) > .box sporttv.is#?#.box:has(div[class^=auglysing-]) sporttv.is,utdanningsnytt.no##.banner-right startsiden.no##div[class*=advertisement_] -startsiden.no#?#*:has(> div[data-ga-action$=_ad]) +startsiden.no##div[data-ga-action$=_ad]:upward(1) storm.no###topbanner studievalg.no###top-announce sva.no##.code-block-1 sva.no#?#.widget_text:not(:has(a)) sva.no#?#section:not(:has(a)) sveip.net##.app_ad2 -sveip.net#?#*:has(> .adsbygoogle) +sveip.net##.adsbygoogle:upward(1) sveip.no##.notnews sysla.no##.ad-nexus-ad tek.no###application > div[class]:nth-of-type(1):nth-last-of-type(2) @@ -678,7 +678,7 @@ utrop.no##.bottom-widead vafo.dk,folketidende.dk##.top_banner_container valutakurser.dk##.bottom_banner_div tek.no##body:before -tek.no#?#*:has(> #topboard) +tek.no###topboard:upward(1) varden.no##.top_banner vartoslo.no##.vo-annonse vb.is##.big_spons @@ -710,18 +710,18 @@ tipsbladet.dk##.col--lg-fixed-width-sidebar.col--xs-12 bilnorge.no##td[colspan="7"][style] yrkesbil.no###nettboard_art1 yrkesbil.no#?#td:has(> noscript) -yrkesbil.no#?#*:has(> .forside_adholder) +yrkesbil.no##.forside_adholder:upward(1) yrkesbil.no#?#td:has(img[src="gifs/1pix.gif"]) yrkesbil.no##td:empty 1881.no#?#.content:has(.ad-takeover) austurfrett.is##.upperad austurfrett.is##.lowerad e24.no##div[data-ad-subtype] -itavisen.no#?#*:has(> .comcontent) +itavisen.no##.comcontent:upward(1) m.feltet.dk##.banner_mobile klikk.no##.floatRight.columns veitingastadir.is##.footer_top > .footer-wrap > .columns -bilasolur.is#?#*:has(> div[class*=advertisement-spot]) +bilasolur.is##div[class*=advertisement-spot]:upward(1) tv2.no##div[data-third-party-link^="\[\""] advokatbladet.no##.adnuntius-ad fla.de##.adsenseblock @@ -1024,7 +1024,7 @@ gamereactor.*#@#.afs_ads ||openx.gamereactor.dk/multi.php?$important,script ||ssl.p.jwpcdn.com^*/gapro.js$important,script,domain=gamereactor.* @@||imasdk.googleapis.com/js/sdkloader/ima3.$script,domain=gamereactor.* -viafree.*#?#*:has(> .vjs-playing) ~ .no-autoplay-overlay +viafree.*##.vjs-playing:upward(1) ~ .no-autoplay-overlay viafree.*##.ad-click-through viafree.*##.pause-ad viafree.*##.pause-ad-container diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index a1f7b5ae1..d4ea324f2 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -1772,66 +1772,6 @@ def prepare_ag(lines) -> str: line ) - line = re.sub( - r"([a-z*])#[?]?#(.*):(upward|nth-ancestor)\(1\)", - 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(>",