From c1d837c519b781cf97859460f9c88da347dbc115 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 15 Oct 2021 11:48:52 +0200 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 3 ++- .../NordicFilters-uBOLegacy.txt | 9 ++++++- .../NordicFilters-uMatrixSupplement.txt | 2 +- .../NordicFiltersABP-Inclusion.txt | 20 +++++++++++++--- .../NordicFiltersABP.txt | 9 ++++++- .../NordicFiltersAdGuard.txt | 9 ++++++- .../NordicFiltersPrivacy.txt | 9 ++++++- .../NordicFiltersPrivoxy.action | 3 ++- .../XYZPrepareFilters.py | 24 +++++++++++++++++++ 9 files changed, 78 insertions(+), 10 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 2ddcb65c8..11552b264 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: 10October2021v3-Alpha +# Version: 15October2021v1-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 @@ -911,6 +911,7 @@ msFilterList -d tvaalborg.dk -d informationer.nu -d cphspaogwellness.dk +-d webavisen.gl # 🇬🇧: Copied over from DNS-BH Malware Domains and verified to actually be malicious (as that list has a whole lot of false positives) -d desidert.no -d brigitteheilmann.dk diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt index d00e25bdc..71b4548ad 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: 10October2021v3-Beta +! Version: 15October2021v1-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 @@ -342,6 +342,11 @@ mc-avisa.no##.avisa-widget tv-kalundborg.dk##.flickity-viewport tv-kalundborg.dk##div.col-s-100.col-50:nth-of-type(2) sol.no#?#.xrow:-abp-has(> div[class*=" "] > span[class]) +onlineaviser.no#?#table[width^="7"]:first-of-type:-abp-has(a[href*=tradedoubler]) +onlineaviser.no##body > div > table > tbody > tr > td > table > tbody > tr > td:nth-of-type(2):last-of-type +onlineaviser.no##body > table > tbody > tr > td:nth-of-type(2):last-of-type +onlineaviser.no#?#tr:-abp-has(a[href="./index.html"]) + tr + tr +onlineaviser.no##a[href="../html/gratis_no.html"] ! — — — — — — — — — ! 🇳🇴: Oppføringer for minst 3 nettsteder ! 🇬🇧: Entries for at least 3 websites @@ -1736,6 +1741,7 @@ yrkesbil.no#?#tr:-abp-contains(/^\xA0$/):not(:-abp-contains(/\S/)):not(:-abp-has foodora.no##.top-skinny-banner-container check-in.dk#?#p:-abp-contains(/^\xA0$/):not(:-abp-contains(/\S/)):not(:-abp-has(img)) idag.no#?#.nf-o-moduleblock:not(:has(a)) +mediavejviseren.dk###sectionBeforeBottom avvir.no###block-block-1 > p:nth-of-type(4) @@ -2319,6 +2325,7 @@ sofabold.dk##.centerMgfx ||tvaalborg.dk^$doc ||informationer.nu^$doc ||cphspaogwellness.dk^$doc +||webavisen.gl^$doc ! 🇬🇧: Copied over from DNS-BH Malware Domains and verified to actually be malicious (as that list has a whole lot of false positives) ||desidert.no^ diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index 040e572ab..cf31081ce 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: 10October2021v3-Alpha +! Version: 15October2021v1-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 73f7ab791..59431881a 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: 101020213 +! Version: 151020211 ! 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 @@ -330,6 +330,11 @@ mc-avisa.no##.avisa-widget tv-kalundborg.dk##.flickity-viewport tv-kalundborg.dk##div.col-s-100.col-50:nth-of-type(2) sol.no#?#.xrow:-abp-has(> div[class*=" "] > span[class]) +onlineaviser.no#?#table[width^="7"]:first-of-type:-abp-has(a[href*=tradedoubler]) +onlineaviser.no##body > div > table > tbody > tr > td > table > tbody > tr > td:nth-of-type(2):last-of-type +onlineaviser.no##body > table > tbody > tr > td:nth-of-type(2):last-of-type +onlineaviser.no#?#tr:-abp-has(a[href="./index.html"]) + tr + tr +onlineaviser.no##a[href="../html/gratis_no.html"] ! — — — — — — — — — ! 🇳🇴: Oppføringer for minst 3 nettsteder ! 🇬🇧: Entries for at least 3 websites @@ -1653,6 +1658,7 @@ tnt-tv.no,tnt-tv.dk##.desktop_element.promo tnt-tv.no,tnt-tv.dk##.logos tnt-tv.no,tnt-tv.dk##.tabs_placeholder foodora.no##.top-skinny-banner-container +mediavejviseren.dk###sectionBeforeBottom avvir.no###block-block-1 > p:nth-of-type(4) ! 🇳🇴: ——— Distraherende bakgrunnsbilder ——— @@ -2209,6 +2215,7 @@ sofabold.dk##.centerMgfx ||tvaalborg.dk^ ||informationer.nu^ ||cphspaogwellness.dk^ +||webavisen.gl^ ! 🇬🇧: Copied over from DNS-BH Malware Domains and verified to actually be malicious (as that list has a whole lot of false positives) ||desidert.no^ @@ -4289,7 +4296,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: 091020212 +! Version: 151020213 ! Title: Adblock List for Finland ! Description: Finnish adblock list ! Expires: 4 days @@ -4355,7 +4362,6 @@ _mainosnappi. ###ylamainokset ###ylamainos ##.adbox_content -##.advertorial-teaser ##.bottomads ##.card--native ##.dfpBoxBottom @@ -4651,6 +4657,7 @@ kansanuutiset.fi##.cb-sidebar-widget.widget_text kansanuutiset.fi##.intextad.clearfix.cb-module-block.cb-box.cb-a-large kansanuutiset.fi##A[href="http://www.autonvaraosastore.fi/"] kansanuutiset.fi##div[class*=intextad] +kansanuutiset.fi#?#.cb-module-block.cb-box.cb-a-large.clearfix:-abp-has([id|=div-gpt-ad]) karjalainen.fi##a[href="https://punamustamedia.portal.worldoftulo.com/v2/shop/dtabkaiku"] karjalainen.fi#?#a[href*=kiinnostuitko]:-abp-has([alt=banneri]) karjalainen.fi,sammysatv.com##center @@ -4813,6 +4820,7 @@ mvlehti.net##.wp-block-image:-abp-has(a[href*=kasino]) mvlehti.net##[href="https://www.cbdtukku.fi/"] mvlehti.net##[href="https://www.halvinlaina.fi/"] mvlehti.net##[href^="https://www.kasinot.org/"] +mvlehti.net##a[href="https://www.kippis.net/"] mvlehti.net#?#.entry-content > h3:-abp-contains(kasino) mvlehti.net#?#[class|=featured-post]:-abp-contains(/rahapeli|kasino/i):-abp-has(a[href*="/202"]) mvlehti.net#?#p[style="text-align: center;"]:-abp-has(> a[href^="https://kasino"]) @@ -5036,6 +5044,7 @@ 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 +www.is.fi##.advertorial-teaser www.nettiauto.com,www.nettikaravaani.com,www.nettikone.com,www.nettimarkkina.com,www.nettimokki.com,www.nettimoto.com,www.nettivaraosa.com,www.nettivene.com,www.nettivuokraus.com###homeBottomBoxBanner www.nettiauto.com,www.nettikaravaani.com,www.nettikone.com,www.nettimarkkina.com,www.nettimokki.com,www.nettimoto.com,www.nettivaraosa.com,www.nettivene.com,www.nettivuokraus.com###homeTopBoxBanner www.nettiauto.com,www.nettikaravaani.com,www.nettikone.com,www.nettimarkkina.com,www.nettimokki.com,www.nettimoto.com,www.nettivaraosa.com,www.nettivene.com,www.nettivuokraus.com###huge_banner @@ -5051,6 +5060,8 @@ www.nettimokki.com##div.nc_r_banner www.nettimoto.com###smallViewHouseBanner www.suomi24.fi##.asp www.suomi24.fi##div[class^=Vaalikone__HeaderAdWrapper] +www.suomi24.fi#?#div[class^="HomePage__RightColItem"]:-abp-has(> div[class^="AdLivewrapped__AdWrapper"]) +www.suomi24.fi#?#div[class^="HomePage__RightColItem"]:-abp-has(> div[class^="Lainavertailu__Container"]) www.suomi24.fi#?#p:-abp-has(+ p + .asp) www.ts.fi##[class="tsv3-c-common-article__contentad notloaded"] www.ts.fi##div[class*="tsv3-c-common-smart noad-hideaction"] @@ -5335,3 +5346,6 @@ mtvuutiset.fi#@##onetrust-consent-sdk ! https://github.com/easylist/easylist/pull/9343 @@||almamedia.fi/almacmp/$script + +! https://github.com/easylist/easylist/pull/9396 +##.advertorial-teaser diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 305a1414f..8a5f7a3bb 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: 101020213 +! Version: 151020211 ! 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 @@ -334,6 +334,11 @@ mc-avisa.no##.avisa-widget tv-kalundborg.dk##.flickity-viewport tv-kalundborg.dk##div.col-s-100.col-50:nth-of-type(2) sol.no#?#.xrow:-abp-has(> div[class*=" "] > span[class]) +onlineaviser.no#?#table[width^="7"]:first-of-type:-abp-has(a[href*=tradedoubler]) +onlineaviser.no##body > div > table > tbody > tr > td > table > tbody > tr > td:nth-of-type(2):last-of-type +onlineaviser.no##body > table > tbody > tr > td:nth-of-type(2):last-of-type +onlineaviser.no#?#tr:-abp-has(a[href="./index.html"]) + tr + tr +onlineaviser.no##a[href="../html/gratis_no.html"] ! — — — — — — — — — ! 🇳🇴: Oppføringer for minst 3 nettsteder ! 🇬🇧: Entries for at least 3 websites @@ -1670,6 +1675,7 @@ yrkesbil.no#?#tr:-abp-contains(/^\xA0$/):not(:-abp-contains(/\S/)):not(:-abp-has foodora.no##.top-skinny-banner-container check-in.dk#?#p:-abp-contains(/^\xA0$/):not(:-abp-contains(/\S/)):not(:-abp-has(img)) idag.no#?#.nf-o-moduleblock:not(:has(a)) +mediavejviseren.dk###sectionBeforeBottom avvir.no###block-block-1 > p:nth-of-type(4) ! 🇳🇴: ——— Distraherende bakgrunnsbilder ——— @@ -2228,6 +2234,7 @@ sofabold.dk##.centerMgfx ||tvaalborg.dk^ ||informationer.nu^ ||cphspaogwellness.dk^ +||webavisen.gl^ ! 🇬🇧: Copied over from DNS-BH Malware Domains and verified to actually be malicious (as that list has a whole lot of false positives) ||desidert.no^ diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index e19df80b1..9ba7124a4 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: 10October2021v3 +! Version: 15October2021v1 ! 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 @@ -341,6 +341,11 @@ mc-avisa.no##.avisa-widget tv-kalundborg.dk##.flickity-viewport tv-kalundborg.dk##div.col-s-100.col-50:nth-of-type(2) sol.no#?#.xrow:has(> div[class*=" "] > span[class]) +onlineaviser.no#?#table[width^="7"]:first-of-type:has(a[href*=tradedoubler]) +onlineaviser.no##html[lang] > body > div > table > tbody > tr > td > table > tbody > tr > td:nth-of-type(2):last-of-type +onlineaviser.no##html[lang] > body > table > tbody > tr > td:nth-of-type(2):last-of-type +onlineaviser.no#?#tr:has(a[href="./index.html"]) + tr + tr +onlineaviser.no##a[href="../html/gratis_no.html"] ! — — — — — — — — — ! 🇳🇴: Oppføringer for minst 3 nettsteder ! 🇬🇧: Entries for at least 3 websites @@ -1735,6 +1740,7 @@ yrkesbil.no#?#tr:has-text(/^\xA0$/):not(:has-text(/\S/)):not(:has(img)) foodora.no##.top-skinny-banner-container check-in.dk#?#p:has-text(/^\xA0$/):not(:has-text(/\S/)):not(:has(img)) idag.no#?#.nf-o-moduleblock:not(:has(a)) +mediavejviseren.dk###sectionBeforeBottom !+ NOT_OPTIMIZED avvir.no###block-block-1 > p:nth-of-type(4) @@ -2318,6 +2324,7 @@ sofabold.dk##.centerMgfx ||tvaalborg.dk^$document ||informationer.nu^$document ||cphspaogwellness.dk^$document +||webavisen.gl^$document ! 🇬🇧: Copied over from DNS-BH Malware Domains and verified to actually be malicious (as that list has a whole lot of false positives) ||desidert.no^ diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 44691c44d..4b577d616 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: 10October2021v3 +! Version: 15October2021v1 ! 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 @@ -341,6 +341,11 @@ mc-avisa.no##.avisa-widget tv-kalundborg.dk##.flickity-viewport tv-kalundborg.dk##div.col-s-100.col-50:nth-of-type(2) sol.no#?#.xrow:-abp-has(> div[class*=" "] > span[class]) +onlineaviser.no#?#table[width^="7"]:first-of-type:-abp-has(a[href*=tradedoubler]) +onlineaviser.no##body > div > table > tbody > tr > td > table > tbody > tr > td:nth-of-type(2):last-of-type +onlineaviser.no##body > table > tbody > tr > td:nth-of-type(2):last-of-type +onlineaviser.no#?#tr:-abp-has(a[href="./index.html"]) + tr + tr +onlineaviser.no##a[href="../html/gratis_no.html"] ! — — — — — — — — — ! 🇳🇴: Oppføringer for minst 3 nettsteder ! 🇬🇧: Entries for at least 3 websites @@ -1735,6 +1740,7 @@ yrkesbil.no#?#tr:-abp-contains(/^\xA0$/):not(:-abp-contains(/\S/)):not(:-abp-has foodora.no##.top-skinny-banner-container check-in.dk#?#p:-abp-contains(/^\xA0$/):not(:-abp-contains(/\S/)):not(:-abp-has(img)) idag.no#?#.nf-o-moduleblock:not(:has(a)) +mediavejviseren.dk###sectionBeforeBottom !+ NOT_OPTIMIZED avvir.no###block-block-1 > p:nth-of-type(4) @@ -2318,6 +2324,7 @@ sofabold.dk##.centerMgfx ||tvaalborg.dk^$doc ||informationer.nu^$doc ||cphspaogwellness.dk^$doc +||webavisen.gl^$doc ! 🇬🇧: Copied over from DNS-BH Malware Domains and verified to actually be malicious (as that list has a whole lot of false positives) ||desidert.no^ diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 67ebccaa6..a4a89dc6f 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: 10October2021v3-Alpha +# Version: 15October2021v1-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 @@ -1244,6 +1244,7 @@ .tvaalborg.dk .informationer.nu .cphspaogwellness.dk +.webavisen.gl {+block{🇬🇧: Copied over from DNS-BH Malware Domains and verified to actually be malicious (as that list has a whole lot of false positives)}} .desidert.no .brigitteheilmann.dk diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 469fda3d9..3919addec 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -4903,6 +4903,12 @@ def prepare_privoxy(lines) -> str: line ) + line = re.sub( + r"^&.*", + r"", + line + ) + if is_supported_privoxy(line): text += line + '\r\n' @@ -5074,6 +5080,12 @@ def prepare_hosts(lines) -> str: line ) + line = re.sub( + r"^&.*", + r"", + line + ) + if is_supported_hosts(line): text += line + '\r\n' @@ -5202,6 +5214,12 @@ def prepare_domains(lines) -> str: line ) + line = re.sub( + r"^&.*", + r"", + line + ) + if is_supported_domains(line): text += line + '\r\n' @@ -5401,6 +5419,12 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r"^&.*", + r"", + line + ) + line = re.sub( r"^\|\|.*\.(tk|ga|ml|gq|cf|pw|loan|agency|gdn|bid|top|ooo)\^.*", r"",