From d411bee5f0e5786bbd8b25fe83a5637f70231e12 Mon Sep 17 00:00:00 2001 From: Imre Eilertsen Date: Fri, 5 Apr 2024 05:49:26 +0200 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 8 ++++++-- .../NordicFilters-uBOLegacy.txt | 9 ++++++--- .../NordicFilters-uMatrixSupplement.txt | 6 ++++-- .../NordicFiltersABP-Inclusion.txt | 4 ++-- .../NordicFiltersABP.txt | 8 +++++--- .../NordicFiltersAdGuard.txt | 9 ++++++--- .../NordicFiltersPrivacy.txt | 9 ++++++--- .../NordicFiltersPrivoxy.action | 10 +++++++--- .../XYZPrepareFilters.py | 2 +- 9 files changed, 43 insertions(+), 22 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 6f8547b7c..8d9227476 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 # Title 🇬🇧: Dandelion Sprout's Nordic filters for tidier websites -# Version: 27March2024v1-Deprecated +# Version: 04April2024v1-Deprecated : expires = 18 hours # Lisens Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md # Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -591,6 +591,8 @@ msFilterList # 🇳🇴: Får Discovery+ sin påloggingsside til å vises riktig # 🇬🇧: Makes Discovery+'s login page show up properly # https://github.com/easylist/easylist/issues/18542/(These/entries/are here to stay, regardless of the report's outcome.) ++d medlemskap.*.no +-d medlemskap.fagforbundet.no # ★★★ Caused by «Fanboy's Social Blocking List», if I recall correctly ★★★ +d api.instagram.com # https://github.com/ryanbr/fanboy-adblock/issues/1261 @@ -1126,7 +1128,7 @@ msFilterList -d 1.14.61.188 -d smarthouseforum.ru -d trafikkskoleapp.no -# Last updated: 10March2024v1-Extension +# Last updated: 03April2024v1-Extension # 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— # Takk til THEtomaso (https://github.com/THEtomaso)/for/de/fleste/av/disse/oppføringene. # 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— @@ -1152,6 +1154,8 @@ msFilterList # https://github.com/finnish-easylist-addition/finnish-easylist-addition/issues/305 # https://www.findroommate.dk/vaerelser/302142/stort-lyst-vaerelse-taet-paa-aarhus-i-viby-centrum/(17/12/2021) # https://github.com/uBlockOrigin/uAssets/issues/13495 +# The green "Abonner" button in the upper right appears to work perfectly even with this entry, and the entry does not cause the Plus article bodies to appear either, so I feel I'm on safe enough grounds on this one. +-d piano.io execute # 🇬🇧: ——— Not actually AAB, but would've caused fatal breakage in ABP ——— # 🇳🇴 🇩🇰: ——— Ikke for Brave Browser ——— # 🇬🇧: ——— Not for Brave Browser ——— diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt index 718f3f576..e428ad4c8 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») ! Title 🇬🇧: Dandelion Sprout's Nordic filters for tidier websites (for «uBlock Origin Legacy») -! Version: 27March2024v1-Beta +! Version: 04April2024v1-Beta ! Expires: 18 hours ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -2062,9 +2062,10 @@ www.dr.dk#@#[href*=".smartadserver.com"] ! 🇬🇧: Makes Discovery+'s login page show up properly @@||mparticle.com^*/login$domain=discoveryplus.no|discoveryplus.dk ! https://github.com/easylist/easylist/issues/18542 (These entries are here to stay, regardless of the report's outcome.) -@@||medlemskap.*.no/$1p +@@||medlemskap.*.no^ @@||bestill.help.no^$1p @@||ask.antalis.no^$1p +||medlemskap.fagforbundet.no^$badfilter ! ★★★ Caused by «Fanboy's Social Blocking List», if I recall correctly ★★★ krom.is#@#.share-container @@/images/*youtube.jpg$domain=realityportalen.dk @@ -2933,7 +2934,7 @@ triplx.dk##.aff-inner-col !#if adguard !#include AdditionalGenericEntriesForAdGuard.txt !#endif -! Last updated: 10March2024v1-Extension +! Last updated: 03April2024v1-Extension ! 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— ! Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. ! 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— @@ -3037,6 +3038,8 @@ findroommate.dk###frm-ablo-message bold.dk##+js(acs, EventTarget.prototype.addEventListener, window.TextDecoder) bold.dk##+js(nofab) !#endif +! The green "Abonner" button in the upper right appears to work perfectly even with this entry, and the entry does not cause the Plus article bodies to appear either, so I feel I'm on safe enough grounds on this one. +||piano.io/xbuilder/experience/execute^$xhr,domain=www.digi.no|www.tu.no ! 🇬🇧: ——— Not actually AAB, but would've caused fatal breakage in ABP ——— playpilot.com##.takeover.modals diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index 79304bb3c..fe1a11a80 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) ! Title 🇬🇧: Dandelion Sprout's Nordic filters for tidier websites (uMatrix rules to use together with the raw domains version) -! Version: 27March2024v1-Alpha +! Version: 04April2024v1-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 @@ -101,6 +101,7 @@ discoveryplus.dk prod-adops-proxy.dnitv.net * block ! 🇬🇧: Makes Discovery+'s login page show up properly @@||bestill.help.no^$1p @@||ask.antalis.no^$1p +* medlemskap.fagforbundet.no badfilter block ! ★★★ Caused by «Fanboy's Social Blocking List», if I recall correctly ★★★ samiteahter.org api.instagram.com * allow gulesider.no cookieinformation.com * allow @@ -209,9 +210,10 @@ in-addr.arpa 193.148.70.153 * allow ! 🇬🇧: Old domains stolen by casino sites ! 🇬🇧: Copied over from DNS-BH Malware Domains and verified to actually be malicious (as that list has a whole lot of false positives) ! 🇬🇧: Copied over from URLHaus and verified -! Last updated: 10March2024v1-Extension +! Last updated: 03April2024v1-Extension ! Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. ! Tak til THEtomaso (https://github.com/THEtomaso) for de fleste af disse regler. ! Thanks to THEtomaso (https://github.com/THEtomaso) for most of these entries. ! Also fixed in "uBlock Filters - Privacy", but is added to this list as well, because it serves to remove AAAB notices on various pages (especially when "uBlock Filters" is turned on). +! The green "Abonner" button in the upper right appears to work perfectly even with this entry, and the entry does not cause the Plus article bodies to appear either, so I feel I'm on safe enough grounds on this one. ! Last updated: 09February2022v1-Extension diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index 942bd69e8..bd040797f 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1,7 +1,7 @@ [Adblock Plus 3.13] ! Title: 🏔️ Dandelion Sprouts helnordiske filtre for ryddigere nettsider (for Adblock Plus - Møter ABP sine inkluderingsregler — Firefox ≥v121,x og Chromium ≥105,x) ! Title 🇬🇧: Dandelion Sprout's All-Nordic filters for tidier websites (for Adblock Plus with ABP inclusion compliance — Firefox ≥v121.x, Chromium ≥105.x) -! Version: 270320241 +! Version: 040420241 ! Expires: 18 hours ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -1981,7 +1981,7 @@ www.dr.dk#@#[href*=".smartadserver.com"] ! 🇬🇧: Makes Discovery+'s login page show up properly @@||mparticle.com^*/login$domain=discoveryplus.no|discoveryplus.dk ! https://github.com/easylist/easylist/issues/18542 (These entries are here to stay, regardless of the report's outcome.) -@@||medlemskap.*.no/$~third-party +@@||medlemskap.*.no^ @@||bestill.help.no^$~third-party @@||ask.antalis.no^$~third-party ! ★★★ Caused by «Fanboy's Social Blocking List», if I recall correctly ★★★ diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 8e088b6d1..94e6b1e57 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,7 +1,7 @@ [Adblock Plus 3.13] ! Title: 🏔️ Dandelion Sprouts vestnordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus) ! Title 🇬🇧: Dandelion Sprout's West Nordic filters for tidier websites (for AdBlock and Adblock Plus) -! Version: 270320241 +! Version: 040420241 ! Expires: 18 hours ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -1992,7 +1992,7 @@ www.dr.dk#@#[href*=".smartadserver.com"] ! 🇬🇧: Makes Discovery+'s login page show up properly @@||mparticle.com^*/login$domain=discoveryplus.no|discoveryplus.dk ! https://github.com/easylist/easylist/issues/18542 (These entries are here to stay, regardless of the report's outcome.) -@@||medlemskap.*.no/$~third-party +@@||medlemskap.*.no^ @@||bestill.help.no^$~third-party @@||ask.antalis.no^$~third-party ! ★★★ Caused by «Fanboy's Social Blocking List», if I recall correctly ★★★ @@ -2931,7 +2931,7 @@ triplx.dk##.aff-inner-col -! Last updated: 10March2024v1-Extension +! Last updated: 03April2024v1-Extension ! 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— ! Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. ! 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— @@ -3002,6 +3002,8 @@ gamereactor.no,gamereactor.dk#$#abort-current-inline-script AdsReloadConfig ! https://www.findroommate.dk/vaerelser/302142/stort-lyst-vaerelse-taet-paa-aarhus-i-viby-centrum (17/12/2021) findroommate.dk###frm-ablo-message ! https://github.com/uBlockOrigin/uAssets/issues/13495 +! The green "Abonner" button in the upper right appears to work perfectly even with this entry, and the entry does not cause the Plus article bodies to appear either, so I feel I'm on safe enough grounds on this one. +||piano.io/xbuilder/experience/execute^$xmlhttprequest,domain=www.digi.no|www.tu.no ! 🇬🇧: ——— Not actually AAB, but would've caused fatal breakage in ABP ——— playpilot.com##.takeover.modals diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index fcb6c8239..89cf336ac 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) ! Title 🇬🇧: Dandelion Sprout's Nordic filters for tidier websites -! Version: 27March2024v1 +! Version: 04April2024v1 ! Expires: 18 hours ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -2061,9 +2061,10 @@ www.dr.dk#@#[href*=".smartadserver.com"] ! 🇬🇧: Makes Discovery+'s login page show up properly @@||mparticle.com^*/login$domain=discoveryplus.* ! https://github.com/easylist/easylist/issues/18542 (These entries are here to stay, regardless of the report's outcome.) -@@||medlemskap.*.no/$~third-party +@@||medlemskap.*.no^ @@||bestill.help.no^$~third-party @@||ask.antalis.no^$~third-party +||medlemskap.fagforbundet.no^$badfilter ! ★★★ Caused by «Fanboy's Social Blocking List», if I recall correctly ★★★ krom.is#@#.share-container @@/images/*youtube.jpg$domain=realityportalen.dk @@ -2932,7 +2933,7 @@ triplx.dk##.aff-inner-col !#if adguard !#include AdditionalGenericEntriesForAdGuard.txt !#endif -! Last updated: 10March2024v1-Extension +! Last updated: 03April2024v1-Extension ! 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— ! Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. ! 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— @@ -3036,6 +3037,8 @@ findroommate.dk###frm-ablo-message bold.dk##+js(acs, EventTarget.prototype.addEventListener, window.TextDecoder) bold.dk##+js(nofab) !#endif +! The green "Abonner" button in the upper right appears to work perfectly even with this entry, and the entry does not cause the Plus article bodies to appear either, so I feel I'm on safe enough grounds on this one. +||piano.io/xbuilder/experience/execute^$xmlhttprequest,domain=www.digi.no|www.tu.no ! 🇬🇧: ——— Not actually AAB, but would've caused fatal breakage in ABP ——— playpilot.com##.takeover.modals diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index eba2f46e9..8dad68810 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) ! Title 🇬🇧: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) -! Version: 27March2024v1 +! Version: 04April2024v1 ! Expires: 18 hours ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -2061,9 +2061,10 @@ www.dr.dk#@#[href*=".smartadserver.com"] ! 🇬🇧: Makes Discovery+'s login page show up properly ! https://github.com/easylist/easylist/issues/18542 (These entries are here to stay, regardless of the report's outcome.) -@@||medlemskap.*.no/$1p +@@||medlemskap.*.no^ @@||bestill.help.no^$1p @@||ask.antalis.no^$1p +||medlemskap.fagforbundet.no^$badfilter ! ★★★ Caused by «Fanboy's Social Blocking List», if I recall correctly ★★★ krom.is#@#.share-container @@/images/*youtube.jpg$domain=realityportalen.dk @@ -2932,7 +2933,7 @@ triplx.dk##.aff-inner-col !#if adguard !#include AdditionalGenericEntriesForAdGuard.txt !#endif -! Last updated: 10March2024v1-Extension +! Last updated: 03April2024v1-Extension ! 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— ! Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. ! 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— @@ -3036,6 +3037,8 @@ findroommate.dk###frm-ablo-message bold.dk##+js(acs, EventTarget.prototype.addEventListener, window.TextDecoder) bold.dk##+js(nofab) !#endif +! The green "Abonner" button in the upper right appears to work perfectly even with this entry, and the entry does not cause the Plus article bodies to appear either, so I feel I'm on safe enough grounds on this one. +||piano.io/xbuilder/experience/execute^$xhr,domain=www.digi.no|www.tu.no ! 🇬🇧: ——— Not actually AAB, but would've caused fatal breakage in ABP ——— playpilot.com##.takeover.modals diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 52c28e126..3d230d5dd 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) # Title 🇬🇧: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy) -# Version: 27March2024v1-Deprecated +# Version: 04April2024v1-Deprecated # 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 @@ -837,11 +837,12 @@ {+block{https://github.com/easylist/easylist/issues/18542 (These entries are here to stay, regardless of the report's outcome.)}} {-block} -.medlemskap.*.no/$1p +.medlemskap.*.no {-block} .bestill.help.no$1p {-block} .ask.antalis.no$1p +.medlemskap.fagforbundet.no$badfilter # ★★★ Caused by «Fanboy's Social Blocking List», if I recall correctly ★★★ {-block} @@ -1493,7 +1494,7 @@ .1.14.61.188 .smarthouseforum.ru .trafikkskoleapp.no -# Last updated: 10March2024v1-Extension +# Last updated: 03April2024v1-Extension # 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— # Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. # 🇩🇰: ——— Vinduesviskere for betalte artikler (så de sidste par linjer i en forhåndsvisning ikke falder ud) ——— @@ -1523,6 +1524,9 @@ {+block{https://github.com/finnish-easylist-addition/finnish-easylist-addition/issues/305}} {+block{https://www.findroommate.dk/vaerelser/302142/stort-lyst-vaerelse-taet-paa-aarhus-i-viby-centrum (17/12/2021)}} {+block{https://github.com/uBlockOrigin/uAssets/issues/13495}} +# The green "Abonner" button in the upper right appears to work perfectly even with this entry, and the entry does not cause the Plus article bodies to appear either, so I feel I'm on safe enough grounds on this one. +{+block} + {+block{🇬🇧: ——— Not actually AAB, but would've caused fatal breakage in ABP ———}} # 🇳🇴/🇩🇰: ——— Ikke for Brave Browser ——— {+block{🇬🇧: ——— Not for Brave Browser ———}} diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 63175ee14..41a9a85bd 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -7431,7 +7431,7 @@ def prepare_domains(lines) -> str: continue line = re.sub( - r"^[a-zA-Z!_*/İ-].*", + r"^[a-zA-Z!_*/İ=%&-].*", r"", line )