From 2c1120106c03f2ea906b05988c08514e3eaa3cae Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 3 Sep 2021 17:34:11 +0200 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 2 +- .../NordicFilters-uMatrixSupplement.txt | 2 +- .../NordicFiltersABP-Inclusion.txt | 13 +++---------- .../NordicFiltersABP.txt | 3 ++- .../NordicFiltersAdGuard.txt | 3 ++- .../NordicFiltersPrivacy.txt | 3 ++- .../NordicFiltersPrivoxy.action | 2 +- .../XYZPrepareFilters.py | 18 ++++++++++++++++++ 8 files changed, 30 insertions(+), 16 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 6f0d3cad3..74aab993e 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: 31August2021v1-Alpha +# Version: 03September2021v1-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-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index 9ee828ad2..cc1a52882 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: 31August2021v1-Alpha +! Version: 03September2021v1-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 e8b4bf6a4..393dfd3eb 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: 310820211 +! Version: 030920211 ! 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 @@ -127,6 +127,7 @@ gaffa.no##.single-post > .wrapper-2 gamer.no##.mkdsk-placeholder gamer.no##.posta-placeholder gamer.no#?#.column.one-half:-abp-has(.promoted-offer) +itavisen.no##.adsbygoogle gaming.dk##.article-body > .row gaming.dk##.main > .container > .row > .col-md-12 gaming.dk#?#.panel-latest-forum-threads:-abp-contains( sponsor) @@ -4177,7 +4178,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: 310820211 +! Version: 030920211 ! Title: Adblock List for Finland ! Description: Finnish adblock list ! Expires: 4 days @@ -5083,7 +5084,6 @@ kotiliesi.fi##.placeholder @@||tags.tiqcdn.com/utag/sanoma-fi/*/utag.js @@||uk.cdn-net.com/cc.js$script,domain=power.fi anna.fi#@#.sponsored-content -etuovi.com#@#.rss-feed hs.fi#@#.mainokset hs.fi#@#.mainos iltalehti.fi#@#.afs_ads @@ -5116,12 +5116,5 @@ kaksplus.fi#@#.sponsored-content ! https://github.com/easylist/easylist/pull/8695 @@||high.auriro.net/http/600x400/$image,domain=dawn.fi -! https://github.com/easylist/easylist/pull/8887 -@@||reactandshare.com/plugin/rns.js$script,third-party,domain=verkkouutiset.fi - -! https://github.com/easylist/easylist/pull/8898 -elo.fi#@##cookie-consent -elo.fi#@#.cookie-consent:not(body):not(html) - ! Quickfix, buying tickets won't work properly with Easylist Cookie... vr.fi#@#div[data-testid="modal"] diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 28f675b0e..f85733332 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: 310820211 +! Version: 030920211 ! 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 @@ -128,6 +128,7 @@ gamer.no##.mkdsk-placeholder gamer.no##.posta-placeholder gamer.no#?#.column.one-half:-abp-has(.promoted-offer) gamer.no,tu.no#$#abort-current-inline-script dfpConfig loadAds +itavisen.no##.adsbygoogle gaming.dk##.article-body > .row gaming.dk##.main > .container > .row > .col-md-12 gaming.dk#?#.panel-latest-forum-threads:-abp-contains( sponsor) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 3cbad0e6b..68febf17e 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: 31August2021v1 +! Version: 03September2021v1 ! 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 @@ -129,6 +129,7 @@ gamer.no##.mkdsk-placeholder gamer.no##.posta-placeholder gamer.no#?#.column.one-half:has(.promoted-offer) gamer.no,tu.no##+js(acis, dfpConfig, loadAds) +itavisen.no##.adsbygoogle gaming.dk##.article-body > .row gaming.dk##.main > .container > .row > .col-md-12 gaming.dk#?#.panel-latest-forum-threads:has-text( sponsor) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 2f71a5553..a4a5c1b28 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: 31August2021v1 +! Version: 03September2021v1 ! 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 @@ -129,6 +129,7 @@ gamer.no##.mkdsk-placeholder gamer.no##.posta-placeholder gamer.no#?#.column.one-half:-abp-has(.promoted-offer) gamer.no,tu.no##+js(acis, dfpConfig, loadAds) +itavisen.no##.adsbygoogle gaming.dk##.article-body > .row gaming.dk##.main > .container > .row > .col-md-12 gaming.dk#?#.panel-latest-forum-threads:-abp-contains( sponsor) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 57f26f2e7..59a90a800 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: 31August2021v1-Alpha +# Version: 03September2021v1-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 7d2f7cea2..28eed5011 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -4730,6 +4730,12 @@ def prepare_privoxy(lines) -> str: line ) + line = re.sub( + r"^\..*", + r"", + line + ) + if is_supported_privoxy(line): text += line + '\r\n' @@ -4889,6 +4895,12 @@ def prepare_hosts(lines) -> str: line ) + line = re.sub( + r"^\..*", + r"", + line + ) + if is_supported_hosts(line): text += line + '\r\n' @@ -5005,6 +5017,12 @@ def prepare_domains(lines) -> str: line ) + line = re.sub( + r"^\..*", + r"", + line + ) + if is_supported_domains(line): text += line + '\r\n'