From 95bc53237e50cf3526cdf9ece09adf9265a6f99d Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Mon, 9 Nov 2020 19:48:40 +0100 Subject: [PATCH] Add files via upload --- .../AdawayHosts | 3 +- .../DandelionSproutsNorskeFiltre.tpl | 21 ++-- .../LittleSnitchNorwegianList.lsrules | 1 + .../NordicFilters-uMatrixSupplement.txt | 3 +- .../NordicFiltersABP-Inclusion.txt | 30 +++-- .../NordicFiltersABP.txt | 30 +++-- .../NordicFiltersAdGuard.txt | 30 +++-- .../NordicFiltersAdGuardHome.txt | 3 +- .../NordicFiltersDnsmasq.conf | 1 + .../NordicFiltersDomainsAllowlist.txt | 2 +- .../NordicFiltersForMinerBlock.txt | 3 +- .../NordicFiltersHostsDeny.deny | 3 +- .../NordicFiltersHostsIPv6.txt | 3 +- .../NordicFiltersPiHole.txt | 3 +- .../NordicFiltersPrivacy.txt | 30 +++-- .../NordicFiltersPrivoxy.action | 21 ++-- .../NordicFiltersRPZ.txt | 3 +- .../NordicFiltersSocks5.list | 3 +- .../NordicFiltersUnbound.conf | 3 +- .../XYZPrepareFilters.py | 108 ++++++++++-------- 20 files changed, 187 insertions(+), 117 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/AdawayHosts b/NorwegianExperimentalList alternate versions/AdawayHosts index f6fd6e695..4c97132af 100644 --- a/NorwegianExperimentalList alternate versions/AdawayHosts +++ b/NorwegianExperimentalList alternate versions/AdawayHosts @@ -1,6 +1,6 @@ # Title: Dandelion Sprouts nordiske filtre («hosts»-versjonen) # Translated title: Dandelion Sprout's Nordic Filters (The «hosts» file version) -# Version: 09November2020v1 +# Version: 09November2020v2 # 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # Platform notes: This list version is intended for tools that deal with so-called «hosts» system files, including pfBlockerNG, Gas Mask, Diversion, Hosts File Editor, and many others; as well as those who edit their OS' «hosts» system file. # If you use a tool that edits the system's own hosts file, such as Hosts File Editor, Gas Mask, or Magisk Manager, make sure to also use the IPv6 version at https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersHostsIPv6.txt @@ -215,6 +215,7 @@ 127.0.0.1 holmedalblikk.no www.holmedalblikk.no 127.0.0.1 hot-rap-beats.top www.hot-rap-beats.top 127.0.0.1 i1media.no www.i1media.no +127.0.0.1 images.passendo.com www.images.passendo.com 127.0.0.1 is-a-personaltrainer.com www.is-a-personaltrainer.com 127.0.0.1 is-by.us www.is-by.us 127.0.0.1 isweb.no www.isweb.no diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 54e0e73ae..e64f02adb 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 09November2020v1-Alpha +# Version: 09November2020v2-Alpha # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 @@ -93,6 +93,7 @@ msFilterList -d btrbnrs.link -d banner.3loops.com -d videotool.fbg.dk +-d images.passendo.com -d print2web.sn.dk -d lib.idg.no # Adressa.no @@ -115,6 +116,12 @@ _toppbanner_ # http://www.sexpiger.dk/ -d lh3.googleusercontent.com *=w468-h60- -d lh3.googleusercontent.com *=w970-h250- +# salangen-nyheter.com, hytteavisen.no, strafferunden.no, langrenn.com (12 10 2020) +- getbanner.php +# biff.no (26 10 2020) +_nettannonse. +- BINARY *-BANNER-*.gif +- BINARY *%20200x300.jpg # — — — — — — — # 🇳🇴: Blokkeringsoppføringer for filtjenere eller enkeltnettsteder # 🇬🇧: Fileserver or site-specific blocking rules @@ -271,12 +278,6 @@ _300x250px-*.gif -d f.nordiskemedier.dk 2*.png # building-supply.dk -d f.nordiskemedier.dk banner -# salangen-nyheter.com, hytteavisen.no, strafferunden.no, langrenn.com (12 10 2020) -- getbanner.php -# biff.no (26 10 2020) -_nettannonse. -- BINARY *-BANNER-*.gif -- BINARY *%20200x300.jpg # — — — — — — — — — # 🇳🇴: Hovedsaklig for AdGuard # 🇳🇴🏞: Hovudsakleg for AdGuard @@ -356,10 +357,10 @@ _nettannonse. # blv.no nyheter kan-bruke-23-millioner-pa-the-whale-undersokelsene # https://www.aftenposten.no/sport/sjakk/i/4qKxMg/carlsen-overbeviste-verdensmestertakter # https://www.aftenposten.no/sport/sjakk/i/0nyKLG/sjakkstjernen-mistet-kona -# https://www.aftenposten.no/ (Mobile useragent) +# aftenposten.no (Mobile useragent) # http://www.brannmannen.no/brann/store-utfordringer-ved-togulykken-pa-asta/ -d 85.17.76.181 -# https://krs247.no/ +# krs247.no # lsk.no # https://www.budstikka.no/ # e24.no, aftenbladet.no, sysla.no @@ -384,6 +385,8 @@ _nettannonse. # dagsavisen.no (Mobile version; 23 10 2020) # aftenposten.no, hockeymagasinet.dk, l-a.no, aftenbladet.no (30 10 2020) # bt.no, byas.no, aftenbladet.no (30 10 2020) +# costume.no, costume.dk (09 11 2020) +# boligpluss.no (09 11 2020) # 🇳🇴: ——— Tomme skillebokser ——— # 🇩🇰: ——— Tomme adskillerbokser ——— # 🇳🇴🏞: ——— Tomme skiljeboksar ——— diff --git a/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules b/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules index 7811c2ec5..6787a67b2 100644 --- a/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules +++ b/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules @@ -210,6 +210,7 @@ { "action": "deny", "process": "any", "remote-domains": "holmedalblikk.no" }, { "action": "deny", "process": "any", "remote-domains": "hot-rap-beats.top" }, { "action": "deny", "process": "any", "remote-domains": "i1media.no" }, +{ "action": "deny", "process": "any", "remote-domains": "images.passendo.com" }, { "action": "deny", "process": "any", "remote-domains": "is-a-personaltrainer.com" }, { "action": "deny", "process": "any", "remote-domains": "is-by.us" }, { "action": "deny", "process": "any", "remote-domains": "isweb.no" }, diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index de9af6dc1..796f6419f 100644 --- a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt +++ b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt @@ -1,4 +1,4 @@ -! Version: 09November2020v1-Alpha +! Version: 09November2020v2-Alpha ! 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) ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md @@ -40,6 +40,7 @@ third-party tracking-genesisaffiliates.com image block third-party betterbanners.org * block third-party btrbnrs.link * block third-party videotool.fbg.dk * block +third-party images.passendo.com * block * print2web.sn.dk image block ! Adressa.no ! Copied over from the New AdAway list diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index 1d825a79f..1a9647e27 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 091120201 +! Version: 091120202 ! Title: 🏔️ Dandelion Sprouts vestnordiske filtre for ryddigere nettsider (for Adblock Plus - Møter ABP sine inkluderingsregler) ! Translated title: Dandelion Sprout's West Nordic filters for tidier websites (for Adblock Plus with ABP inclusion compliance) ! Expires: 1 day @@ -183,6 +183,8 @@ hytteavisen.no##.prodlist > .row > .small-12 hestafrettir.is##.wpb_raw_code utvarpsaga.is##.textwidget > center biff.no##.ads +viivilla.no##.digital_bilag_wrapper_horizontal +costume.no,costume.dk#?#*:-abp-has(> * > * > * > .teaser__native) ! — — — — — — — — — ! 🇳🇴: Oppføringer for minst 3 nettsteder ! 🇬🇧: Entries for at least 3 websites @@ -313,6 +315,7 @@ goal.com#?#*:-abp-has(> * > .js-betting-widget.is-country-no) ||btrbnrs.link^$third-party ||banner.3loops.com^ ||videotool.fbg.dk^$third-party +||images.passendo.com^$third-party ||print2web.sn.dk^$image ||lib.idg.no^ ! Adressa.no @@ -335,6 +338,12 @@ _toppbanner_$image ! http://www.sexpiger.dk/ ||lh3.googleusercontent.com/*=w468-h60-$image ||lh3.googleusercontent.com/*=w970-h250-$image +! salangen-nyheter.com, hytteavisen.no, strafferunden.no, langrenn.com (12/10/2020) +/getbanner.php^$image +! biff.no (26/10/2020) +_nettannonse. +/BINARY/*-BANNER-*.gif^ +/BINARY/*%20200x300.jpg^ ! — — — — — — — ! 🇳🇴: Blokkeringsoppføringer for filtjenere eller enkeltnettsteder ! 🇬🇧: Fileserver or site-specific blocking rules @@ -511,12 +520,6 @@ _300x250px-*.gif^$domain=ilaks.no @@||f.nordiskemedier.dk/2*_*.png^$image ! building-supply.dk ||f.nordiskemedier.dk/banner^ -! salangen-nyheter.com, hytteavisen.no, strafferunden.no, langrenn.com (12/10/2020) -/getbanner.php^$image -! biff.no (26/10/2020) -_nettannonse. -/BINARY/*-BANNER-*.gif^ -/BINARY/*%20200x300.jpg^ ! — — — — — — — — — ! 🇳🇴: Hovedsaklig for AdGuard ! 🇳🇴🏞: Hovudsakleg for AdGuard @@ -1026,7 +1029,6 @@ flatpanels.dk##div[style="text-align:center;clear:both;"] onlineposten.dk##.textwidget onlineposten.dk###header side6.dk##.apn-banner -iform.dk##.horseshoe iform.dk##.responsive-images iform.dk,bilmagasinet.dk##.wg-banner kommunikationsforum.dk##.col-xs-12[style] @@ -1057,6 +1059,9 @@ dagsavisen.no##.clickad-container > .row dagsavisen.no#?#style + .container > .row:-abp-has(> .col-sm-12 > .dagsavisenDesktopAd) maskinbladet.dk##.megaboard-inner maskinbladet.dk##.outer-skybanner +viivilla.no##.tree-house +bo-bedre.no,bobedre.dk##.mb-50.text-center +boligpluss.no##.article-footer + .wg-editorial ||fcbarcelona.dk/*/images/footerbg.jpg^$image ||730.no/banner/*/sonymusic/$subdocument ||danishfamilysearch.dk/images/xp2^$image @@ -1080,6 +1085,7 @@ dagens.dk,dust2.dk,kanalfrederikshavn.dk,videnskab.dk,politirapporten.dk,nyheder komputer.no,natgeo.no,historienet.no,koplr.no,ing.dk,in.fo##.top-banner hsfo.dk,jv.dk,stiften.dk,viborg-folkeblad.dk,dagbladet-holstebro-struer.dk,ugeavisen.dk,fyens.dk##.adblock prisjakt.no,prisjagt.dk,dv.is,drm24.no##.adbox +iform.dk,boligpluss.no,magasinetliv.dk,tara.no##.horseshoe bygg.no,mmm.dk,kino.no##.ad byggfakta.no,byggfaktabolig.no,vvsaktuelt.no###bannerContainer:not(.HeaderBanner1) gulesider.no,degulesider.dk,krak.dk##.e-banner @@ -1168,12 +1174,12 @@ vafo.dk##.adform-flexblock ##.ad.topBanner ! https://www.aftenposten.no/sport/sjakk/i/0nyKLG/sjakkstjernen-mistet-kona ###sponsorstripe -! https://www.aftenposten.no/ (Mobile useragent) +! aftenposten.no (Mobile useragent) ###adBlinkContainer ###innocode-ad ! http://www.brannmannen.no/brann/store-utfordringer-ved-togulykken-pa-asta/ ||85.17.76.181^$image -! https://krs247.no/ +! krs247.no ##div[id^=webbannernetboard] ! lsk.no ##.ads__grid-item @@ -1220,6 +1226,10 @@ vafo.dk##.adform-flexblock ###top-ads-container ! bt.no, byas.no, aftenbladet.no (30/10/2020) ##.vertical-x1-ad > .column--big +! costume.no, costume.dk (09/11/2020) +##.flow-banner +! boligpluss.no (09/11/2020) +##.wg-banner ! 🇳🇴: ——— Tomme skillebokser ——— ! 🇩🇰: ——— Tomme adskillerbokser ——— diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 37fb60b9a..01d3f8bcd 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 091120201 +! Version: 091120202 ! 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) ! Expires: 1 day @@ -183,6 +183,8 @@ hytteavisen.no##.prodlist > .row > .small-12 hestafrettir.is##.wpb_raw_code utvarpsaga.is##.textwidget > center biff.no##.ads +viivilla.no##.digital_bilag_wrapper_horizontal +costume.no,costume.dk#?#*:-abp-has(> * > * > * > .teaser__native) ! — — — — — — — — — ! 🇳🇴: Oppføringer for minst 3 nettsteder ! 🇬🇧: Entries for at least 3 websites @@ -313,6 +315,7 @@ goal.com#?#*:-abp-has(> * > .js-betting-widget.is-country-no) ||btrbnrs.link^$third-party ||banner.3loops.com^ ||videotool.fbg.dk^$third-party +||images.passendo.com^$third-party ||print2web.sn.dk^$image ||lib.idg.no^ ! Adressa.no @@ -335,6 +338,12 @@ _toppbanner_$image ! http://www.sexpiger.dk/ ||lh3.googleusercontent.com/*=w468-h60-$image ||lh3.googleusercontent.com/*=w970-h250-$image +! salangen-nyheter.com, hytteavisen.no, strafferunden.no, langrenn.com (12/10/2020) +/getbanner.php^$image +! biff.no (26/10/2020) +_nettannonse. +/BINARY/*-BANNER-*.gif^ +/BINARY/*%20200x300.jpg^ ! — — — — — — — ! 🇳🇴: Blokkeringsoppføringer for filtjenere eller enkeltnettsteder ! 🇬🇧: Fileserver or site-specific blocking rules @@ -511,12 +520,6 @@ _300x250px-*.gif^$domain=ilaks.no @@||f.nordiskemedier.dk/2*_*.png^$image ! building-supply.dk ||f.nordiskemedier.dk/banner^ -! salangen-nyheter.com, hytteavisen.no, strafferunden.no, langrenn.com (12/10/2020) -/getbanner.php^$image -! biff.no (26/10/2020) -_nettannonse. -/BINARY/*-BANNER-*.gif^ -/BINARY/*%20200x300.jpg^ ! — — — — — — — — — ! 🇳🇴: Hovedsaklig for AdGuard ! 🇳🇴🏞: Hovudsakleg for AdGuard @@ -1033,7 +1036,6 @@ flatpanels.dk##div[style="text-align:center;clear:both;"] onlineposten.dk##.textwidget onlineposten.dk###header side6.dk##.apn-banner -iform.dk##.horseshoe iform.dk##.responsive-images iform.dk,bilmagasinet.dk##.wg-banner kommunikationsforum.dk##.col-xs-12[style] @@ -1064,6 +1066,9 @@ dagsavisen.no##.clickad-container > .row dagsavisen.no#?#style + .container > .row:-abp-has(> .col-sm-12 > .dagsavisenDesktopAd) maskinbladet.dk##.megaboard-inner maskinbladet.dk##.outer-skybanner +viivilla.no##.tree-house +bo-bedre.no,bobedre.dk##.mb-50.text-center +boligpluss.no##.article-footer + .wg-editorial ||fcbarcelona.dk/*/images/footerbg.jpg^$image ||730.no/banner/*/sonymusic/$subdocument ||danishfamilysearch.dk/images/xp2^$image @@ -1087,6 +1092,7 @@ dagens.dk,dust2.dk,kanalfrederikshavn.dk,videnskab.dk,politirapporten.dk,nyheder komputer.no,natgeo.no,historienet.no,koplr.no,ing.dk,in.fo##.top-banner hsfo.dk,jv.dk,stiften.dk,viborg-folkeblad.dk,dagbladet-holstebro-struer.dk,ugeavisen.dk,fyens.dk##.adblock prisjakt.no,prisjagt.dk,dv.is,drm24.no##.adbox +iform.dk,boligpluss.no,magasinetliv.dk,tara.no##.horseshoe bygg.no,mmm.dk,kino.no##.ad byggfakta.no,byggfaktabolig.no,vvsaktuelt.no###bannerContainer:not(.HeaderBanner1) gulesider.no,degulesider.dk,krak.dk##.e-banner @@ -1175,12 +1181,12 @@ vafo.dk##.adform-flexblock ##.ad.topBanner ! https://www.aftenposten.no/sport/sjakk/i/0nyKLG/sjakkstjernen-mistet-kona ###sponsorstripe -! https://www.aftenposten.no/ (Mobile useragent) +! aftenposten.no (Mobile useragent) ###adBlinkContainer ###innocode-ad ! http://www.brannmannen.no/brann/store-utfordringer-ved-togulykken-pa-asta/ ||85.17.76.181^$image -! https://krs247.no/ +! krs247.no ##div[id^=webbannernetboard] ! lsk.no ##.ads__grid-item @@ -1227,6 +1233,10 @@ vafo.dk##.adform-flexblock ###top-ads-container ! bt.no, byas.no, aftenbladet.no (30/10/2020) ##.vertical-x1-ad > .column--big +! costume.no, costume.dk (09/11/2020) +##.flow-banner +! boligpluss.no (09/11/2020) +##.wg-banner ! 🇳🇴: ——— Tomme skillebokser ——— ! 🇩🇰: ——— Tomme adskillerbokser ——— diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index a72774581..6b77204be 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 09November2020v1 +! Version: 09November2020v2 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard) ! Expires: 1 day @@ -187,6 +187,8 @@ hytteavisen.no##.prodlist > .row > .small-12 hestafrettir.is##.wpb_raw_code utvarpsaga.is##.textwidget > center biff.no##.ads +viivilla.no##.digital_bilag_wrapper_horizontal +costume.*##.teaser__native:upward(4) ! — — — — — — — — — ! 🇳🇴: Oppføringer for minst 3 nettsteder ! 🇬🇧: Entries for at least 3 websites @@ -317,6 +319,7 @@ goal.com##.js-betting-widget.is-country-no:upward(2) ||btrbnrs.link^$third-party ||banner.3loops.com^ ||videotool.fbg.dk^$third-party +||images.passendo.com^$third-party !+ NOT_OPTIMIZED ||print2web.sn.dk^$image !+ NOT_OPTIMIZED @@ -341,6 +344,12 @@ _toppbanner_$image ! http://www.sexpiger.dk/ ||lh3.googleusercontent.com/*=w468-h60-$image ||lh3.googleusercontent.com/*=w970-h250-$image +! salangen-nyheter.com, hytteavisen.no, strafferunden.no, langrenn.com (12/10/2020) +/getbanner.php^$image +! biff.no (26/10/2020) +_nettannonse. +/BINARY/*-BANNER-*.gif^ +/BINARY/*%20200x300.jpg^ ! — — — — — — — ! 🇳🇴: Blokkeringsoppføringer for filtjenere eller enkeltnettsteder ! 🇬🇧: Fileserver or site-specific blocking rules @@ -520,12 +529,6 @@ _300x250px-*.gif^$domain=ilaks.no @@||f.nordiskemedier.dk/2*_*.png^$image ! building-supply.dk ||f.nordiskemedier.dk/banner^ -! salangen-nyheter.com, hytteavisen.no, strafferunden.no, langrenn.com (12/10/2020) -/getbanner.php^$image -! biff.no (26/10/2020) -_nettannonse. -/BINARY/*-BANNER-*.gif^ -/BINARY/*%20200x300.jpg^ ! — — — — — — — — — ! 🇳🇴: Hovedsaklig for AdGuard ! 🇳🇴🏞: Hovudsakleg for AdGuard @@ -1077,7 +1080,6 @@ onlineposten.dk##.textwidget onlineposten.dk###header side6.dk##.apn-banner journalisten.dk##.article:style(padding-bottom: 10px !important) -iform.dk##.horseshoe iform.dk##.responsive-images iform.dk,bilmagasinet.dk##.wg-banner kommunikationsforum.dk##.col-xs-12[style] @@ -1108,6 +1110,9 @@ dagsavisen.no##.clickad-container > .row dagsavisen.no#?#style + .container > .row:has(> .col-sm-12 > .dagsavisenDesktopAd) maskinbladet.dk##.megaboard-inner maskinbladet.dk##.outer-skybanner +viivilla.no##.tree-house +bo-bedre.no,bobedre.dk##.mb-50.text-center +boligpluss.no##.article-footer + .wg-editorial ||fcbarcelona.dk/*/images/footerbg.jpg^$image ||730.no/banner/*/sonymusic/$frame ||danishfamilysearch.dk/images/xp2^$image @@ -1138,6 +1143,7 @@ dagens.dk,dust2.dk,kanalfrederikshavn.dk,videnskab.dk,politirapporten.dk,nyheder komputer.no,natgeo.no,historienet.no,koplr.no,ing.dk,in.fo##.top-banner hsfo.dk,jv.dk,stiften.dk,viborg-folkeblad.dk,dagbladet-holstebro-struer.dk,ugeavisen.dk,fyens.dk##.adblock prisjakt.*,prisjagt.dk,dv.is,drm24.no##.adbox +iform.dk,boligpluss.no,magasinetliv.dk,tara.no##.horseshoe bygg.no,mmm.dk,kino.no##.ad byggfakta.no,byggfaktabolig.no,vvsaktuelt.no###bannerContainer:not(.HeaderBanner1) gulesider.no,degulesider.dk,krak.dk##.e-banner @@ -1230,12 +1236,12 @@ vafo.dk##.adform-flexblock ##.ad.topBanner ! https://www.aftenposten.no/sport/sjakk/i/0nyKLG/sjakkstjernen-mistet-kona ###sponsorstripe -! https://www.aftenposten.no/ (Mobile useragent) +! aftenposten.no (Mobile useragent) ###adBlinkContainer ###innocode-ad ! http://www.brannmannen.no/brann/store-utfordringer-ved-togulykken-pa-asta/ 85.17.76.181$network -! https://krs247.no/ +! krs247.no ##div[id^=webbannernetboard] ! lsk.no ##.ads__grid-item @@ -1282,6 +1288,10 @@ vafo.dk##.adform-flexblock ###top-ads-container ! bt.no, byas.no, aftenbladet.no (30/10/2020) ##.vertical-x1-ad > .column--big +! costume.no, costume.dk (09/11/2020) +##.flow-banner +! boligpluss.no (09/11/2020) +##.wg-banner ! 🇳🇴: ——— Tomme skillebokser ——— ! 🇩🇰: ——— Tomme adskillerbokser ——— diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuardHome.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuardHome.txt index fe67ab1a3..d9d9bfa79 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuardHome.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuardHome.txt @@ -1,6 +1,6 @@ # Title: 📔 Dandelion Sprouts nordiske filtre (for AdGuard Home) # Translated title: Dandelion Sprout's Nordic Filters (for AdGuard Home) -# Version: 09November2020v1 +# Version: 09November2020v2 # 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # Platform notes: This list version is intended for those who use AdGuard Home and its oddly specific subset of adblocker syntaxes. # 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 @@ -214,6 +214,7 @@ ||holmedalblikk.no^ ||hot-rap-beats.top^ ||i1media.no^ +||images.passendo.com^ ||is-a-personaltrainer.com^ ||is-by.us^ ||isweb.no^ diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf b/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf index 6705ce3a9..59a65e8eb 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf +++ b/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf @@ -207,6 +207,7 @@ server=/hollisternorge.com/127.0.0.1 server=/holmedalblikk.no/127.0.0.1 server=/hot-rap-beats.top/127.0.0.1 server=/i1media.no/127.0.0.1 +server=/images.passendo.com/127.0.0.1 server=/is-a-personaltrainer.com/127.0.0.1 server=/is-by.us/127.0.0.1 server=/isweb.no/127.0.0.1 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersDomainsAllowlist.txt b/NorwegianExperimentalList alternate versions/NordicFiltersDomainsAllowlist.txt index e724f5de6..f2fb4caad 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersDomainsAllowlist.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersDomainsAllowlist.txt @@ -1,6 +1,6 @@ # Title: 📔 Dandelion Sprouts nordiske filtre (Domenehviteliste) # Translated title: Dandelion Sprout's Nordic Filters (Domains allowlist) -# Version: 09November2020v1-Beta +# Version: 09November2020v2-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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # Platform notes: This list version is intended for users of Pi-hole, Blokada and DNS66, as a recommended supplement to their regular list versions. For AdGuard Home, the allowlistings are already incorporated in its regular list version. # 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 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersForMinerBlock.txt b/NorwegianExperimentalList alternate versions/NordicFiltersForMinerBlock.txt index 4bffc5b61..66462daa8 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersForMinerBlock.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersForMinerBlock.txt @@ -1,6 +1,6 @@ # Title: 📔 Dandelion Sprouts nordiske filtre (for MinerBlock) # Translated title: Dandelion Sprout's Nordic Filters (for MinerBlock) -# Version: 09November2020v1-Alpha +# Version: 09November2020v2-Alpha # 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # Platform notes: So, let's say your company boss is not letting you install any adblocker on your awful work laptop, but (s)he lets you install MinerBlock for some indeterminable reason? In this very unlikely case, I've saved your day. # Note: This list does not actually block any mining-related stuff. @@ -216,6 +216,7 @@ *://*.holmedalblikk.no/* *://*.hot-rap-beats.top/* *://*.i1media.no/* +*://*.images.passendo.com/* *://*.is-a-personaltrainer.com/* *://*.is-by.us/* *://*.isweb.no/* diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersHostsDeny.deny b/NorwegianExperimentalList alternate versions/NordicFiltersHostsDeny.deny index e25496258..68c8b6b1d 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersHostsDeny.deny +++ b/NorwegianExperimentalList alternate versions/NordicFiltersHostsDeny.deny @@ -1,6 +1,6 @@ # Title: 📔 Dandelion Sprouts nordiske filtre («hosts.deny»-versjonen) # Translated title: Dandelion Sprout's Nordic Filters (The «hosts.deny» version) -# Version: 09November2020v1-Beta +# Version: 09November2020v2-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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # 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 @@ -214,6 +214,7 @@ ALL: hollisternorge.com ALL: holmedalblikk.no ALL: hot-rap-beats.top ALL: i1media.no +ALL: images.passendo.com ALL: is-a-personaltrainer.com ALL: is-by.us ALL: isweb.no diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersHostsIPv6.txt b/NorwegianExperimentalList alternate versions/NordicFiltersHostsIPv6.txt index 77c2b4a76..4ecd6bfd7 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersHostsIPv6.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersHostsIPv6.txt @@ -1,6 +1,6 @@ # Title: Dandelion Sprouts nordiske filtre (IPv6-«hosts»-versjonen) # Translated title: Dandelion Sprout's Nordic Filters (The IPv6 «hosts» file version) -# Version: 09November2020v1 +# Version: 09November2020v2 # 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # Platform notes: This list version is meant to be used simultaneously of the regular «Hosts» version when using computer/Android system hosts file editors like Hosts File Editor, Gas Mask, Magisk Manager, etc. It is not needed for tools that strip away the entries' IP address, such as Blokada and pfBlockerNG. # 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 @@ -214,6 +214,7 @@ :: holmedalblikk.no www.holmedalblikk.no :: hot-rap-beats.top www.hot-rap-beats.top :: i1media.no www.i1media.no +:: images.passendo.com www.images.passendo.com :: is-a-personaltrainer.com www.is-a-personaltrainer.com :: is-by.us www.is-by.us :: isweb.no www.isweb.no diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt index e26bb8aaa..404d4a41c 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPiHole.txt @@ -1,6 +1,6 @@ # Title: 📔 Dandelion Sprouts nordiske filtre (for Pi-hole) # Translated title: Dandelion Sprout's Nordic Filters (for Pi-hole) -# Version: 09November2020v1-Alpha +# Version: 09November2020v2-Alpha # 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # Platform notes: This list version is intended for those who make use of the Regex functionality in Pi-Hole. # 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 @@ -214,6 +214,7 @@ hollisternorge.com holmedalblikk.no hot-rap-beats.top i1media.no +images.passendo.com is-a-personaltrainer.com is-by.us isweb.no diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 6929801eb..708c607ce 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 09November2020v1 +! Version: 09November2020v2 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) ! Expires: 1 day @@ -187,6 +187,8 @@ hytteavisen.no##.prodlist > .row > .small-12 hestafrettir.is##.wpb_raw_code utvarpsaga.is##.textwidget > center biff.no##.ads +viivilla.no##.digital_bilag_wrapper_horizontal +costume.*##.teaser__native:upward(4) ! — — — — — — — — — ! 🇳🇴: Oppføringer for minst 3 nettsteder ! 🇬🇧: Entries for at least 3 websites @@ -317,6 +319,7 @@ goal.com##.js-betting-widget.is-country-no:upward(2) ||btrbnrs.link^$3p ||banner.3loops.com^ ||videotool.fbg.dk^$3p +||images.passendo.com^$3p !+ NOT_OPTIMIZED ||print2web.sn.dk^$image !+ NOT_OPTIMIZED @@ -341,6 +344,12 @@ _toppbanner_$image ! http://www.sexpiger.dk/ ||lh3.googleusercontent.com/*=w468-h60-$image ||lh3.googleusercontent.com/*=w970-h250-$image +! salangen-nyheter.com, hytteavisen.no, strafferunden.no, langrenn.com (12/10/2020) +/getbanner.php^$image +! biff.no (26/10/2020) +_nettannonse. +/BINARY/*-BANNER-*.gif^ +/BINARY/*%20200x300.jpg^ ! — — — — — — — ! 🇳🇴: Blokkeringsoppføringer for filtjenere eller enkeltnettsteder ! 🇬🇧: Fileserver or site-specific blocking rules @@ -520,12 +529,6 @@ _300x250px-*.gif^$domain=ilaks.no @@||f.nordiskemedier.dk/2*_*.png^$image ! building-supply.dk ||f.nordiskemedier.dk/banner^ -! salangen-nyheter.com, hytteavisen.no, strafferunden.no, langrenn.com (12/10/2020) -/getbanner.php^$image -! biff.no (26/10/2020) -_nettannonse. -/BINARY/*-BANNER-*.gif^ -/BINARY/*%20200x300.jpg^ ! — — — — — — — — — ! 🇳🇴: Hovedsaklig for AdGuard ! 🇳🇴🏞: Hovudsakleg for AdGuard @@ -1077,7 +1080,6 @@ onlineposten.dk##.textwidget onlineposten.dk###header side6.dk##.apn-banner journalisten.dk##.article:style(padding-bottom: 10px !important) -iform.dk##.horseshoe iform.dk##.responsive-images iform.dk,bilmagasinet.dk##.wg-banner kommunikationsforum.dk##.col-xs-12[style] @@ -1108,6 +1110,9 @@ dagsavisen.no##.clickad-container > .row dagsavisen.no#?#style + .container > .row:-abp-has(> .col-sm-12 > .dagsavisenDesktopAd) maskinbladet.dk##.megaboard-inner maskinbladet.dk##.outer-skybanner +viivilla.no##.tree-house +bo-bedre.no,bobedre.dk##.mb-50.text-center +boligpluss.no##.article-footer + .wg-editorial ||fcbarcelona.dk/*/images/footerbg.jpg^$image ||730.no/banner/*/sonymusic/$frame ||danishfamilysearch.dk/images/xp2^$image @@ -1138,6 +1143,7 @@ dagens.dk,dust2.dk,kanalfrederikshavn.dk,videnskab.dk,politirapporten.dk,nyheder komputer.no,natgeo.no,historienet.no,koplr.no,ing.dk,in.fo##.top-banner hsfo.dk,jv.dk,stiften.dk,viborg-folkeblad.dk,dagbladet-holstebro-struer.dk,ugeavisen.dk,fyens.dk##.adblock prisjakt.*,prisjagt.dk,dv.is,drm24.no##.adbox +iform.dk,boligpluss.no,magasinetliv.dk,tara.no##.horseshoe bygg.no,mmm.dk,kino.no##.ad byggfakta.no,byggfaktabolig.no,vvsaktuelt.no###bannerContainer:not(.HeaderBanner1) gulesider.no,degulesider.dk,krak.dk##.e-banner @@ -1230,12 +1236,12 @@ vafo.dk##.adform-flexblock ##.ad.topBanner ! https://www.aftenposten.no/sport/sjakk/i/0nyKLG/sjakkstjernen-mistet-kona ###sponsorstripe -! https://www.aftenposten.no/ (Mobile useragent) +! aftenposten.no (Mobile useragent) ###adBlinkContainer ###innocode-ad ! http://www.brannmannen.no/brann/store-utfordringer-ved-togulykken-pa-asta/ ||85.17.76.181^$image -! https://krs247.no/ +! krs247.no ##div[id^=webbannernetboard] ! lsk.no ##.ads__grid-item @@ -1282,6 +1288,10 @@ vafo.dk##.adform-flexblock ###top-ads-container ! bt.no, byas.no, aftenbladet.no (30/10/2020) ##.vertical-x1-ad > .column--big +! costume.no, costume.dk (09/11/2020) +##.flow-banner +! boligpluss.no (09/11/2020) +##.wg-banner ! 🇳🇴: ——— Tomme skillebokser ——— ! 🇩🇰: ——— Tomme adskillerbokser ——— diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index e588e3334..66688e88f 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 09November2020v1-Alpha +# Version: 09November2020v2-Alpha # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy) # Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy) # Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md @@ -121,6 +121,7 @@ .btrbnrs.link .banner.3loops.com .videotool.fbg.dk +.images.passendo.com .print2web.sn.dk .lib.idg.no {+block{Adressa.no}} @@ -145,6 +146,12 @@ .lh3.googleusercontent.com/*=w468-h60- {+block} .lh3.googleusercontent.com/*=w970-h250- +# salangen-nyheter.com, hytteavisen.no, strafferunden.no, langrenn.com (12/10/2020) +./getbanner.php +# biff.no (26/10/2020) +.*_nettannonse. +./BINARY/*-BANNER-*.gif +./BINARY/*%20200x300.jpg # — — — — — — — # 🇳🇴: Blokkeringsoppføringer for filtjenere eller enkeltnettsteder {+block{🇬🇧: Fileserver or site-specific blocking rules}} @@ -425,12 +432,6 @@ {+block{building-supply.dk}} {+block} .f.nordiskemedier.dk/banner -# salangen-nyheter.com, hytteavisen.no, strafferunden.no, langrenn.com (12/10/2020) -./getbanner.php -# biff.no (26/10/2020) -.*_nettannonse. -./BINARY/*-BANNER-*.gif -./BINARY/*%20200x300.jpg # — — — — — — — — — # 🇳🇴: Hovedsaklig for AdGuard # 🇳🇴🏞: Hovudsakleg for AdGuard @@ -504,10 +505,10 @@ # blv.no/nyheter/kan-bruke-23-millioner-pa-the-whale-undersokelsene {+block{https://www.aftenposten.no/sport/sjakk/i/4qKxMg/carlsen-overbeviste-verdensmestertakter}} {+block{https://www.aftenposten.no/sport/sjakk/i/0nyKLG/sjakkstjernen-mistet-kona}} -{+block{https://www.aftenposten.no/ (Mobile useragent)}} +# aftenposten.no (Mobile useragent) {+block{http://www.brannmannen.no/brann/store-utfordringer-ved-togulykken-pa-asta/}} .85.17.76.181 -{+block{https://krs247.no/}} +{+block{krs247.no}} {+block{lsk.no}} {+block{https://www.budstikka.no/}} # e24.no, aftenbladet.no, sysla.no @@ -533,6 +534,8 @@ # dagsavisen.no (Mobile version; 23/10/2020) # aftenposten.no, hockeymagasinet.dk, l-a.no, aftenbladet.no (30/10/2020) # bt.no, byas.no, aftenbladet.no (30/10/2020) +# costume.no, costume.dk (09/11/2020) +# boligpluss.no (09/11/2020) # 🇳🇴: ——— Tomme skillebokser ——— # 🇩🇰: ——— Tomme adskillerbokser ——— # 🇳🇴🏞: ——— Tomme skiljeboksar ——— diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersRPZ.txt b/NorwegianExperimentalList alternate versions/NordicFiltersRPZ.txt index 0a4be2de5..59c0e8cd5 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersRPZ.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersRPZ.txt @@ -1,6 +1,6 @@ ; Title: 📔 Dandelion Sprouts nordiske filtre (for BIND/RPZ) ; Translated title: Dandelion Sprout's Nordic Filters (for BIND/RPZ) -; Version: 09November2020v1-Alpha +; Version: 09November2020v2-Alpha ; 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. ; Platform notes: This list version is intended for those who use BIND or other DNS server tools that support RPZ files. ; 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 @@ -214,6 +214,7 @@ hollisternorge.com CNAME . holmedalblikk.no CNAME . hot-rap-beats.top CNAME . i1media.no CNAME . +images.passendo.com CNAME . is-a-personaltrainer.com CNAME . is-by.us CNAME . isweb.no CNAME . diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersSocks5.list b/NorwegianExperimentalList alternate versions/NordicFiltersSocks5.list index 700efa8c4..9e8dbf985 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersSocks5.list +++ b/NorwegianExperimentalList alternate versions/NordicFiltersSocks5.list @@ -1,6 +1,6 @@ # Title: 📔 Dandelion Sprouts nordiske filtre (for Shadowsocks) # Translated title: Dandelion Sprout's Nordic Filters (for Shadowsocks) -# Version: 09November2020v1-Alpha +# Version: 09November2020v2-Alpha # 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # Platform notes: This list version is intended for those who use Shadowsocks, Shadowrocket, Surge, and other Socks5-based tools that have become popular in PR-China for several reasons. # 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 @@ -214,6 +214,7 @@ DOMAIN-SUFFIX,hollisternorge.com DOMAIN-SUFFIX,holmedalblikk.no DOMAIN-SUFFIX,hot-rap-beats.top DOMAIN-SUFFIX,i1media.no +DOMAIN,images.passendo.com DOMAIN-SUFFIX,is-a-personaltrainer.com DOMAIN-SUFFIX,is-by.us DOMAIN-SUFFIX,isweb.no diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersUnbound.conf b/NorwegianExperimentalList alternate versions/NordicFiltersUnbound.conf index 75959dfab..dfbb70c64 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersUnbound.conf +++ b/NorwegianExperimentalList alternate versions/NordicFiltersUnbound.conf @@ -1,6 +1,6 @@ # Title: 📔 Dandelion Sprouts nordiske filtre (for Unbound) # Translated title: Dandelion Sprout's Nordic Filters (for Unbound) -# Version: 09November2020v1-Alpha +# Version: 09November2020v2-Alpha # 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, malware and adverts, on Norwegian, Danish, Icelandic and Faroese websites. # Platform notes: This list version is intended for those who use the DNS server tool Unbound. # 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 @@ -214,6 +214,7 @@ local-zone: "hollisternorge.com" static local-zone: "holmedalblikk.no" static local-zone: "hot-rap-beats.top" static local-zone: "i1media.no" static +local-zone: "images.passendo.com" static local-zone: "is-a-personaltrainer.com" static local-zone: "is-by.us" static local-zone: "isweb.no" static diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 5752c1cde..f34f8619c 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -242,74 +242,80 @@ def prepare_abp(lines) -> str: ) line = re.sub( - "viaplay.\*#", - "viaplay.no,viaplay.dk,viaplay.is#", + r"(^|,)viaplay.\*(#|,)", + r"\1viaplay.no,viaplay.dk,viaplay.is\2", line ) line = re.sub( - "google.\*#", - "google.no,google.dk,google.is#", + r"(^|,)google.\*(#|,)", + r"\1google.no,google.dk,google.is\2", line ) line = re.sub( - "ticketmaster.\*#", - "ticketmaster.no,ticketmaster.dk#", + r"(^|,)ticketmaster.\*(#|,)", + r"\1ticketmaster.no,ticketmaster.dk\2", line ) line = re.sub( - "qxl.\*#", - "qxl.no,qxl.dk#", + r"(^|,)qxl.\*(#|,)", + r"\1qxl.no,qxl.dk\2", line ) line = re.sub( - "expedia.\*#", - "expedia.no,expedia.dk#", + r"(^|,)expedia.\*(#|,)", + r"\1expedia.no,expedia.dk\2", line ) line = re.sub( - "gamereactor.\*#", - "gamereactor.no,gamereactor.dk#", + r"(^|,)gamereactor.\*(#|,)", + r"\1gamereactor.no,gamereactor.dk\2", line ) line = re.sub( - "viafree.\*#", - "viafree.no,viafree.dk#", + r"(^|,)viafree.\*(#|,)", + r"\1viafree.no,viafree.dk\2", line ) line = re.sub( - "momondo.\*#", - "momondo.no,monondo.dk#", + r"(^|,)momondo.\*(#|,)", + r"\1momondo.no,monondo.dk\2", line ) line = re.sub( - "eurosport.\*#", - "eurosport.no,eurosport.dk#", + r"(^|,)eurosport.\*(#|,)", + r"\1eurosport.no,eurosport.dk\2", line ) line = re.sub( - "prisjakt.\*,", - "prisjakt.no,", + r"(^|,)prisjakt.\*(#|,)", + r"\1prisjakt.no\2", line ) line = re.sub( - "180.\*#", - "180.no,180.dk#", + r"(^|,)180.\*(#|,)", + r"\g<1>180.no,180.dk\2", line ) line = re.sub( - "kimbino.\*#", - "kimbino.no,kimbino.dk#", + r"(^|,)kimbino.\*(#|,)", + r"\1kimbino.no,kimbino.dk\2", + line + ) + + line = re.sub( + r"(^|,)costume.\*(#|,)", + r"\1costume.no,costume.dk\2", line ) @@ -1927,74 +1933,80 @@ def prepare_abp(lines) -> str: ) line = re.sub( - "viaplay.\*#", - "viaplay.no,viaplay.dk,viaplay.is#", + r"(^|,)viaplay.\*(#|,)", + r"\1viaplay.no,viaplay.dk,viaplay.is\2", line ) line = re.sub( - "google.\*#", - "google.no,google.dk,google.is#", + r"(^|,)google.\*(#|,)", + r"\1google.no,google.dk,google.is\2", line ) line = re.sub( - "ticketmaster.\*#", - "ticketmaster.no,ticketmaster.dk#", + r"(^|,)ticketmaster.\*(#|,)", + r"\1ticketmaster.no,ticketmaster.dk\2", line ) line = re.sub( - "qxl.\*#", - "qxl.no,qxl.dk#", + r"(^|,)qxl.\*(#|,)", + r"\1qxl.no,qxl.dk\2", line ) line = re.sub( - "expedia.\*#", - "expedia.no,expedia.dk#", + r"(^|,)expedia.\*(#|,)", + r"\1expedia.no,expedia.dk\2", line ) line = re.sub( - "gamereactor.\*#", - "gamereactor.no,gamereactor.dk#", + r"(^|,)gamereactor.\*(#|,)", + r"\1gamereactor.no,gamereactor.dk\2", line ) line = re.sub( - "viafree.\*#", - "viafree.no,viafree.dk#", + r"(^|,)viafree.\*(#|,)", + r"\1viafree.no,viafree.dk\2", line ) line = re.sub( - "momondo.\*#", - "momondo.no,monondo.dk#", + r"(^|,)momondo.\*(#|,)", + r"\1momondo.no,monondo.dk\2", line ) line = re.sub( - "eurosport.\*#", - "eurosport.no,eurosport.dk#", + r"(^|,)eurosport.\*(#|,)", + r"\1eurosport.no,eurosport.dk\2", line ) line = re.sub( - "prisjakt.\*,", - "prisjakt.no,", + r"(^|,)prisjakt.\*(#|,)", + r"\1prisjakt.no\2", line ) line = re.sub( - "180.\*#", - "180.no,180.dk#", + r"(^|,)180.\*(#|,)", + r"\g<1>180.no,180.dk\2", line ) line = re.sub( - "kimbino.\*#", - "kimbino.no,kimbino.dk#", + r"(^|,)kimbino.\*(#|,)", + r"\1kimbino.no,kimbino.dk\2", + line + ) + + line = re.sub( + r"(^|,)costume.\*(#|,)", + r"\1costume.no,costume.dk\2", line )