From d8d113c460670a39e32612098afc0d284f9545c3 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 24 Feb 2021 04:15:47 +0100 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 4 +++- .../NordicFilters-uMatrixSupplement.txt | 3 ++- .../NordicFiltersABP-Inclusion.txt | 8 ++++++-- .../NordicFiltersABP.txt | 8 ++++++-- .../NordicFiltersAdGuard.txt | 8 ++++++-- .../NordicFiltersPrivacy.txt | 8 ++++++-- .../NordicFiltersPrivoxy.action | 4 +++- .../XYZPrepareFilters.py | 6 ++++++ 8 files changed, 38 insertions(+), 11 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 1b6acf32c..0627e757e 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: 15February2021v2-Alpha +# Version: 24February2021v1-Alpha : expires = 1 # Lisens Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.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 @@ -507,6 +507,7 @@ msFilterList -d ktg-content.cdn.prismic.io *(my.newsletter_popup.uid # https://github.com/easylist/easylist/issues/6067#issuecomment-695115226 +d consent.dk +# https://github.com/easylist/easylist/issues/7269 # ——— Caused by «EasyList» ——— +d _prebid_ @@://billink*.blob.core.windows.net/*/annonser @@ -514,6 +515,7 @@ msFilterList # Forum feeds in the upper right of articles # Makes 1p info banners show up correctly +d _980x100. +# Makes most links show up correctly (Fixed in AdGuard Base) # ——— Caused by «I Don't Care About Cookies» (Its maintainer couldn't reproduce it) ——— # Fullpage uncloseable overlay when browsing around on Telenor Norway's TV section # ——— Unknown cause ——— diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index 45033cad8..9eb272d35 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: 15February2021v2-Alpha +! Version: 24February2021v1-Alpha ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.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 ! 🇩🇰: Denne liste dækker websider for Danmark, Norge, Island, Færøerne, Grønland, Sydslesvig, og den samiske befolkning. For mere information-, detaljer-, nyttige værktøjer- og andre lister, jeg har lavet, besøg https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#dansk @@ -101,6 +101,7 @@ samiteahter.org api.instagram.com * allow ekstrabladet.dk consent.dk third-party allow ! Forum feeds in the upper right of articles ! Makes 1p info banners show up correctly +! Makes most links show up correctly (Fixed in AdGuard Base) ! Fullpage uncloseable overlay when browsing around on Telenor Norway's TV section ekstrabladet.dk notice.sp-prod.net frame allow ekstrabladet.dk sp-prod.net xhr allow diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index a51d36d7c..3f4f4cb85 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: 150220212 +! Version: 240220211 ! Expires: 1 day ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! 🇳🇴: Denne listen dekker nettsteder for Norge, Danmark, Island, Færøyene, Grønland, Schleswig-Holsteins danske minoritet, og samebefolkningen. Denne versjonen av listen inkluderer ikke anti-anti-reklameblokkering, ettersom slike oppføringer ikke er tillatt for lister som er inkludert i Adblock Plus. 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 @@ -1463,6 +1463,8 @@ krom.is#@#.share-container ! https://github.com/easylist/easylist/issues/6067#issuecomment-695115226 @@||consent.dk^$third-party,domain=ekstrabladet.dk dagbladet.no,elbil24.no#@#.subscription-box +! https://github.com/easylist/easylist/issues/7269 +dnb.no#@##consent-modal ! ——— Caused by «EasyList» ——— @@_prebid_$domain=seher.no @@/images/ads-db/right-tower/vipps-sponsor-$domain=canariajournalen.no @@ -1479,6 +1481,8 @@ babyklar.dk#@#.ads300-250 babyklar.dk#@#.ads300_250-widget ! Makes 1p info banners show up correctly @@_980x100.$domain=ruijan-kaiku.no +! Makes most links show up correctly (Fixed in AdGuard Base) +ni.dk#@#a[href*=".adform.net/"] ! ——— Caused by «I Don't Care About Cookies» (Its maintainer couldn't reproduce it) ——— ! Fullpage uncloseable overlay when browsing around on Telenor Norway's TV section @@ -1558,7 +1562,7 @@ gamereactor.no,gamereactor.dk##.videoContent > .clickTag gamereactor.no,gamereactor.dk##a[href*="/adclick.php"] gamereactor.no,gamereactor.dk#?#*:-abp-has(> a[href^="/grtv/"][title*=Sponsored]) gamereactor.no,gamereactor.dk#?#article.rwd_row:-abp-has(a[href$="/sponsoredcontent/"]) -gamereactor.no,gamereactor.dk##div[class^="ad300"] +gamereactor.no,gamereactor.dk##div[class^=ad300] gamereactor.no,gamereactor.dk##div[style*="width:300px;height:600px;"] gamereactor.no,gamereactor.dk##div[style="min-height: 600px; margin-bottom: 20px;"] ||gamereactor.*/lay/ad-video-stats.$script diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 78e0abbf2..1da04bf76 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,7 +1,7 @@ [Adblock Plus 3.4] ! 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: 150220212 +! Version: 240220211 ! Expires: 1 day ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.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 @@ -1476,6 +1476,8 @@ krom.is#@#.share-container ! https://github.com/easylist/easylist/issues/6067#issuecomment-695115226 @@||consent.dk^$third-party,domain=ekstrabladet.dk dagbladet.no,elbil24.no#@#.subscription-box +! https://github.com/easylist/easylist/issues/7269 +dnb.no#@##consent-modal ! ——— Caused by «EasyList» ——— @@_prebid_$domain=seher.no @@/images/ads-db/right-tower/vipps-sponsor-$domain=canariajournalen.no @@ -1492,6 +1494,8 @@ babyklar.dk#@#.ads300-250 babyklar.dk#@#.ads300_250-widget ! Makes 1p info banners show up correctly @@_980x100.$domain=ruijan-kaiku.no +! Makes most links show up correctly (Fixed in AdGuard Base) +ni.dk#@#a[href*=".adform.net/"] ! ——— Caused by «I Don't Care About Cookies» (Its maintainer couldn't reproduce it) ——— ! Fullpage uncloseable overlay when browsing around on Telenor Norway's TV section telenor.no##.global-overlay-background @@ -1572,7 +1576,7 @@ gamereactor.no,gamereactor.dk##.videoContent > .clickTag gamereactor.no,gamereactor.dk##a[href*="/adclick.php"] gamereactor.no,gamereactor.dk#?#*:-abp-has(> a[href^="/grtv/"][title*=Sponsored]) gamereactor.no,gamereactor.dk#?#article.rwd_row:-abp-has(a[href$="/sponsoredcontent/"]) -gamereactor.no,gamereactor.dk##div[class^="ad300"] +gamereactor.no,gamereactor.dk##div[class^=ad300] gamereactor.no,gamereactor.dk##div[style*="width:300px;height:600px;"] gamereactor.no,gamereactor.dk##div[style="min-height: 600px; margin-bottom: 20px;"] ||gamereactor.*/lay/ad-video-stats.$script diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 6d38782c1..cea64b399 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: 15February2021v2 +! Version: 24February2021v1 ! Expires: 1 day ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.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 @@ -1537,6 +1537,8 @@ krom.is#@#.share-container ! https://github.com/easylist/easylist/issues/6067#issuecomment-695115226 @@||consent.dk^$third-party,domain=ekstrabladet.dk dagbladet.no,elbil24.no#@#.subscription-box +! https://github.com/easylist/easylist/issues/7269 +dnb.no#@##consent-modal ! ——— Caused by «EasyList» ——— @@_prebid_$domain=seher.no @@/images/ads-db/right-tower/vipps-sponsor-$domain=canariajournalen.no @@ -1553,6 +1555,8 @@ babyklar.dk#@#.ads300-250 babyklar.dk#@#.ads300_250-widget ! Makes 1p info banners show up correctly @@_980x100.$domain=ruijan-kaiku.no +! Makes most links show up correctly (Fixed in AdGuard Base) +ni.dk#@#a[href*=".adform.net/"] ! ——— Caused by «I Don't Care About Cookies» (Its maintainer couldn't reproduce it) ——— ! Fullpage uncloseable overlay when browsing around on Telenor Norway's TV section telenor.no##.global-overlay-background @@ -1640,7 +1644,7 @@ gamereactor.*##.videoContent > .clickTag gamereactor.*##a[href*="/adclick.php"] gamereactor.*##a[href^="/grtv/"][title*=Sponsored]:upward(1) gamereactor.*#?#article.rwd_row:has(a[href$="/sponsoredcontent/"]) -gamereactor.*##div[class^="ad300"] +gamereactor.*##div[class^=ad300] gamereactor.*##div[style*="width:300px;height:600px;"] gamereactor.*##div[style="min-height: 600px; margin-bottom: 20px;"] gamereactor.*##+js(ra, autoplay) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 45dbc60b1..948ead68c 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: 15February2021v2 +! Version: 24February2021v1 ! Expires: 1 day ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.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 @@ -1537,6 +1537,8 @@ krom.is#@#.share-container ! https://github.com/easylist/easylist/issues/6067#issuecomment-695115226 @@||consent.dk^$third-party,domain=ekstrabladet.dk dagbladet.no,elbil24.no#@#.subscription-box +! https://github.com/easylist/easylist/issues/7269 +dnb.no#@##consent-modal ! ——— Caused by «EasyList» ——— @@/images/ads-db/right-tower/vipps-sponsor-$domain=canariajournalen.no @@ -1553,6 +1555,8 @@ babyklar.dk#@#.ads300-250 babyklar.dk#@#.ads300_250-widget ! Makes 1p info banners show up correctly @@_980x100.$domain=ruijan-kaiku.no +! Makes most links show up correctly (Fixed in AdGuard Base) + ! ——— Caused by «I Don't Care About Cookies» (Its maintainer couldn't reproduce it) ——— ! Fullpage uncloseable overlay when browsing around on Telenor Norway's TV section telenor.no##.global-overlay-background @@ -1640,7 +1644,7 @@ gamereactor.*##.videoContent > .clickTag gamereactor.*##a[href*="/adclick.php"] gamereactor.*##a[href^="/grtv/"][title*=Sponsored]:upward(1) gamereactor.*#?#article.rwd_row:-abp-has(a[href$="/sponsoredcontent/"]) -gamereactor.*##div[class^="ad300"] +gamereactor.*##div[class^=ad300] gamereactor.*##div[style*="width:300px;height:600px;"] gamereactor.*##div[style="min-height: 600px; margin-bottom: 20px;"] gamereactor.*##+js(ra, autoplay) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 70dcf520c..8f2180d7e 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: 15February2021v2-Alpha +# Version: 24February2021v1-Alpha # Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.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 # 🇩🇰: Denne liste dækker websider for Danmark, Norge, Island, Færøerne, Grønland, Sydslesvig, og den samiske befolkning. For mere information-, detaljer-, nyttige værktøjer- og andre lister, jeg har lavet, besøg https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#dansk @@ -738,6 +738,7 @@ {+block{https://github.com/easylist/easylist/issues/6067#issuecomment-695115226}} {-block} +{+block{https://github.com/easylist/easylist/issues/7269}} # ——— Caused by «EasyList» ——— {-block} @@ -757,6 +758,7 @@ # Makes 1p info banners show up correctly {-block} +# Makes most links show up correctly (Fixed in AdGuard Base) # ——— Caused by «I Don't Care About Cookies» (Its maintainer couldn't reproduce it) ——— # Fullpage uncloseable overlay when browsing around on Telenor Norway's TV section # ——— Unknown cause ——— diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index d2e6a195d..937b50a2c 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -1632,6 +1632,12 @@ def prepare_privacy(lines) -> str: line ) + line = re.sub( + r".*#@#.*adform\..*", + "", + line + ) + line = re.sub( "Dandelion Sprouts nordiske filtre for ryddigere nettsider", "Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting)",