Fixes for the AdGuard and ABP-Eyeo versions

2026-10-04 16:41:09 +01:00 · 2020-05-28 16:47:00 +02:00
parent 765335acad
commit 6437aeb4b0
8 changed files with 24 additions and 9 deletions
@@ -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
@@ -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 ———
@@ -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.
@@ -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 ———
@@ -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
@@ -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 ———
@@ -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.
@@ -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'