Add files via upload

2026-10-05 22:04:30 +01:00 · 2019-05-27 15:08:23 +02:00
parent 616ebcdbf9
commit 7d66d7f199
6 changed files with 47 additions and 31 deletions
@@ -1,6 +1,6 @@
 msFilterList
-# Version: 25May2019v4
-# Version: 250520194 (for Adblock Plus' issue report system)
+# Version: 27May2019v2
+# Version: 270520192 (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
@@ -107,9 +107,9 @@ msFilterList

 # Leftover empty spaces that EasyList have left behind (Section under construction)

-# Empty divider spaces (Section under construction)
+# 🇬🇧: Empty divider spaces (Section under construction)

-# Distracting background images (Section under construction)
+# 🇬🇧: Distracting background images (Section under construction)
 -d images.media.xxlsports.com images h90 h9d 9339713159198 bg.jpg
 -d platekompaniet.no assets img background.png
 -d pepcall.no wp-content uploads 2015 04 bakgrunn-forside.jpg
@@ -206,7 +206,7 @@ msFilterList

 # 🇬🇧: Category: Compatibility entries for ABP users, EasyList, and or functionality whitelisting

-# A(n incomplete) category for anti-anti-adblocking, in the event that https:  forums.lanik.us viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion, in which case they'd be moved to the extension file
+# 🇬🇧: A(n incomplete) category for anti-anti-adblocking, in the event that https:  forums.lanik.us viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion, in which case they'd be moved to the extension file
 +d bondebladet.screen9.tv


@@ -249,7 +249,7 @@ msFilterList



-# Entries that are also present in AdGuard English Filter, for those who use ABP and AdBlock, or who haven't felt a need to spend 8 seconds to subscribe to it in uBlock Origin.
+# 🇬🇧: Entries that are also present in AdGuard English Filter, for those who use ABP and AdBlock, or who haven't felt a need to spend 8 seconds to subscribe to it in uBlock Origin.



@@ -272,6 +272,7 @@ msFilterList
 # Wildcard versions of various entries. Because why only block on one national version of a site, when you can nowadays block on all versions of a site without cluttering things up?


+# 🇬🇧: Unsorted advanced blocking entries that were carried over from a previous uBO-only expansion list.
 -d acdn.adnxs.com ast ast.js
 -d acdn.adnxs.com ast ast.js
 -d fwmrm.net p MTG_Live LinkTag2.js
@@ -361,7 +362,7 @@ msFilterList
 -d thefivereport.online
 -d abafort.us

-# Som nevnt i https:  www.tv2.no nyheter 10493336 
+# 🇳🇴: Som nevnt i https:  www.tv2.no nyheter 10493336 
 -d rnbinance.com
 -d brightertrade.com

@@ -1,6 +1,6 @@
 [Adblock Plus 3.2]
-! Version: 25May2019v4
-! Version: 250520194 (for Adblock Plus' issue report system)
+! Version: 27May2019v2
+! Version: 270520192 (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
@@ -510,7 +510,7 @@ gratiskryssord.no##.adSign
 gratiskryssord.no###adSign
 rssnyheter.sveip.no##div[class^="ad_"]

-! Empty divider spaces (Section under construction)
+! 🇬🇧: Empty divider spaces (Section under construction)
 icelandreview.com,bir.no#?#p:-abp-contains(/^\xA0$/)
 icelandreview.com##.mk-padding-divider
 talkmore.no##.spacer
@@ -520,7 +520,7 @@ tnt-tv.no##.logos
 tnt-tv.no##.tabs_placeholder
 ##.skille

-! Distracting background images (Section under construction)
+! 🇬🇧: Distracting background images (Section under construction)
 ||images.media.xxlsports.com/images/h90/h9d/9339713159198/bg.jpg$image
 ||platekompaniet.no/assets/img/background.png$image
 ||pepcall.no/wp-content/uploads/2015/04/bakgrunn-forside.jpg$image
@@ -723,7 +723,7 @@ fiskeribladet.no##.teaser_overlay

 ! 🇬🇧: Category: Compatibility entries for ABP users, EasyList, and/or functionality whitelisting

-! A(n incomplete) category for anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion, in which case they'd be moved to the extension file
+! 🇬🇧: A(n incomplete) category for anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion, in which case they'd be moved to the extension file
@@||bondebladet.screen9.tv^$generichide
@@*.dk/assets/templates/*/ads.png$image,domain=maskinbladet.dk|agrar-plus.dk|fritidsmarkedet.dk|dagensbyggeri.dk|maskinteknik.dk|gronteknik.dk
 csp.screen9.com#@#.adsbox
@@ -798,7 +798,7 @@ folkebladet.no,hitra-froya.no,rbnett.no,smp.no##.polarisSpid.widget:before



-! Entries that are also present in AdGuard English Filter, for those who use ABP and AdBlock, or who haven't felt a need to spend 8 seconds to subscribe to it in uBlock Origin.
+! 🇬🇧: Entries that are also present in AdGuard English Filter, for those who use ABP and AdBlock, or who haven't felt a need to spend 8 seconds to subscribe to it in uBlock Origin.
 newz.dk##.top-interstitial
 krs247.no#@##adsense
 tu.no,digi.no##.poster-placeholder
@@ -833,6 +833,7 @@ google.no,google.dk,google.is##.rlfl__tls > div[jstcache="0"]:not([class]):not([



+! 🇬🇧: Unsorted advanced blocking entries that were carried over from a previous uBO-only expansion list.
 ||acdn.adnxs.com/ast/ast.js$script,domain=vg.no
 ||fwmrm.net/p/MTG_Live/LinkTag2.js$script,domain=viasatsport.se|viasatsport.fi|tv3sport.dk|viasport.no|viafree.se|viafree.no|viafree.dk|viafree.fi
 ||fwmrm.net^$image,domain=viasatsport.se|viasatsport.fi|tv3sport.dk|viasport.no|viafree.se|viafree.no|viafree.dk|viafree.fi
@@ -919,7 +920,7 @@ google.no,google.dk,google.is##.rlfl__tls > div[jstcache="0"]:not([class]):not([
 ||thefivereport.online^
 ||abafort.us^

-! Som nevnt i https://www.tv2.no/nyheter/10493336/
+! 🇳🇴: Som nevnt i https://www.tv2.no/nyheter/10493336/
 ||rnbinance.com^
 ||brightertrade.com^

@@ -1,5 +1,5 @@
 [AdGuard ≥6]
-! Version: 25May2019v4
+! Version: 27May2019v2

 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard)
 ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard)
@@ -511,7 +511,7 @@ gratiskryssord.no##.adSign
 gratiskryssord.no###adSign
 rssnyheter.sveip.no##div[class^="ad_"]

-! Empty divider spaces (Section under construction)
+! 🇬🇧: Empty divider spaces (Section under construction)
 icelandreview.com,bir.no#?#p:-abp-contains(/^\xA0$/)
 icelandreview.com##.mk-padding-divider
 talkmore.no##.spacer
@@ -521,7 +521,7 @@ tnt-tv.no##.logos
 tnt-tv.no##.tabs_placeholder
 ##.skille

-! Distracting background images (Section under construction)
+! 🇬🇧: Distracting background images (Section under construction)
 ||images.media.xxlsports.com/images/h90/h9d/9339713159198/bg.jpg$image
 ||platekompaniet.no/assets/img/background.png$image
 ||pepcall.no/wp-content/uploads/2015/04/bakgrunn-forside.jpg$image
@@ -724,7 +724,7 @@ fiskeribladet.no##.teaser_overlay

 ! 🇬🇧: Category: Compatibility entries for ABP users, EasyList, and/or functionality whitelisting

-! A(n incomplete) category for anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion, in which case they'd be moved to the extension file
+! 🇬🇧: A(n incomplete) category for anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion, in which case they'd be moved to the extension file
@@||bondebladet.screen9.tv^$generichide
@@*.dk/assets/templates/*/ads.png$image,domain=maskinbladet.dk|agrar-plus.dk|fritidsmarkedet.dk|dagensbyggeri.dk|maskinteknik.dk|gronteknik.dk
 csp.screen9.com#@#.adsbox
@@ -799,7 +799,7 @@ folkebladet.no,hitra-froya.no,rbnett.no,smp.no##.polarisSpid.widget:before
 !#endif

 !#if !adguard
-! Entries that are also present in AdGuard English Filter, for those who use ABP and AdBlock, or who haven't felt a need to spend 8 seconds to subscribe to it in uBlock Origin.
+! 🇬🇧: Entries that are also present in AdGuard English Filter, for those who use ABP and AdBlock, or who haven't felt a need to spend 8 seconds to subscribe to it in uBlock Origin.
 newz.dk##.top-interstitial
 krs247.no#@##adsense
 tu.no,digi.no##.poster-placeholder
@@ -900,6 +900,7 @@ dk,no##div.spklw-post-attr:has(div[class*="spklw-sponsored"])
 no##.polarisSpid.widget:before
 !#endif

+! 🇬🇧: Unsorted advanced blocking entries that were carried over from a previous uBO-only expansion list.
 ||acdn.adnxs.com/ast/ast.js$script,important,domain=vg.no
 ||acdn.adnxs.com/ast/ast.js$script,redirect=noopjs,important,domain=vgtv.no
 ||fwmrm.net/p/MTG_Live/LinkTag2.js$script,important,domain=viasatsport.se|viasatsport.fi|tv3sport.dk|viasport.no|viafree.se|viafree.no|viafree.dk|viafree.fi
@@ -989,7 +990,7 @@ no##.polarisSpid.widget:before
 ||thefivereport.online^$empty,important
 ||abafort.us^$empty,important

-! Som nevnt i https://www.tv2.no/nyheter/10493336/
+! 🇳🇴: Som nevnt i https://www.tv2.no/nyheter/10493336/
 ||rnbinance.com^$empty,important
 ||brightertrade.com^$empty,important

@@ -1,6 +1,6 @@
 # Title: 📔 Dandelion Sprouts nordiske filtre («hosts.deny»-versjonen)
 # Translated title: Dandelion Sprout's Nordic Filters (The «hosts.deny» version)
-# Version: 19May2019v2
+# Version: 19May2019v2-Beta
 # Description: This is a slimmer version of "Dandelion Sprout's Nordic Filters", intended for users of software tools that doesn't support adblocker syntaxes. It chiefly targets scams and malware on Norwegian or Danish sites, as well as some advert and tracking servers.
 # Platform notes: This list version is intended for those who still use a Linux system function called «hosts.deny».
 # For mere informasjon og detaljer om denne listen og om andre lister jeg har laget, gå til https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#norsk
@@ -1,6 +1,6 @@
 {+block}
-# Version: 25May2019v4
-# Version: 250520194 (for Adblock Plus' issue report system)
+# Version: 27May2019v2-Alpha
+# Version: 270520192 (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
@@ -99,9 +99,9 @@
 #
 # Leftover empty spaces that EasyList have left behind (Section under construction)
 #
-# Empty divider spaces (Section under construction)
+{+block{Empty divider spaces (Section under construction)}}
 #
-# Distracting background images (Section under construction)
+{+block{Distracting background images (Section under construction)}}
 .images.media.xxlsports.com/images/h90/h9d/9339713159198/bg.jpg
 .platekompaniet.no/assets/img/background.png
 .pepcall.no/wp-content/uploads/2015/04/bakgrunn-forside.jpg
@@ -195,7 +195,7 @@
 #
 {+block{Category: Compatibility entries for ABP users, EasyList, and/or functionality whitelisting}}
 #
-# A(n incomplete) category for anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion, in which case they'd be moved to the extension file
+{+block{A(n incomplete) category for anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion, in which case they'd be moved to the extension file}}
 .elderlyscissors.com
 #
 #
@@ -222,7 +222,7 @@
 #
 #
 #
-# Entries that are also present in AdGuard English Filter, for those who use ABP and AdBlock, or who haven't felt a need to spend 8 seconds to subscribe to it in uBlock Origin.
+{+block{Entries that are also present in AdGuard English Filter, for those who use ABP and AdBlock, or who haven't felt a need to spend 8 seconds to subscribe to it in uBlock Origin.}}
 #
 #
 #
@@ -245,6 +245,7 @@
 # Wildcard versions of various entries. Because why only block on one national version of a site, when you can nowadays block on all versions of a site without cluttering things up?
 #
 #
+{+block{Unsorted advanced blocking entries that were carried over from a previous uBO-only expansion list.}}
 .acdn.adnxs.com/ast/ast.js
 .acdn.adnxs.com/ast/ast.js
 .fwmrm.net/p/MTG_Live/LinkTag2.js
@@ -333,7 +334,7 @@
 .thefivereport.online
 .abafort.us
 #
-# Som nevnt i https://www.tv2.no/nyheter/10493336/
+# 🇳🇴: Som nevnt i https://www.tv2.no/nyheter/10493336/
 .rnbinance.com
 .brightertrade.com
 #
@@ -3,7 +3,7 @@ import re

 SOURCES = ['https://gitlab.com/DandelionSprout/adfilt/raw/master/NorwegianList.txt']

-UNSUPPORTED_ABP = ['$document', '$important', ',important' '$redirect=', ',redirect=',
+UNSUPPORTED_ABP = ['$important', ',important' '$redirect=', ',redirect=',
    ':style', '##+js', '.*#' , ':xpath', ':matches-css', 'dk,no##']
 UNSUPPORTED_TPL = ['##', '#@#', '#?#', r'\.no\.$']
 UNSUPPORTED_PRIVOXY = ['##', '#@#', '#?#', '@@', '!#']
@@ -31,7 +31,7 @@ def prepare_ag(lines) -> str:

        # until this is done: https://github.com/AdguardTeam/CoreLibs/issues/152
        line = re.sub(
-           r"\$document.*", 
+           r"\$doc.*", 
           "$empty,important", 
           line
       )
@@ -86,7 +86,7 @@ def prepare_abp(lines) -> str:

        # remove $document modifier from the rule
        line = re.sub(
-           "\$document.*", 
+           r"\$doc.*", 
           "", 
           line
        )
@@ -411,6 +411,12 @@ def prepare_privoxy(lines) -> str:
           line
        )

+        line = re.sub(
+           r"(# Version: .*[0-9][A-Z].*)", 
+           r"\1-Alpha", 
+           line
+        )
+
        if is_supported_privoxy(line):
          text += line + '\r\n'

@@ -655,6 +661,12 @@ def prepare_hostsdeny(lines) -> str:
           line
        )

+        line = re.sub(
+           r"(# Version: .*)", 
+           r"\1-Beta", 
+           line
+        )
+
        if is_supported_hosts(line):
            text += line + '\r\n'