From ad08a3396c8156bee7d74a6072eeee86bbe3306c Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 20 Dec 2022 03:32:54 +0100 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 2 +- .../NordicFilters-uBOLegacy.txt | 6 ++++- .../NordicFilters-uMatrixSupplement.txt | 2 +- .../NordicFiltersABP-Inclusion.txt | 16 +++++++++--- .../NordicFiltersABP.txt | 6 ++++- .../NordicFiltersAdGuard.txt | 6 ++++- .../NordicFiltersPrivacy.txt | 6 ++++- .../NordicFiltersPrivoxy.action | 2 +- .../XYZPrepareFilters.py | 25 ++++++++++++++++--- 9 files changed, 58 insertions(+), 13 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index ee0d7e01f..fa9794a9d 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: 08December2022v1-Alpha +# Version: 18December2022v1-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 diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt index 7c3d9fa32..8ecb83238 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: 08December2022v1-Beta +! Version: 18December2022v1-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 @@ -381,6 +381,8 @@ aftenbladet.no###weather-provider-url tidensand.no#?#div[class*=View_has-space__]:has(> .text-center) tv2.no##.esi-include nettavisen.no#?#.optimus-complex-front:has(amedia-include[manifest*=".norkon."]) +retrospilling.no#?#.widget:has-text(Play-Asia) +retrospilling.no#?#.widget:has-text(Reklame) ! — — — — — — — — — ! 🇳🇴: Oppføringer for minst 3 nettsteder ! 🇬🇧: Entries for at least 3 websites @@ -1597,6 +1599,8 @@ tv2.no##.feed-ad lydogbilde.no,lydogbillede.dk##.adunit-lazy:upward(1) billedbladet.dk##.lg\:flex.hidden dinordbok.no##.ad-container +tiendeo.no###header-standard-container +tiendeo.no##.js-print-container > li[order] ! — — — — — ! 🇳🇴: Oppføringer med spesielle omstendigheter ! 🇬🇧: Entries with special circumstances diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index ee264b4ac..19e38a368 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: 08December2022v1-Alpha +! Version: 18December2022v1-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 ec252a9ee..152cadfd5 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) ! Translated title: Dandelion Sprout's All-Nordic filters for tidier websites (for Adblock Plus with ABP inclusion compliance) -! Version: 081220221 +! Version: 181220221 ! 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 @@ -370,6 +370,8 @@ aftenbladet.no###weather-provider-url tidensand.no#?#div[class*=View_has-space__]:has(> .text-center) tv2.no##.esi-include nettavisen.no#?#.optimus-complex-front:has(amedia-include[manifest*=".norkon."]) +retrospilling.no#?#.widget:has-text(Play-Asia) +retrospilling.no#?#.widget:has-text(Reklame) ! — — — — — — — — — ! 🇳🇴: Oppføringer for minst 3 nettsteder ! 🇬🇧: Entries for at least 3 websites @@ -1535,6 +1537,8 @@ tv2.no##.feed-ad lydogbilde.no,lydogbillede.dk#?#*:has(> .adunit-lazy) billedbladet.dk##.lg\:flex.hidden dinordbok.no##.ad-container +tiendeo.no###header-standard-container +tiendeo.no##.js-print-container > li[order] ! — — — — — ! 🇳🇴: Oppføringer med spesielle omstendigheter ! 🇬🇧: Entries with special circumstances @@ -4557,7 +4561,7 @@ vmj.se#?#.sidebox:-abp-contains(/Externa länkar|Artiklar/) ! /\/\/\/\/\/\/\/\/\/\ Manuella fixor tillagt av Adblock Plus-teamet / Manual fixes added by the Adblock Plus team /\/\/\/\/\/\/\/\/\/\ ! (Currently empty.) [Adblock Plus 3.13] -! Version: 101220221 +! Version: 141220221 ! Title: Adblock List for Finland ! Description: Finnish adblock list ! Expires: 4 days @@ -4907,6 +4911,7 @@ fuengirola.fi,mesta.net,paakallo.fi,puheenaiheet.fi##.gofollow futisfani.com,kiekkofani.com,penkkiurheilu.com,uutisankka.com##.adv-link futisfani.com,kiekkofani.com,penkkiurheilu.com,uutisankka.com##.advr_box futisfani.com,kiekkofani.com,penkkiurheilu.com,uutisankka.com##.mvp-side-widget.widget_text +futisfani.com,kiekkofani.com,penkkiurheilu.com,uutisankka.com##.pum-overlay futisfani.com,kiekkofani.com,penkkiurheilu.com,uutisankka.com##[class^=top-banner-] futisfani.com,kiekkofani.com,penkkiurheilu.com,uutisankka.com##[data-advadstrackid] futisfani.com,kiekkofani.com,penkkiurheilu.com,uutisankka.com##[href="https://bonuspanda.com/fi/"] @@ -5426,7 +5431,9 @@ rantapallo.fi##div[id|=almad] ratkojat.fi###adslot_bottom ratkojat.fi###adslot_search ratkojat.fi###topslot +ratkojat.fi##.adslot_right ratkojat.fi##[href="https://www.suomi24.fi/lainaa/yhdista-lainat/"] +redfoxsanakirja.fi##.ad-container-wide retkilehti.fi##.category-mainos retkilehti.fi,riistalehti.fi##.gutenberg-content [style^="margin-left: auto; margin-right: auto; text-align: center;"]:is([id|="retki"], [id|="riist"]) retkilehti.fi,riistalehti.fi##body.home [style^="margin-left: auto; margin-right: auto; text-align: center;"]:is([id|="retki"], [id|="riist"]) + .wp-block-separator @@ -5665,7 +5672,9 @@ viranomaisuutiset.fi##.td-a-rec viranomaisuutiset.fi##[href^="https://in.matsmart.fi/t/"] viranomaisuutiset.fi##[href^="https://track.adtraction.com/"] viranomaisuutiset.fi##div[id|=nm-300x300] -viranomaisuutiset.fi#?#div[id|=polii]:-abp-has(br + br + div[id|=nm-300x300] + br + br) +viranomaisuutiset.fi#?#.td-footer-wrap .td_block_title:-abp-has(+ .td-a-rec) +viranomaisuutiset.fi#?#.td-footer-wrap .td-block-row:has-text(-Yhteistyössä-) +viranomaisuutiset.fi#?#div[id|=polii]:-abp-has([id|=nm-300x300] + br + br) voice.fi##.article-sponsored voice.fi##a[class="article-item articlestream-item unloaded"][data-sponsored="1"] voice.fi##section[class^=sbsads] + section[class^="sbs-articleitems full-size-list"][data-module_position_id="612"] @@ -5783,6 +5792,7 @@ yrittajat.fi##div[class$=kaupallinen-yhteistyo] ||cloudfront.net/images/backgroundimages/backgroundimage^$third-party ||cloudfront.net/poppartners/$script ||deals.innocode.no/api/public/v1/widgets$domain=aland.com|alandstidningen.ax|enontekionsanomat.fi|inarilainen.fi|kainuunsanomat.fi|kittilalehti.fi|kotilappi.fi|kuhmolainen.fi|luoteis-lappi.fi|saariselansanomat.fi|sompio.fi|sotkamolehti.fi|ylakainuu.fi +||deals.kledjut.com^$domain=viranomaisuutiset.fi ||dni-adops-proxy-prod-adopsmediaconverter.mercury.dnitv.com^$media,domain=discoveryplus.fi ||etn.fi/images/banners/$image ||expekt.com^$third-party diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 6b10408b7..3072bbb80 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) ! Translated title: Dandelion Sprout's West Nordic filters for tidier websites (for AdBlock and Adblock Plus) -! Version: 081220221 +! Version: 181220221 ! 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 @@ -372,6 +372,8 @@ aftenbladet.no###weather-provider-url tidensand.no#?#div[class*=View_has-space__]:has(> .text-center) tv2.no##.esi-include nettavisen.no#?#.optimus-complex-front:has(amedia-include[manifest*=".norkon."]) +retrospilling.no#?#.widget:has-text(Play-Asia) +retrospilling.no#?#.widget:has-text(Reklame) ! — — — — — — — — — ! 🇳🇴: Oppføringer for minst 3 nettsteder ! 🇬🇧: Entries for at least 3 websites @@ -1543,6 +1545,8 @@ tv2.no##.feed-ad lydogbilde.no,lydogbillede.dk#?#*:-abp-has(> .adunit-lazy) billedbladet.dk##.lg\:flex.hidden dinordbok.no##.ad-container +tiendeo.no###header-standard-container +tiendeo.no##.js-print-container > li[order] ! — — — — — ! 🇳🇴: Oppføringer med spesielle omstendigheter ! 🇬🇧: Entries with special circumstances diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 40a4700fc..b9dcf376e 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: 08December2022v1 +! Version: 18December2022v1 ! 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 @@ -380,6 +380,8 @@ aftenbladet.no###weather-provider-url tidensand.no#?#div[class*=View_has-space__]:has(> .text-center) tv2.no##.esi-include nettavisen.no#?#.optimus-complex-front:has(amedia-include[manifest*=".norkon."]) +retrospilling.no#?#.widget:has-text(Play-Asia) +retrospilling.no#?#.widget:has-text(Reklame) ! — — — — — — — — — ! 🇳🇴: Oppføringer for minst 3 nettsteder ! 🇬🇧: Entries for at least 3 websites @@ -1596,6 +1598,8 @@ tv2.no##.feed-ad lydogbilde.no,lydogbillede.dk##.adunit-lazy:upward(1) billedbladet.dk##.lg\:flex.hidden dinordbok.no##.ad-container +tiendeo.no###header-standard-container +tiendeo.no##.js-print-container > li[order] ! — — — — — ! 🇳🇴: Oppføringer med spesielle omstendigheter ! 🇬🇧: Entries with special circumstances diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 5ee2d2076..fd44a90bc 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: 08December2022v1 +! Version: 18December2022v1 ! 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 @@ -380,6 +380,8 @@ aftenbladet.no###weather-provider-url tidensand.no#?#div[class*=View_has-space__]:has(> .text-center) tv2.no##.esi-include nettavisen.no#?#.optimus-complex-front:has(amedia-include[manifest*=".norkon."]) +retrospilling.no#?#.widget:has-text(Play-Asia) +retrospilling.no#?#.widget:has-text(Reklame) ! — — — — — — — — — ! 🇳🇴: Oppføringer for minst 3 nettsteder ! 🇬🇧: Entries for at least 3 websites @@ -1596,6 +1598,8 @@ tv2.no##.feed-ad lydogbilde.no,lydogbillede.dk##.adunit-lazy:upward(1) billedbladet.dk##.lg\:flex.hidden dinordbok.no##.ad-container +tiendeo.no###header-standard-container +tiendeo.no##.js-print-container > li[order] ! — — — — — ! 🇳🇴: Oppføringer med spesielle omstendigheter ! 🇬🇧: Entries with special circumstances diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 7cdcd1130..112590f03 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: 08December2022v1-Alpha +# Version: 18December2022v1-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/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 16677ff8d..e4dbe2d37 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -5671,6 +5671,25 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r"@@\|\|coolcmd\.tk\|..*", + r"", + line + ) + + # Test 20th of December 2022; see https://github.com/AdguardTeam/HostlistCompiler/issues/42 + line = re.sub( + r"^\|\|discount\^$", + r"||*.discount^", + line + ) + + line = re.sub( + r".*\*&\*=\*&\*.*", + r"", + line + ) + if is_supported_agh(line): text += line + '\r\n' @@ -6527,7 +6546,7 @@ def prepare_domains(lines) -> str: line = re.sub( r"^twitter\.com,twitter3e4tixl4xyajtrzo62zg5vztmjuricljdp2c5kshju4avyoid\.onion#\?#article", - r"nitter.net,nitter.42l.fr#?#.timeline-item", + r"nitter.net,nitter.lacontrevoie.fr#?#.timeline-item", line ) @@ -6599,7 +6618,7 @@ def prepare_domains(lines) -> str: line = re.sub( r"^(! Homepage: .*)", - r"\1\n! Entry syntaxes specific to this supplement:\nnitter.net,nitter.42l.fr#?#.timeline-item:has(.fullname[title*=🇺🇸])\nnitter.net,nitter.42l.fr#?#.timeline-item:has(.fullname[title*=🇺🇲])", + r"\1\n! Entry syntaxes specific to this supplement:\nnitter.net,nitter.lacontrevoie.fr#?#.timeline-item:has(.fullname[title*=🇺🇸])\nnitter.net,nitter.42l.fr#?#.timeline-item:has(.fullname[title*=🇺🇲])", line ) @@ -6657,7 +6676,7 @@ def prepare_domains(lines) -> str: line = re.sub( r"^twitter\.com,twitter3e4tixl4xyajtrzo62zg5vztmjuricljdp2c5kshju4avyoid\.onion#\?#div\[style\*=\"position: absolute; \"]:not\(\[class\]\)", - r"nitter.net,nitter.42l.fr#?#.timeline-item", + r"nitter.net,nitter.lacontrevoie.fr#?#.timeline-item", line )