From 7e1ee90e8482488b5a13ca02bd9cf8d770a53541 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Mon, 15 May 2023 01:31:31 +0200 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 5 ++++- .../NordicFilters-uBOLegacy.txt | 7 ++++++- .../NordicFilters-uMatrixSupplement.txt | 3 ++- .../NordicFiltersABP-Inclusion.txt | 7 ++++++- .../NordicFiltersABP.txt | 7 ++++++- .../NordicFiltersAdGuard.txt | 7 ++++++- .../NordicFiltersPrivacy.txt | 7 ++++++- .../NordicFiltersPrivoxy.action | 5 ++++- .../XYZPrepareFilters.py | 4 ++-- 9 files changed, 42 insertions(+), 10 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 55850e42f..830e46193 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: 15May2023v2-Deprecated +# Version: 15May2023v3-Deprecated : 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 @@ -692,6 +692,9 @@ msFilterList -d v.fwmrm.net g -d widget.tippebannere.no -d widgets.sprinklecontent.com +# • Not to be removed during upstream syncs • +# https://www.avvir.no/samegiella-ja-mearkagiella-vuosttasgiellan/ +# jyllands-posten.dk (09 07 2020) # 🇬🇧: Entries that are also present in «uBlock Filters», for those who use ABP and AdGuard # —————————————————————————————————————————————————————————————————————————————————————————— # 🇳🇴: Svindelnettsteder og virusnettsteder (Ikke besøk dem hvis du har dine datamaskiner og lommebøker kjært) diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt index b4b90fb0d..42e8e5108 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: 15May2023v2-Beta +! Version: 15May2023v3-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 @@ -2291,6 +2291,11 @@ xn--bredbnd-ixa.dk##div[class^=speedtest-bg] > a > img ||v.fwmrm.net/ad/g/$domain=ekstrabladet.dk,important ||widget.tippebannere.no^$third-party ||widgets.sprinklecontent.com^$domain=klikk.no +! • Not to be removed during upstream syncs • +! https://www.avvir.no/samegiella-ja-mearkagiella-vuosttasgiellan/ +~nytid.no##.td-a-rec:not(html):not(body) +! jyllands-posten.dk (09/07/2020) +###topBanners !#if !ext_ublock ! 🇬🇧: Entries that are also present in «uBlock Filters», for those who use ABP and AdGuard diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index a8aa0cc41..8e12bd322 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: 15May2023v2-Alpha +! Version: 15May2023v3-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 @@ -155,6 +155,7 @@ itavisen.no sixscissors.com 3p allow tv3sport.dk freewheel-mtgx-tv.akamaized.net other block ||widget.tippebannere.no^$third-party klikk.no widgets.sprinklecontent.com * block +! • Not to be removed during upstream syncs • ! 🇬🇧: Entries that are also present in «uBlock Filters», for those who use ABP and AdGuard ! 🇳🇴: Svindelnettsteder og virusnettsteder (Ikke besøk dem hvis du har dine datamaskiner og lommebøker kjært) ! Rask leksjon: Mange svindelnettsteder bruker adresser som ligner på adressene til store nettsteder, men som inneholder tilfeldige ekstra smådetaljer som gjør dem til en helt annen adresse. "||vg.no." vil blokkere vg.no.iphone-svindel-eksempel.xyz, men ikke vg.no eller vg.no/sport diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index 3f9222949..6eb19789d 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1,7 +1,7 @@ [Adblock Plus 3.13] ! 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: 150520232 +! Version: 150520233 ! 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 @@ -2136,6 +2136,11 @@ xn--bredbnd-ixa.dk##div[class^=speedtest-bg] > a > img ||v.fwmrm.net/ad/g/$domain=ekstrabladet.dk ||widget.tippebannere.no^$third-party ||widgets.sprinklecontent.com^$domain=klikk.no +! • Not to be removed during upstream syncs • +! https://www.avvir.no/samegiella-ja-mearkagiella-vuosttasgiellan/ +~nytid.no##.td-a-rec:not(html):not(body) +! jyllands-posten.dk (09/07/2020) +###topBanners ! 🇬🇧: Entries that are also present in «uBlock Filters», for those who use ABP and AdGuard triplx.dk##.aff-inner-col diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index d78c8cfb4..f8ee8ffd7 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,7 +1,7 @@ [Adblock Plus 3.13] ! 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: 150520232 +! Version: 150520233 ! 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 @@ -2146,6 +2146,11 @@ xn--bredbnd-ixa.dk##div[class^=speedtest-bg] > a > img ||v.fwmrm.net/ad/g/$domain=ekstrabladet.dk ||widget.tippebannere.no^$third-party ||widgets.sprinklecontent.com^$domain=klikk.no +! • Not to be removed during upstream syncs • +! https://www.avvir.no/samegiella-ja-mearkagiella-vuosttasgiellan/ +~nytid.no##.td-a-rec:not(html):not(body) +! jyllands-posten.dk (09/07/2020) +###topBanners ! 🇬🇧: Entries that are also present in «uBlock Filters», for those who use ABP and AdGuard triplx.dk##.aff-inner-col diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 43bf4cb34..642554983 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: 15May2023v2 +! Version: 15May2023v3 ! 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 @@ -2290,6 +2290,11 @@ xn--bredbnd-ixa.dk##div[class^=speedtest-bg] > a > img ||v.fwmrm.net/ad/g/$domain=ekstrabladet.dk,important ||widget.tippebannere.no^$third-party ||widgets.sprinklecontent.com^$domain=klikk.no +! • Not to be removed during upstream syncs • +! https://www.avvir.no/samegiella-ja-mearkagiella-vuosttasgiellan/ +~nytid.no##.td-a-rec:not(html):not(body) +! jyllands-posten.dk (09/07/2020) +###topBanners !#if !ext_ublock ! 🇬🇧: Entries that are also present in «uBlock Filters», for those who use ABP and AdGuard diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index be6c9315e..47cc647e5 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: 15May2023v2 +! Version: 15May2023v3 ! 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 @@ -2290,6 +2290,11 @@ xn--bredbnd-ixa.dk##div[class^=speedtest-bg] > a > img ||v.fwmrm.net/ad/g/$domain=ekstrabladet.dk,important ||widget.tippebannere.no^$third-party ||widgets.sprinklecontent.com^$domain=klikk.no +! • Not to be removed during upstream syncs • +! https://www.avvir.no/samegiella-ja-mearkagiella-vuosttasgiellan/ +~nytid.no##.td-a-rec:not(html):not(body) +! jyllands-posten.dk (09/07/2020) +###topBanners !#if !ext_ublock ! 🇬🇧: Entries that are also present in «uBlock Filters», for those who use ABP and AdGuard diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 1ab788977..ad6004176 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: 15May2023v2-Deprecated +# Version: 15May2023v3-Deprecated # 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 @@ -1005,6 +1005,9 @@ {+block} .widget.tippebannere.no$third-party +# • Not to be removed during upstream syncs • +{+block{https://www.avvir.no/samegiella-ja-mearkagiella-vuosttasgiellan/}} +# jyllands-posten.dk (09/07/2020) {+block{🇬🇧: Entries that are also present in «uBlock Filters», for those who use ABP and AdGuard}} # —————————————————————————————————————————————————————————————————————————————————————————— # 🇳🇴: Svindelnettsteder og virusnettsteder (Ikke besøk dem hvis du har dine datamaskiner og lommebøker kjært) diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 4cf6a3ef8..0a9126510 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -1,7 +1,7 @@ import requests import re -SOURCES = ['https://gitlab.com/DandelionSprout/adfilt/-/raw/master/NorwegianList.txt', 'https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/AntiAdblockEntries.txt', 'https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFilters-NotBrave.txt'] +SOURCES = ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianList.txt', 'https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/AntiAdblockEntries.txt', 'https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFilters-NotBrave.txt'] UNSUPPORTED_ABP = ['$important', ',important', '$redirect=', ',redirect=', ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^', '$$', '$app', '$csp=upgrade-insecure-requests', '$removeparam', 'badfilter', '!#include'] @@ -2227,7 +2227,7 @@ if __name__ == "__main__": import requests import re -SOURCES = ['https://gitlab.com/DandelionSprout/adfilt/-/raw/master/NorwegianList.txt', 'https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFilters-NotBrave.txt', 'https://raw.githubusercontent.com/DandelionSprout/Swedish-List-for-Adblock-Plus/main/Swedish%20List%20for%20Adblock%20Plus.txt', 'https://raw.githubusercontent.com/finnish-easylist-addition/finnish-easylist-addition/gh-pages/Finland_adb.txt'] +SOURCES = ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianList.txt', 'https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFilters-NotBrave.txt', 'https://raw.githubusercontent.com/DandelionSprout/Swedish-List-for-Adblock-Plus/main/Swedish%20List%20for%20Adblock%20Plus.txt', 'https://raw.githubusercontent.com/finnish-easylist-addition/finnish-easylist-addition/gh-pages/Finland_adb.txt'] UNSUPPORTED_ABP = ['$important', ',important', '$redirect=', ',redirect=', ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^', '!#i', '$app', ':not(:-abp-', ':not(:has','$csp=upgrade-insecure-requests', '$removeparam', 'badfilter']