diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 3a7340891..3a86b4943 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: 17September2021v2-Alpha +# Version: 18September2021v1-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 @@ -902,6 +902,18 @@ msFilterList -d brigitteheilmann.dk -d storustovu.dk -d campingnews.dk +# 🇬🇧://Copied/over/from/URLHaus/and/verified +-d biopaten.no +-d hagebakken.no +-d forum.mdb.nu +-d mdb.nu +# 🇬🇧: Copied over from BlockListProject malware phishing and verified +-d a1match.dk +-d adminflex.dk +-d asound.no +-d aluminium.olbi.no +-d ccbuus.dk +-d artmusic.dk ! ! # 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index e5d457719..3d76db114 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: 17September2021v2-Alpha +! Version: 18September2021v1-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 @@ -185,6 +185,8 @@ in-addr.arpa 193.148.70.153 * allow ! 🇬🇧: Fake online pharmacies ! 🇬🇧: 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 +! 🇬🇧: Copied over from BlockListProject malware/phishing and verified ! ! ! Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index e0379ba0a..ea4de66c9 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: 170920212 +! Version: 180920211 ! 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 @@ -2187,6 +2187,24 @@ sofabold.dk##.centerMgfx ||storustovu.dk^ ||campingnews.dk^ +! 🇬🇧: Copied over from URLHaus and verified +||biopaten.no^ +||biopaten.no^$popup +||hagebakken.no^ +||hagebakken.no^$popup +||forum.mdb.nu^ +||forum.mdb.nu^$popup +||mdb.nu^ +||mdb.nu^$popup + +! 🇬🇧: Copied over from BlockListProject malware/phishing and verified +||a1match.dk^ +||adminflex.dk^ +||asound.no^ +||aluminium.olbi.no^ +||ccbuus.dk^ +||artmusic.dk^ + @@ -4230,7 +4248,7 @@ whowhatwear.co.uk#@#a[href*="/click.linksynergy"] img ! Språknöjtral test för at kolla om ABP-brukarrapporter för YouTube går ner til 0 med den här uppförning / Language-neutral test to see if ABP user reports for YouTube plunge down to 0 with this entry ||googlevideo.com/*&ctier= -! Version: 150920211 +! Version: 170920211 ! Title: Adblock List for Finland ! Description: Finnish adblock list ! Expires: 4 days @@ -4920,8 +4938,10 @@ viisasraha.fi##.d-md-block.d-lg-block.d-none viisasraha.fi##.kumppani-artikkelit viisasraha.fi##div[class*=native-article] > div[class=ezrichtext-field] > p > a[href^="https://danskebank.fi/"] viisasraha.fi##div[class^=banner] > a[href="https://www.viisasraha.fi/Taloushaltuun"] +voice.fi##.article-sponsored voice.fi##section[class^=sbsads] + section[class^="sbs-articleitems full-size-list"][data-module_position_id="612"] voice.fi#?#.sbs-articleitems.list-right-column:-abp-has(span.sponsored) +voice.fi#?#div.item:-abp-has(.sponsored) vuodatus.net###fb-root + div > div[style="background-color: #fff; margin: 0 auto; padding: 20px; display: table; min-width: 300px; max-width: 100%; font-family: 'Open Sans', sans-serif; font-size: 14px;"] wizhdsports.fi##.widget_media_image www.io-tech.fi###text-7 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index eb4516ce7..66a3f6aaa 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: 170920212 +! Version: 180920211 ! 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 @@ -2206,6 +2206,24 @@ sofabold.dk##.centerMgfx ||storustovu.dk^ ||campingnews.dk^ +! 🇬🇧: Copied over from URLHaus and verified +||biopaten.no^ +||biopaten.no^$popup +||hagebakken.no^ +||hagebakken.no^$popup +||forum.mdb.nu^ +||forum.mdb.nu^$popup +||mdb.nu^ +||mdb.nu^$popup + +! 🇬🇧: Copied over from BlockListProject malware/phishing and verified +||a1match.dk^ +||adminflex.dk^ +||asound.no^ +||aluminium.olbi.no^ +||ccbuus.dk^ +||artmusic.dk^ + diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index cbddce5d3..36d3870ed 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: 17September2021v2 +! Version: 18September2021v1 ! 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 @@ -2301,6 +2301,20 @@ sofabold.dk##.centerMgfx !+ NOT_OPTIMIZED ||campingnews.dk^ +! 🇬🇧: Copied over from URLHaus and verified +||biopaten.no^$all +||hagebakken.no^$all +||forum.mdb.nu^$all +||mdb.nu^$all + +! 🇬🇧: Copied over from BlockListProject malware/phishing and verified +||a1match.dk^ +||adminflex.dk^ +||asound.no^ +||aluminium.olbi.no^ +||ccbuus.dk^ +||artmusic.dk^ + ! !#if env_mobile diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 7f630c26e..a8ffc214d 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: 17September2021v2 +! Version: 18September2021v1 ! 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 @@ -2301,6 +2301,20 @@ sofabold.dk##.centerMgfx !+ NOT_OPTIMIZED ||campingnews.dk^ +! 🇬🇧: Copied over from URLHaus and verified +||biopaten.no^$all +||hagebakken.no^$all +||forum.mdb.nu^$all +||mdb.nu^$all + +! 🇬🇧: Copied over from BlockListProject malware/phishing and verified +||a1match.dk^ +||adminflex.dk^ +||asound.no^ +||aluminium.olbi.no^ +||ccbuus.dk^ +||artmusic.dk^ + ! !#if env_mobile !#include NordicFilters-FirefoxAndroidUBOWorkaround.txt diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index fe768a2c5..fe5c1dfcb 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: 17September2021v2-Alpha +# Version: 18September2021v1-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 @@ -1233,6 +1233,18 @@ .brigitteheilmann.dk .storustovu.dk .campingnews.dk +{+block{🇬🇧: Copied over from URLHaus and verified}} +.biopaten.no +.hagebakken.no +.forum.mdb.nu +.mdb.nu +{+block{🇬🇧: Copied over from BlockListProject malware/phishing and verified}} +.a1match.dk +.adminflex.dk +.asound.no +.aluminium.olbi.no +.ccbuus.dk +.artmusic.dk # # # 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 656a12b64..e4e7bffb2 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -826,8 +826,8 @@ def prepare_tpl(lines) -> str: for line in lines: line = re.sub( - "! ", - "# ", + r"^!!? ", + r"# ", line ) @@ -4250,8 +4250,8 @@ def prepare_abp(lines) -> str: ) line = re.sub( - r"google\.\*#", - r"google.ac,google.ad,google.ae,google.af,google.ag,google.ai,google.al,google.am,google.as,google.at,google.az,google.ba,google.be,google.bf,google.bg,google.bi,google.bj,google.bs,google.bt,google.by,google.ca,google.cat,google.cc,google.cd,google.cf,google.cg,google.ch,google.ci,google.cl,google.cm,google.cn,google.co.ao,google.co.bw,google.co.ck,google.co.cr,google.co.hu,google.co.id,google.co.il,google.co.im,google.co.in,google.co.je,google.co.jp,google.co.ke,google.co.kr,google.co.ls,google.co.ma,google.co.mz,google.co.nz,google.co.th,google.co.tz,google.co.ug,google.co.uk,google.co.uz,google.co.ve,google.co.vi,google.co.za,google.co.zm,google.co.zw,google.com.af,google.com.ag,google.com.ai,google.com.ar,google.com.au,google.com.bd,google.com.bh,google.com.bn,google.com.bo,google.com.br,google.com.by,google.com.bz,google.com.cn,google.com.co,google.com.cu,google.com.cy,google.com.do,google.com.ec,google.com.eg,google.com.et,google.com.fj,google.com.ge,google.com.gh,google.com.gi,google.com.gr,google.com.gt,google.com.hk,google.com.iq,google.com.jm,google.com.jo,google.com.kh,google.com.kw,google.com.lb,google.com.ly,google.com.mm,google.com.mt,google.com.mx,google.com.my,google.com.na,google.com.nf,google.com.ng,google.com.ni,google.com.np,google.com.nr,google.com.om,google.com.pa,google.com.pe,google.com.pg,google.com.ph,google.com.pk,google.com.pl,google.com.pr,google.com.py,google.com.qa,google.com.ru,google.com.sa,google.com.sb,google.com.sg,google.com.sl,google.com.sv,google.com.tj,google.com.tn,google.com.tr,google.com.tw,google.com.ua,google.com.uy,google.com.vc,google.com.ve,google.com.vn,google.cv,google.cz,google.de,google.dj,google.dk,google.dm,google.dz,google.ee,google.es,google.eus,google.fi,google.fm,google.fr,google.frl,google.ga,google.gal,google.ge,google.gg,google.gl,google.gm,google.gp,google.gr,google.gy,google.hk,google.hn,google.hr,google.ht,google.hu,google.ie,google.im,google.in,google.info,google.iq,google.ir,google.is,google.it,google.je,google.jo,google.jp,google.kg,google.ki,google.kz,google.la,google.li,google.lk,google.lt,google.lu,google.lv,google.md,google.me,google.mg,google.mk,google.ml,google.mn,google.ms,google.mu,google.mv,google.mw,google.ne,google.net,google.ng,google.nl,google.no,google.nr,google.nu,google.pk,google.pl,google.pn,google.ps,google.pt,google.ro,google.rs,google.ru,google.rw,google.sc,google.se,google.sh,google.si,google.sk,google.sm,google.sn,google.so,google.sr,google.st,google.td,google.tel,google.tg,google.tk,google.tl,google.tm,google.tn,google.to,google.tt,google.ua,google.us,google.uz,google.vg,google.vu,google.ws#", + r"^www\.google\.\*#", + r"www.google.com,google.ac,google.ad,google.ae,google.af,google.ag,google.al,google.am,google.as,google.at,google.az,google.ba,google.be,google.bf,google.bg,google.bi,google.bj,google.bs,google.bt,google.by,google.ca,google.cat,google.cc,google.cd,google.cf,google.cg,google.ch,google.ci,google.cl,google.cm,google.cn,google.co.ao,google.co.bw,google.co.ck,google.co.cr,google.co.hu,google.co.id,google.co.il,google.co.im,google.co.in,google.co.je,google.co.jp,google.co.ke,google.co.kr,google.co.ls,google.co.ma,google.co.mz,google.co.nz,google.co.th,google.co.tz,google.co.ug,google.co.uk,google.co.uz,google.co.ve,google.co.vi,google.co.za,google.co.zm,google.co.zw,google.com.af,google.com.ag,google.com.ai,google.com.ar,google.com.au,google.com.bd,google.com.bh,google.com.bn,google.com.bo,google.com.br,google.com.by,google.com.bz,google.com.cn,google.com.co,google.com.cu,google.com.cy,google.com.do,google.com.ec,google.com.eg,google.com.et,google.com.fj,google.com.ge,google.com.gh,google.com.gi,google.com.gr,google.com.gt,google.com.hk,google.com.iq,google.com.jm,google.com.jo,google.com.kh,google.com.kw,google.com.lb,google.com.ly,google.com.mm,google.com.mt,google.com.mx,google.com.my,google.com.na,google.com.nf,google.com.ng,google.com.ni,google.com.np,google.com.nr,google.com.om,google.com.pa,google.com.pe,google.com.pg,google.com.ph,google.com.pk,google.com.pl,google.com.pr,google.com.py,google.com.qa,google.com.ru,google.com.sa,google.com.sb,google.com.sg,google.com.sl,google.com.sv,google.com.tj,google.com.tn,google.com.tr,google.com.tw,google.com.ua,google.com.uy,google.com.vc,google.com.ve,google.com.vn,google.cv,google.cz,google.de,google.dj,google.dk,google.dm,google.dz,google.ee,google.es,google.eus,google.fi,google.fm,google.fr,google.frl,google.ga,google.gal,google.ge,google.gg,google.gl,google.gm,google.gp,google.gr,google.gy,google.hk,google.hn,google.hr,google.ht,google.hu,google.ie,google.im,google.in,google.info,google.iq,google.ir,google.is,google.it,google.je,google.jo,google.jp,google.kg,google.ki,google.kz,google.la,google.li,google.lk,google.lt,google.lu,google.lv,google.md,google.me,google.mg,google.mk,google.ml,google.mn,google.ms,google.mu,google.mv,google.mw,google.ne,google.net,google.ng,google.nl,google.no,google.nr,google.nu,google.pk,google.pl,google.pn,google.ps,google.pt,google.ro,google.rs,google.ru,google.rw,google.sc,google.se,google.sh,google.si,google.sk,google.sm,google.sn,google.so,google.sr,google.st,google.td,google.tg,google.tk,google.tl,google.tm,google.tn,google.to,google.tt,google.ua,google.us,google.uz,google.vg,google.vu,google.ws#", line ) @@ -4267,6 +4267,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"^\*#.*", + r"", + line + ) + if is_supported_abp(line): text += line + '\r\n' @@ -4288,8 +4294,8 @@ def prepare_tpl(lines) -> str: for line in lines: line = re.sub( - "! ", - "# ", + r"^!!? ", + r"# ", line ) @@ -4628,8 +4634,8 @@ def prepare_privoxy(lines) -> str: for line in lines: line = re.sub( - "! ", - "# ", + r"^!!? ", + r"# ", line ) @@ -4758,8 +4764,8 @@ def prepare_hosts(lines) -> str: for line in lines: line = re.sub( - "! ", - "# ", + r"^!!? ", + r"# ", line ) @@ -4922,8 +4928,8 @@ def prepare_domains(lines) -> str: for line in lines: line = re.sub( - "! ", - "# ", + r"^!!? ", + r"# ", line )