diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 542d22d6c..93b044367 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,7 +1,7 @@ msFilterList # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites -# Version: 28September2021v3-Alpha +# Version: 30September2021v1-Alpha : expires = 1 # Lisens Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md # Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt index fcde5f8b1..13b5cc76d 100644 --- a/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt @@ -1,6 +1,6 @@ ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for «uBlock Origin Legacy») ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for «uBlock Origin Legacy») -! Version: 28September2021v3-Beta +! Version: 30September2021v1-Beta ! Expires: 1 day ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -265,6 +265,8 @@ teknologia.no#?#.one-half:-abp-contains(/[kc]asino/i) teknologia.no,gunnarandreassen.com##a[href*=kasino] teknologiskmatforum.no##.page-home__logos-sidebar thaiguiden.no###extraContainer3 +e24.no##.teaser__preview +e24.no##.component_content-marketing ticketmaster.*##div[id^=ad-slot-] torg.fo##.add travservice.dk##.tm-main-top diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index 8b50631a2..1ee2e38c8 100644 --- a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt +++ b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt @@ -1,6 +1,6 @@ ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uMatrix-regler til å benytte sammen med domeneversjonen) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (uMatrix rules to use together with the raw domains version) -! Version: 28September2021v3-Alpha +! Version: 30September2021v1-Alpha ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md ! 🇳🇴: Denne listen dekker nettsteder for Norge, Danmark, Island, Færøyene, Grønland, Schleswig-Holsteins danske minoritet, og samebefolkningen. For mere informasjon, detaljer, hjelpemidler, og andre lister jeg har laget, gå til https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#norsk diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index 293afbeb9..967b2ea80 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1,7 +1,7 @@ [Adblock Plus 3.7] ! Title: 🏔️ Dandelion Sprouts helnordiske filtre for ryddigere nettsider (for Adblock Plus - Møter ABP sine inkluderingsregler) ! Translated title: Dandelion Sprout's All-Nordic filters for tidier websites (for Adblock Plus with ABP inclusion compliance) -! Version: 280920213 +! Version: 300920211 ! Expires: 1 day ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -259,6 +259,8 @@ teknologia.no#?#.one-half:-abp-contains(/[kc]asino/i) teknologia.no,gunnarandreassen.com##a[href*=kasino] teknologiskmatforum.no##.page-home__logos-sidebar thaiguiden.no###extraContainer3 +e24.no##.teaser__preview +e24.no##.component_content-marketing ticketmaster.no,ticketmaster.dk##div[id^=ad-slot-] torg.fo##.add travservice.dk##.tm-main-top @@ -4288,7 +4290,7 @@ whowhatwear.co.uk#@#a[href*="/click.linksynergy"] img ! Språknöjtral test för at kolla om ABP-brukarrapporter för YouTube går ner til 0 med den här uppförning / Language-neutral test to see if ABP user reports for YouTube plunge down to 0 with this entry ||googlevideo.com/*&ctier= -! Version: 2809202112 +! Version: 011020211 ! Title: Adblock List for Finland ! Description: Finnish adblock list ! Expires: 4 days @@ -4470,6 +4472,9 @@ bbs.io-tech.fi#?#li.block-row:-abp-contains(Mainos) bittiraha.fi###cm-banner bomber.fi###rt-sidebar-b brbikers.com##a[href*="tema.fi"] +caravan-lehti.fi##.ad-wrapper +caravan-lehti.fi##.widget_caravanlehti-ad +caravan-lehti.fi##main section.block-notices cdon.fi##[id^=afscontainer] chat.suomi24.fi##.bannerTop.S24_banner como.fi,episodi.fi,fum.fi,inferno.fi,kaaoszine.fi,rumba.fi,soundi.fi,tilt.fi#?#div[class|=col][class*=post]:-abp-contains(/mainos/i) @@ -4551,6 +4556,8 @@ haapavesi-lehti.fi,kalajokilaakso.fi,kalajokiseutu.fi,keskipohjanmaa.fi,kokkola- halloota.com##.td_block_template_1.td-a-rec-id-custom-spot.td-a-rec.td-block halloota.com##a[href$="koronaavastaan.fi/?ref=metrotuotanto"] hameensanomat.fi###herald_posts_widget-5 +hameensanomat.fi#?#.herald-sidebar > .herald_posts_widget:-abp-has(a[href^="https://www.hameensanomat.fi/kaupallinen-yhteistyo/"]) +hameensanomat.fi#?#.herald-sidebar > .widget_custom_html:-abp-has(script) hardelli.com##.td-a-rec-id-sidebar hardelli.com#?#div[class=wpb_wrapper][style^="width: 324px;"] > div[data-td-block-uid]:-abp-contains(PELIT) hardware.fi##.adsbygoogle + script + br @@ -4697,11 +4704,15 @@ kuvake.net,kuvaton.com##.addme kuvaton.com,viikonloppu.com##[href^="https://www.kasinokaverit.com/"] kuvaton.com,viikonloppu.com##[href^="https://www.lainaovi.fi/"] kymensanomat.fi,ess.fi##.page-notes > .note--highlight +laitilansanomat.fi#?#.wpb_wrapper.wpb_text_column.td_block_wrap:-abp-has([auto-grid-data*=mainos]) lapinkansa.fi###content1-container lapinkansa.fi#?#div[class="m-contentListItemThumb -ctx-frontpage-now -level-1"]:-abp-has(> div > div > [class^=m-contentListItemThumb__advertisement]) lapinkansa.fi#?#div[class="m-managedListing__column -ctx-index -level-1 -cols-2"]:-abp-has(> div > div > div > div[class^=m-contentListItem__advertisement]) lapuansanomat.fi##.tilaa-tasta lapuansanomat.fi##.ylabanner1 +lauttakyla.fi##.hasordercontent.orange-bg +lauttakyla.fi##.mainbanner +lauttakyla.fi#?#.fullwidth-banner:-abp-has(> a[href="https://www.lauttakyla.fi/tilaa/"]) lbaanijakuva.fi##.adremark leffatykki.com##div[class="ad230x90"] leijonat.com,suomikiekko.com,suomiurheilu.com##[href$="/pitkavetovihjeet/"] @@ -4936,13 +4947,17 @@ tekniikkatalous.fi##div#skyscraper-height-div > div > aside > div > div > a[href tekniikkatalous.fi##section > div > a[href^="https://www.tekniikkatalous.fi/kumppanisisallot/"] tekniikkatalous.fi#?#div#skyscraper-height-div > aside > div > div > a:-abp-contains(Kaupallinen yhteistyö) tekniikkatalous.fi#?#div#skyscraper-height-div > section > div > a:-abp-contains(Kaupallinen yhteistyö) -tekniikkatalous.fi#?#div:-abp-has(> a[href^="https://www.tekniikkatalous.fi/kumppanisisallot/"]) tekniikkatalous.fi#?#div:-abp-has(> span:-abp-contains(KAUPALLINEN YHTEISTYÖ) + a[href^="https://koulutus.almatalent.fi/"]) tekniikkatalous.fi,tivi.fi#?#[width]:-abp-has(.lazyload-wrapper) telsu.fi###pb_bottom2 telsu.fi###pb_bottom3 telsu.fi##.cmore.ch tennis.fi##.ad-blocks +tekniikkatalous.fi##a[href^="/tyopaikat/kumppanisisalto-tyopaikat/"] +tekniikkatalous.fi##aside > div[class] > a[href^="https://www.tekniikkatalous.fi/kumppanisisallot"] +tekniikkatalous.fi##div[class][width="980"] +tervareitti.fi##.advertisement-banner-row +tervareitti.fi#?#.article-container.shadow-sm.col:-abp-has(img[alt^="Oma tilausmainos"]) terve.fi##div[class|=ProductRecommendationCarousel__CarouselContainer] terve.fi#?#div[class^=PageElementFeedItem__Container]:-abp-contains(Mainos) terve.fi#?#div[class^=transitionSlot__component][class*=layout__container]:-abp-contains(KAUPALLINEN YHTEISTYÖ) @@ -4951,12 +4966,13 @@ ticketmaster.fi#?#div:-abp-has(> [id|=ad-slot]) tiede.fi#?#.views-row:-abp-has(.is-commercial) tiedonantaja.fi##[class*="block-boxes-ad-300x250"] tilt.fi##.lazyloading +tivi.fi##aside > div[class] > a[href^="https://www.tivi.fi/kumppanisisallot/"] +tivi.fi##section > div[class] > a[href^="https://www.tivi.fi/kumppanisisallot/"] tivi.fi#?#aside:-abp-has(> div > span:-abp-contains(KAUPALLINEN YHTEISTYÖ)) tivi.fi#?#div#skyscraper-height-div > aside > div > section > div:-abp-contains(KAUPALLINEN YHTEISTYÖ) tivi.fi#?#div#skyscraper-height-div > div > aside > div > section > div:-abp-contains(KAUPALLINEN YHTEISTYÖ) tivi.fi#?#div#skyscraper-height-div > section > div > a > div:-abp-contains(Kaupallinen yhteistyö) -tivi.fi#?#div:-abp-has(> a[href^="https://tivi.fi/kumppanisisallot/"]) -tivi.fi#?#div:-abp-has(> a[href^="https://www.tivi.fi/kumppanisisallot/"]) +tivi.fi#?#section > .lazyload-wrapper + div[class]:-abp-has(> a[href^="https://tivi.fi/kumppanisisallot/"]) tokentube.net##.no-top-padding.row tori.fi###banner_panorama_bottom tori.fi###footer_partner_links @@ -4969,6 +4985,10 @@ tvmatsit.com##.annons twitter.com#?#div:-abp-has(> div > div > div > h2 > div > span:-abp-contains(Mainostettu twiitti)) ulvilanseutu.fi###right-sidebar ulvilanseutu.fi##.adsanity-single +urjalansanomat.fi##.cat-kaupallinen-yhteistyo +urjalansanomat.fi#?#.urjal-widget.main:-abp-has(a[href="https://urjalansanomat.fi/verkkomainonta/"]) +urjalansanomat.fi#?#.urjal-widget.main:-abp-has(a[href="https://ysiauto.fi/"]) +urjalansanomat.fi#?#.widget:-abp-has(> a[href="/lounaat"]) uudenkaupunginsanomat.fi###auto-grid-container-5c40764673d19 uusisuomi.fi#?#.lazyload-wrapper + section:-abp-contains(Kaupallinen yhteistyö) uusisuomi.fi#?#div#skyscraper-height-div > div > aside > section > a:-abp-contains(Kaupallinen yhteistyö) @@ -5035,6 +5055,11 @@ www.uusisuomi.fi#?#div[width]:-abp-has(> [id|="almad-parade"]) www.uusisuomi.fi#?#main > div[class]:-abp-contains(Kaupallinen yhteistyö) x2.fi##.mobile-top-ad xracing.fi##.adBanner +ylasatakunta.fi##.ad[class*=panorama] +ylasatakunta.fi##.ad[class*=paraati] +ylasatakunta.fi##.ad[class*=ylaboksi] +ylasatakunta.fi##.tarranurkka +ylasatakunta.fi##a[href^="/artikkeli-kaupallinen-"] ylilauta.org##.h.fcdn yrittajat.fi##div[class$=kaupallinen-yhteistyo] @@ -5058,6 +5083,7 @@ yrittajat.fi##div[class$=kaupallinen-yhteistyo] ||bittiraha.fi/app/uploads/*/bittimaatti*_banner$image ||blogit.fi/ext/$image,domain=blogit.fi ||c1.hinta.fi^$third-party,script +||caravan-lehti.fi/media/Carado-matkailuauto.$image,domain=caravan-lehti.fi ||carousel-prod-kaleva-fi.s3.amazonaws.com^$third-party ||celtra.com^$third-party ||cjar.a-lehdet.fi^$third-party @@ -5087,8 +5113,10 @@ yrittajat.fi##div[class$=kaupallinen-yhteistyo] ||kelkkalehti.com/bannerit/$image ||keskustelu.pakkotoisto.com/bannerit/$image ||kinuskikissa.fi/wp-content/uploads/*kumppani_*.gif$image +||kiuruvesilehti.fi/wp-content/uploads/*kampanja_banneri.png$image ||kotikarjala.fi/eneo?tem=ndap_ilmoitus&$xmlhttprequest,domain=kotikarjala.fi ||kuvake.net/js/bannerloader.js$script,domain=kuvake.net +||laitilansanomat.fi^*/gallery/mainos*/$image,domain=laitilansanomat.fi ||lbaanijakuva.fi/test/*?template=prisjakt$domain=lbaanijakuva.fi ||m.riemurasia.net/reklaami.php$subdocument ||matkaendurot.net/images/*banner @@ -5297,6 +5325,3 @@ iltalehti.fi#@#.ad-placement ! https://github.com/easylist/easylist/pull/9204 luhta.com#@##cookie-consent luhta.com#@#.cookie-consent:not(body):not(html) - -! https://github.com/easylist/easylist/pull/9253 -@@||reactandshare.com/plugin/rns.js$domain=forssanlehti.fi diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index df66eeded..833456afc 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,7 +1,7 @@ [Adblock Plus 3.6] ! 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) -! Version: 280920213 +! Version: 300920211 ! Expires: 1 day ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -262,6 +262,8 @@ teknologia.no#?#.one-half:-abp-contains(/[kc]asino/i) teknologia.no,gunnarandreassen.com##a[href*=kasino] teknologiskmatforum.no##.page-home__logos-sidebar thaiguiden.no###extraContainer3 +e24.no##.teaser__preview +e24.no##.component_content-marketing ticketmaster.no,ticketmaster.dk##div[id^=ad-slot-] torg.fo##.add travservice.dk##.tm-main-top diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 4e5505704..6dd12d6e8 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,6 +1,6 @@ ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard) -! Version: 28September2021v3 +! Version: 30September2021v1 ! Expires: 1 day ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -264,6 +264,8 @@ teknologia.no#?#.one-half:has-text(/[kc]asino/i) teknologia.no,gunnarandreassen.com##a[href*=kasino] teknologiskmatforum.no##.page-home__logos-sidebar thaiguiden.no###extraContainer3 +e24.no##.teaser__preview +e24.no##.component_content-marketing ticketmaster.*##div[id^=ad-slot-] torg.fo##.add travservice.dk##.tm-main-top diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 8f42e482e..75d4e48d6 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,6 +1,6 @@ ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) -! Version: 28September2021v3 +! Version: 30September2021v1 ! Expires: 1 day ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -264,6 +264,8 @@ teknologia.no#?#.one-half:-abp-contains(/[kc]asino/i) teknologia.no,gunnarandreassen.com##a[href*=kasino] teknologiskmatforum.no##.page-home__logos-sidebar thaiguiden.no###extraContainer3 +e24.no##.teaser__preview +e24.no##.component_content-marketing ticketmaster.*##div[id^=ad-slot-] torg.fo##.add travservice.dk##.tm-main-top diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index ea5e0d1a5..1214df5ba 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,6 +1,6 @@ # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy) # Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy) -# Version: 28September2021v3-Alpha +# Version: 30September2021v1-Alpha # Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md # Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md # 🇳🇴: Denne listen dekker nettsteder for Norge, Danmark, Island, Færøyene, Grønland, Schleswig-Holsteins danske minoritet, og samebefolkningen. For mere informasjon, detaljer, hjelpemidler, og andre lister jeg har laget, gå til https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#norsk diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 02cc9e3c8..fd07dadc2 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -4181,6 +4181,12 @@ def prepare_ag(lines) -> str: line ) + line = re.sub( + r"^!#include uBO%20list%20extensions/.*", + r"", + line + ) + text += line + '\r\n' return text @@ -4392,6 +4398,18 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"^!if .*", + r"", + line + ) + + line = re.sub( + r"^!#include .*", + r"", + line + ) + if is_supported_abp(line): text += line + '\r\n' @@ -4731,6 +4749,18 @@ def prepare_tpl(lines) -> str: line ) + line = re.sub( + r"^!if .*", + r"", + line + ) + + line = re.sub( + r"^!#include .*", + r"", + line + ) + if is_supported_tpl(line): text += line + '\r\n' @@ -5347,6 +5377,18 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r"^!if .*", + r"", + line + ) + + line = re.sub( + r"^!#include .*", + r"", + line + ) + if is_supported_agh(line): text += line + '\r\n'