diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 53fbcfceb..7bb8b028a 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: 24January2022v2-Alpha +# Version: 24January2022v3-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 @@ -571,6 +571,7 @@ msFilterList # ★★★ Caused by «Fanboy's Annoyances List» and «EasyList Cookie List» ★★★ # https://github.com/ryanbr/fanboy-adblock/issues/1243 -d ktg-content.cdn.prismic.io *(my.newsletter_popup.uid +# https://github.com/easylist/easylist/issues/10565 # ★★★ Caused by «EasyList» ★★★ +d _prebid_ @@://billink*.blob.core.windows.net/*/annonser diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt index 3e0802738..7d6db0bce 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: 24January2022v2-Beta +! Version: 24January2022v3-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 @@ -1825,6 +1825,11 @@ altibox.no#@##coiOverlay[role="banner"][style*="flex"] dagbladet.no,elbil24.no#@#.subscription-box ! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid +! https://github.com/easylist/easylist/issues/10565 +blaklader.*#@#.optanon-show-settings +blaklader.*#@##onetrust-banner-sdk +blaklader.*#@##onetrust-consent-sdk +@@||googletagmanager.com/gtm.js$domain=blaklader.no|blaklader.dk ! ★★★ Caused by «EasyList» ★★★ @@_prebid_$domain=seher.no @@/images/ads-db/right-tower/vipps-sponsor-$domain=canariajournalen.no diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index f6d44fa10..fcfcd62b8 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: 24January2022v2-Alpha +! Version: 24January2022v3-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 2524c887e..81d9121be 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1,7 +1,7 @@ [Adblock Plus 3.7] ! 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: 240120222 +! Version: 240120223 ! 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 @@ -1741,6 +1741,11 @@ altibox.no#@##coiOverlay[role="banner"][style*="flex"] dagbladet.no,elbil24.no#@#.subscription-box ! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid +! https://github.com/easylist/easylist/issues/10565 +blaklader.no,blaklader.dk#@#.optanon-show-settings +blaklader.no,blaklader.dk#@##onetrust-banner-sdk +blaklader.no,blaklader.dk#@##onetrust-consent-sdk +@@||googletagmanager.com/gtm.js$domain=blaklader.no|blaklader.dk ! ★★★ Caused by «EasyList» ★★★ @@_prebid_$domain=seher.no @@/images/ads-db/right-tower/vipps-sponsor-$domain=canariajournalen.no diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 84816c20f..5cc487da5 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,7 +1,7 @@ [Adblock Plus 3.6] ! 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: 240120222 +! Version: 240120223 ! 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 @@ -1755,6 +1755,11 @@ altibox.no#@##coiOverlay[role="banner"][style*="flex"] dagbladet.no,elbil24.no#@#.subscription-box ! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid +! https://github.com/easylist/easylist/issues/10565 +blaklader.no,blaklader.dk#@#.optanon-show-settings +blaklader.no,blaklader.dk#@##onetrust-banner-sdk +blaklader.no,blaklader.dk#@##onetrust-consent-sdk +@@||googletagmanager.com/gtm.js$domain=blaklader.no|blaklader.dk ! ★★★ Caused by «EasyList» ★★★ @@_prebid_$domain=seher.no @@/images/ads-db/right-tower/vipps-sponsor-$domain=canariajournalen.no diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 0a78a5e21..958d3c3dd 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: 24January2022v2 +! Version: 24January2022v3 ! 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 @@ -1824,6 +1824,11 @@ altibox.no#@##coiOverlay[role="banner"][style*="flex"] dagbladet.no,elbil24.no#@#.subscription-box ! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid +! https://github.com/easylist/easylist/issues/10565 +blaklader.*#@#.optanon-show-settings +blaklader.*#@##onetrust-banner-sdk +blaklader.*#@##onetrust-consent-sdk +@@||googletagmanager.com/gtm.js$domain=blaklader.no|blaklader.dk ! ★★★ Caused by «EasyList» ★★★ @@_prebid_$domain=seher.no @@/images/ads-db/right-tower/vipps-sponsor-$domain=canariajournalen.no diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 9d2f6cd71..ddb184e5a 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: 24January2022v2 +! Version: 24January2022v3 ! 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 @@ -1824,6 +1824,11 @@ altibox.no#@##coiOverlay[role="banner"][style*="flex"] dagbladet.no,elbil24.no#@#.subscription-box ! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid +! https://github.com/easylist/easylist/issues/10565 +blaklader.*#@#.optanon-show-settings +blaklader.*#@##onetrust-banner-sdk +blaklader.*#@##onetrust-consent-sdk +@@||googletagmanager.com/gtm.js$domain=blaklader.no|blaklader.dk ! ★★★ Caused by «EasyList» ★★★ @@/images/ads-db/right-tower/vipps-sponsor-$domain=canariajournalen.no diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 18f6d0c09..444f85896 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: 24January2022v2-Alpha +# Version: 24January2022v3-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 @@ -814,6 +814,9 @@ {+block{https://github.com/ryanbr/fanboy-adblock/issues/1243}} {+block} .ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid +{+block{https://github.com/easylist/easylist/issues/10565}} +{-block} + # ★★★ Caused by «EasyList» ★★★ {-block} diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index ff709677e..2b7d54662 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -782,6 +782,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"([a-z*][=|])blaklader\.\*", + r"\1blaklader.no|blaklader.dk", + line + ) + line = re.sub( r"\$ghide", r"$generichide", @@ -2795,6 +2801,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"([a-z*][=|])blaklader\.\*", + r"\1blaklader.no|blaklader.dk", + line + ) + line = re.sub( r"\$ghide", r"$generichide",