diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 226068a1d..661c04c82 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 28May2020v1-Alpha +# Version: 28May2020v2-Alpha # Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Eyeo.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Eyeo.txt index 928fb88f6..ccf7dc783 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Eyeo.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Eyeo.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 280520201 +! Version: 280520202 ! Title: πŸ”οΈ Dandelion Sprouts vestnordiske filtre for ryddigere nettsider (for Adblock Plus - MΓΈter Eyeo sine regler) ! Translated title: Dandelion Sprout's West Nordic filters for tidier websites (for Adblock Plus with Eyeo compliance) ! Expires: 12 hours @@ -873,7 +873,8 @@ krom.is#@#.share-container @@||fe.adstate.net/assets/common/img/web_ad^$domain=ba.no|nidaros.no @@||fe.adstate.net/stream_file.php?type=ad_preview_image$domain=ba.no|nidaros.no -!#include NorwegianExperimentalList%20alternate%20versions/AntiAdblockEntries.txt + + ! πŸ‡³πŸ‡΄: β€”β€”β€” ForsΓΈker Γ₯ fΓ₯ nettleseren til Γ₯ laste inn filer i HTTPS, dersom nettstedet ikke automatisk omdirigerer HTTP til dens HTTPS-versjon β€”β€”β€” ! πŸ‡¬πŸ‡§: β€”β€”β€” Tries to make the web browser load files in HTTPS, if the website itself doesn't automatically redirect from HTTP to its HTTPS version β€”β€”β€” diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index bb5b4d0c4..b004d08c5 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 280520201 +! Version: 280520202 ! 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) ! Expires: 12 hours @@ -873,8 +873,10 @@ krom.is#@#.share-container @@||fe.adstate.net/assets/common/img/web_ad^$domain=ba.no|nidaros.no @@||fe.adstate.net/stream_file.php?type=ad_preview_image$domain=ba.no|nidaros.no + !#include NorwegianExperimentalList%20alternate%20versions/AntiAdblockEntries.txt + ! πŸ‡³πŸ‡΄: β€”β€”β€” ForsΓΈker Γ₯ fΓ₯ nettleseren til Γ₯ laste inn filer i HTTPS, dersom nettstedet ikke automatisk omdirigerer HTTP til dens HTTPS-versjon β€”β€”β€” ! πŸ‡¬πŸ‡§: β€”β€”β€” Tries to make the web browser load files in HTTPS, if the website itself doesn't automatically redirect from HTTP to its HTTPS version β€”β€”β€” ! Credit to https://raw.githubusercontent.com/Cybo1927/Hosts/master/Anti/Anti%2520Third-Party%2520HTTP for showing me the existence of this particular CSP command. diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 99c47b95a..b9589e30b 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 28May2020v1 +! Version: 28May2020v2 ! Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard) ! Expires: 12 hours @@ -906,7 +906,11 @@ krom.is#@#.share-container @@||fe.adstate.net/assets/common/img/web_ad^$domain=ba.no|nidaros.no @@||fe.adstate.net/stream_file.php?type=ad_preview_image$domain=ba.no|nidaros.no + +!#if ext_ublock !#include NorwegianExperimentalList%20alternate%20versions/AntiAdblockEntries.txt +!#endif + ! πŸ‡³πŸ‡΄: β€”β€”β€” ForsΓΈker Γ₯ fΓ₯ nettleseren til Γ₯ laste inn filer i HTTPS, dersom nettstedet ikke automatisk omdirigerer HTTP til dens HTTPS-versjon β€”β€”β€” ! πŸ‡¬πŸ‡§: β€”β€”β€” Tries to make the web browser load files in HTTPS, if the website itself doesn't automatically redirect from HTTP to its HTTPS version β€”β€”β€” diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt index 9941283b2..169f282ef 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 28May2020v1-Alpha +! Version: 28May2020v2-Alpha ! Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Brave Browser) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Brave Browser) ! Expires: 12 hours diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index bbb76abfe..d0447ff02 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 28May2020v1 +! Version: 28May2020v2 ! Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) ! Expires: 12 hours @@ -906,7 +906,11 @@ krom.is#@#.share-container @@||fe.adstate.net/assets/common/img/web_ad^$domain=ba.no|nidaros.no @@||fe.adstate.net/stream_file.php?type=ad_preview_image$domain=ba.no|nidaros.no + +!#if ext_ublock !#include NorwegianExperimentalList%20alternate%20versions/AntiAdblockEntries.txt +!#endif + ! πŸ‡³πŸ‡΄: β€”β€”β€” ForsΓΈker Γ₯ fΓ₯ nettleseren til Γ₯ laste inn filer i HTTPS, dersom nettstedet ikke automatisk omdirigerer HTTP til dens HTTPS-versjon β€”β€”β€” ! πŸ‡¬πŸ‡§: β€”β€”β€” Tries to make the web browser load files in HTTPS, if the website itself doesn't automatically redirect from HTTP to its HTTPS version β€”β€”β€” diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index e0d7b28cb..214fc3728 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 28May2020v1-Alpha +# Version: 28May2020v2-Alpha # Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy) # Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy) # Expires: 12 hours @@ -295,6 +295,10 @@ contentMarketing # # # +# +# +# +# # πŸ‡³πŸ‡΄: β€”β€”β€” ForsΓΈker Γ₯ fΓ₯ nettleseren til Γ₯ laste inn filer i HTTPS, dersom nettstedet ikke automatisk omdirigerer HTTP til dens HTTPS-versjon β€”β€”β€” {+block{β€”β€”β€” Tries to make the web browser load files in HTTPS, if the website itself doesn't automatically redirect from HTTP to its HTTPS version β€”β€”β€”}} # Credit to https://raw.githubusercontent.com/Cybo1927/Hosts/master/Anti/Anti%2520Third-Party%2520HTTP for showing me the existence of this particular CSP command. diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index bd44a13e6..4868cacb5 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -1462,7 +1462,7 @@ import re SOURCES = ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianList.txt'] UNSUPPORTED_ABP = ['$important', ',important', '$redirect=', ',redirect=', - ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^'] + ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^', '!#i'] OUTPUT = 'xyzzyxeyeo.txt' OUTPUT_ABP = 'NordicFiltersABP-Eyeo.txt'