diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index fab00c58d..6f44c6d98 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,6 +1,6 @@ msFilterList -# Version: 05June2019v2-Beta -# Version: 050620192 (for Adblock Plus' issue report system) +# Version: 05June2019v3-Beta +# Version: 050620193 (for Adblock Plus' issue report system) # 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.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 145854089..478782b5a 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,7 +1,7 @@ [Adblock Plus 3.2] -! Version: 05June2019v2 -! Version: 050620192 (for Adblock Plus' issue report system) -! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdBlock and Adblock Plus) +! Version: 05June2019v3 +! Version: 050620193 (for Adblock Plus' issue report system) +! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdBlock and Adblock Plus) ! Expires: 12 hours @@ -630,7 +630,7 @@ tv2.no###tv2_8533699 tv2.no##.lab-skin-cm.medium-4.small-12.large-4.boxwrapper.tv2-story tv2.no##.doubleClickAd tv2.no##a[href*="&utm_source=Blogg"] -@@||www.tv2.no/s/js/ads.js$script,~3p +@@||www.tv2.no/s/js/ads.js$script,~third-party ! ↓ Attempting to fix a problem with voting online on Idol Norway when using EasyPrivacy. ↓ @@||tv2.no/*/config/analytics.json$~third-party diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 98ceb706d..520e5b5b2 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,5 +1,5 @@ [AdGuard ≥6] -! Version: 05June2019v2 +! Version: 05June2019v3 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard) @@ -632,7 +632,7 @@ tv2.no###tv2_8533699 tv2.no##.lab-skin-cm.medium-4.small-12.large-4.boxwrapper.tv2-story tv2.no##.doubleClickAd tv2.no##a[href*="&utm_source=Blogg"] -@@||www.tv2.no/s/js/ads.js$script,~3p +@@||www.tv2.no/s/js/ads.js$script,~third-party ! ↓ Attempting to fix a problem with voting online on Idol Norway when using EasyPrivacy. ↓ @@||tv2.no/*/config/analytics.json$~third-party diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index bfc2b40f7..db17362a5 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,5 +1,5 @@ -! Version: 05June2019v2 +! Version: 05June2019v3 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) @@ -632,7 +632,7 @@ tv2.no###tv2_8533699 tv2.no##.lab-skin-cm.medium-4.small-12.large-4.boxwrapper.tv2-story tv2.no##.doubleClickAd tv2.no##a[href*="&utm_source=Blogg"] -@@||www.tv2.no/s/js/ads.js$script,~3p +@@||www.tv2.no/s/js/ads.js$script,1p ! ↓ Attempting to fix a problem with voting online on Idol Norway when using EasyPrivacy. ↓ diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index b26f63d81..98a1c874e 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,6 +1,6 @@ {+block} -# Version: 05June2019v2-Alpha -# Version: 050620192 (for Adblock Plus' issue report system) +# Version: 05June2019v3-Alpha +# Version: 050620193 (for Adblock Plus' issue report system) # 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 diff --git a/NorwegianExperimentalList alternate versions/xyz_nordic_lists.py b/NorwegianExperimentalList alternate versions/xyz_nordic_lists.py index 464d805fd..9fcf0eb30 100644 --- a/NorwegianExperimentalList alternate versions/xyz_nordic_lists.py +++ b/NorwegianExperimentalList alternate versions/xyz_nordic_lists.py @@ -68,7 +68,7 @@ def prepare_ag(lines) -> str: ) line = re.sub( - r"([$,])3p", + r"([$,~])3p", r"\1third-party", line ) @@ -112,8 +112,14 @@ def prepare_abp(lines) -> str: ) line = re.sub( - r"(itle:.*Dandelion Sprout.*)", - r"\1 (for AdBlock and Adblock Plus)", + "Dandelion Sprouts nordiske filtre for ryddigere nettsider", + "Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus)", + line + ) + + line = re.sub( + "Dandelion Sprout's Nordic filters for tidier websites", + "Dandelion Sprout's Nordic filters for tidier websites (for AdBlock and Adblock Plus)", line ) @@ -142,7 +148,7 @@ def prepare_abp(lines) -> str: ) line = re.sub( - r"([$,])3p", + r"([$,~])3p", r"\1third-party", line ) @@ -153,6 +159,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"([$,])1p", + r"\1~third-party", + line + ) + if is_supported_abp(line): text += line + '\r\n'