From 0d6ebca5619c75af2761758f2e6d4c9f2d86c4cc Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 12 Feb 2023 12:13:09 +0100 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 2 +- .../NordicFilters-uBOLegacy.txt | 5 +++-- .../NordicFilters-uMatrixSupplement.txt | 2 +- .../NordicFiltersABP-Inclusion.txt | 5 +++-- .../NordicFiltersABP.txt | 5 +++-- .../NordicFiltersAdGuard.txt | 5 +++-- .../NordicFiltersPrivacy.txt | 5 +++-- .../NordicFiltersPrivoxy.action | 2 +- .../XYZPrepareFilters.py | 6 +++--- 9 files changed, 21 insertions(+), 16 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index ab34094c8..96b65dbc6 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: 09February2023v2-Alpha +# Version: 12February2023v1-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 00fcaeaf3..ee1afe77e 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: 09February2023v2-Beta +! Version: 12February2023v1-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 @@ -1211,7 +1211,6 @@ itavisen.no##.itavi-article-page-video-player-outstream itavisen.no##.td-adspot-title itavisen.no##.td-c-loop-ad itavisen.no##.td-header-ad-wrap -itavisen.no#?#.code-block:has-text(/Annonse/i) itavisen.no,tvguide.dk##div[id^=ad-] jn.fo##.lysingarspot jodelgrin.dk###text-2 @@ -1308,6 +1307,8 @@ minervanett.no#?#.row:has(> .adnuntius-ad) minmote.no##.advert-container-inline minmote.no##.advert-horseshoe minmote.no##div[id^=advert-]:upward(1) +itavisen.no##.block-wrap-columns +itavisen.no##p[style="text-align: center;"] mittkongsvinger.no##.advertising mobil.nu,mobilkunden.dk##.tower bold.dk##div[id$=-banner] diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index c10f6b471..5ffc07d4b 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: 09February2023v2-Alpha +! Version: 12February2023v1-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 c14ccf8e4..7b7aa556d 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: 090220232 +! Version: 120220231 ! 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 @@ -1174,7 +1174,6 @@ itavisen.no##.itavi-article-page-video-player-outstream itavisen.no##.td-adspot-title itavisen.no##.td-c-loop-ad itavisen.no##.td-header-ad-wrap -itavisen.no#?#.code-block:has-text(/Annonse/i) itavisen.no,tvguide.dk##div[id^=ad-] jn.fo##.lysingarspot jodelgrin.dk###text-2 @@ -1262,6 +1261,8 @@ minervanett.no#?#.row:has(> .adnuntius-ad) minmote.no##.advert-container-inline minmote.no##.advert-horseshoe minmote.no#?#*:has(> div[id^=advert-]) +itavisen.no##.block-wrap-columns +itavisen.no##p[style="text-align: center;"] mittkongsvinger.no##.advertising mobil.nu,mobilkunden.dk##.tower bold.dk##div[id$=-banner] diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 27f3bc012..70f1ac89f 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: 090220232 +! Version: 120220231 ! 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 @@ -1175,7 +1175,6 @@ itavisen.no##.itavi-article-page-video-player-outstream itavisen.no##.td-adspot-title itavisen.no##.td-c-loop-ad itavisen.no##.td-header-ad-wrap -itavisen.no#?#.code-block:has-text(/Annonse/i) itavisen.no,tvguide.dk##div[id^=ad-] jn.fo##.lysingarspot jodelgrin.dk###text-2 @@ -1267,6 +1266,8 @@ minervanett.no#?#.row:has(> .adnuntius-ad) minmote.no##.advert-container-inline minmote.no##.advert-horseshoe minmote.no#?#*:-abp-has(> div[id^=advert-]) +itavisen.no##.block-wrap-columns +itavisen.no##p[style="text-align: center;"] mittkongsvinger.no##.advertising mobil.nu,mobilkunden.dk##.tower bold.dk##div[id$=-banner] diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 2081227a8..5fe293d11 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: 09February2023v2 +! Version: 12February2023v1 ! 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 @@ -1210,7 +1210,6 @@ itavisen.no##.itavi-article-page-video-player-outstream itavisen.no##.td-adspot-title itavisen.no##.td-c-loop-ad itavisen.no##.td-header-ad-wrap -itavisen.no#?#.code-block:has-text(/Annonse/i) itavisen.no,tvguide.dk##div[id^=ad-] jn.fo##.lysingarspot jodelgrin.dk###text-2 @@ -1307,6 +1306,8 @@ minervanett.no#?#.row:has(> .adnuntius-ad) minmote.no##.advert-container-inline minmote.no##.advert-horseshoe minmote.no##div[id^=advert-]:upward(1) +itavisen.no##.block-wrap-columns +itavisen.no##p[style="text-align: center;"] mittkongsvinger.no##.advertising mobil.nu,mobilkunden.dk##.tower bold.dk##div[id$=-banner] diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index a28d1d528..1500ae837 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: 09February2023v2 +! Version: 12February2023v1 ! 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 @@ -1210,7 +1210,6 @@ itavisen.no##.itavi-article-page-video-player-outstream itavisen.no##.td-adspot-title itavisen.no##.td-c-loop-ad itavisen.no##.td-header-ad-wrap -itavisen.no#?#.code-block:has-text(/Annonse/i) itavisen.no,tvguide.dk##div[id^=ad-] jn.fo##.lysingarspot jodelgrin.dk###text-2 @@ -1307,6 +1306,8 @@ minervanett.no#?#.row:has(> .adnuntius-ad) minmote.no##.advert-container-inline minmote.no##.advert-horseshoe minmote.no##div[id^=advert-]:upward(1) +itavisen.no##.block-wrap-columns +itavisen.no##p[style="text-align: center;"] mittkongsvinger.no##.advertising mobil.nu,mobilkunden.dk##.tower bold.dk##div[id$=-banner] diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 983a4545a..a87688a77 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: 09February2023v2-Alpha +# Version: 12February2023v1-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 0234ebcb7..e6f1b63fd 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -1,7 +1,7 @@ import requests import re -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'] +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'] UNSUPPORTED_ABP = ['$important', ',important', '$redirect=', ',redirect=', ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^', '$$', '$app', '$csp=upgrade-insecure-requests', '$removeparam', 'badfilter', '!#include'] @@ -2173,7 +2173,7 @@ if __name__ == "__main__": import requests import re -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/master/Finland_adb.txt'] +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/master/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'] @@ -4154,7 +4154,7 @@ if __name__ == "__main__": #•X••X••X••X••X••X••X••X••X••X••X••X••X••X••X••X••X••X••X••X••X••X••X••X••X• #\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/\•/ -SOURCES = ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Dandelion%20Sprout\'s%20Anti-Malware%20List.txt'] +SOURCES = ['https://gitlab.com/DandelionSprout/adfilt/-/raw/master/Dandelion%20Sprout\'s%20Anti-Malware%20List.txt'] UNSUPPORTED_ABP = ['$important', ',important' '$redirect=', ',redirect=', ':style', '##+js', '.*#' , ':xpath', ':matches-css', 'dk,no##', 'version.bind', 'pizzaseo.com', 'gamecopyworld', '$app']