From 29075214868e30192b37ed3dae24eea338991371 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 20 Apr 2023 13:11:21 +0200 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 2 +- .../NordicFilters-uBOLegacy.txt | 4 +- .../NordicFilters-uMatrixSupplement.txt | 2 +- .../NordicFiltersABP-Inclusion.txt | 12 ++-- .../NordicFiltersABP.txt | 4 +- .../NordicFiltersAdGuard.txt | 4 +- .../NordicFiltersPrivacy.txt | 4 +- .../NordicFiltersPrivoxy.action | 2 +- .../XYZPrepareFilters.py | 62 ++++++++++++++++++- 9 files changed, 84 insertions(+), 12 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 544f0ce4a..3f53e19f6 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: 17April2023v1-Deprecated +# Version: 19April2023v1-Deprecated : 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 946d14619..5ff236d3f 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: 17April2023v1-Beta +! Version: 19April2023v1-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 @@ -1629,6 +1629,8 @@ klikk.no##article[id^=lpc_belowArticle_] jyllands-posten.dk##section[id^=monster_] dagbladet.no#?#div[class^=styles__StudioSpacer-]:has(div[class^=AdWrapper__]) startsiden.no##div[class*=__adContainer__] +fjellforum.no##li[class=ipsDataItem] +fjellforum.no###elPostFeed > form > center ! — — — — — ! 🇳🇴: 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 0aef0419e..022d01cca 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: 17April2023v1-Alpha +! Version: 19April2023v1-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 c95f66354..ebaf10ab0 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: 170420231 +! Version: 190420231 ! 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 @@ -1567,6 +1567,8 @@ klikk.no##article[id^=lpc_belowArticle_] jyllands-posten.dk##section[id^=monster_] dagbladet.no#?#div[class^=styles__StudioSpacer-]:has(div[class^=AdWrapper__]) startsiden.no##div[class*=__adContainer__] +fjellforum.no##li[class=ipsDataItem] +fjellforum.no###elPostFeed > form > center ! — — — — — ! 🇳🇴: Oppføringer med spesielle omstendigheter ! 🇬🇧: Entries with special circumstances @@ -4770,8 +4772,7 @@ feber.se##.maxetise ! Title: Adblock List for Finland ! Description: Finnish adblock list ! Expires: 4 days -! Last modified: %timestamp% -! Test +! Last modified: Thu, 20 Apr 2023 10:30:17 +0000 ! Finnish section's homepage: https://github.com/finnish-easylist-addition/finnish-easylist-addition ! License: https://unlicense.org/ ! Raportoi mainoksenestoon liittyvistä ongelmista tai estämättömistä mainoksista täällä / Please report adblocking related issues or unblocked ads at: @@ -5036,8 +5037,10 @@ edgeski.fi,foregolf.fi,rodeosnow.fi##[id|=adni_widgets] edukas.fi##.compareGoogleCell eeva.fi#?#.swiper-slide:-abp-has(div[class*="ContentCard__AdLabel"]) eeva.fi#?#a[class^="ContentCard__Card-"]:has-text(Mainos: ) +eeva.fi#?#div[class^="EmbeddedArticle__Container"]:-abp-has(.category:has-text(Mainos:)) eeva.fi#?#div[class^="EmbeddedArticle__Container"]:-abp-has(div[class*="CommercialLabelContainer"]) eeva.fi#?#div[class^="ContentFlowBlock__CardContainer"]:-abp-has(div[class*="ContentCard__AdLabel"]) +eeva.fi#?#div[class^="StripeBannerBlock__StripeBannerContainer"]:has-text(Mainos:) ehandel.fi###div-leeadsFullpageAd ehandel.fi##.article-ad-container ehandel.fi##.commercial-row @@ -5346,6 +5349,7 @@ keskustelu.afterdawn.com###div-ad-below-message keskustelu.afterdawn.com##.pageWidth > div[style="min-height:90px;text-align:center;margin:auto;"] keskustelu.afterdawn.com##.sidebar > div[style="min-height:250px;text-align:center;margin:auto;"] keskustelu.kaksplus.fi###native-list-wrapper +keskustelu.kaksplus.fi###native_text_wrapper keskustelu.kaksplus.fi##.native.feed_box_container keskustelu.kauppalehti.fi##.blogi__nosto keskustelu.kauppalehti.fi##.kl-sima--blocks > [href^="https://www.kauppalehti.fi/kumppanisisallot/"] @@ -5601,7 +5605,6 @@ palkkavertailu.com###nav + div[style="min-height:250px;text-align:center"] pelaaja.fi##div.views-injected-row.views-row pelaaja.fi##div[class="main-container header-container container-fluid"] pelaaja.fi#?#div.full-width-col.row:-abp-has(.ad-pane) -pelaajalehti.com##.views-injected-row pelikone.fi,teknavi.fi##.ad pelikone.fi##.preroll-text pelikone.fi##.text-ad-container @@ -6105,6 +6108,7 @@ _300x300_*.mp4$media,domain=futisfani.com|kiekkofani.com|penkkiurheilu.com|uutis ||tohtorille.fi/Content/img/op-banners/$image ||tokentube.net/f_scripts/shared/videojs/ads.vast.js$script ||tokentube.net/vast?t=vjs&v=$xmlhttprequest +||tori.fi/templates/common/arrays_marketing_banner.js$script,domain=moottori.fi ||ts.fi/adframe.js$script,domain=ts.fi ||urbaanisanakirja.com/static/img/portsaad.png$image ||vertaa.fi^*/showads.js$script,domain=vertaa.fi diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index e87ce08b9..d0edf7b16 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: 170420231 +! Version: 190420231 ! 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 @@ -1575,6 +1575,8 @@ klikk.no##article[id^=lpc_belowArticle_] jyllands-posten.dk##section[id^=monster_] dagbladet.no#?#div[class^=styles__StudioSpacer-]:has(div[class^=AdWrapper__]) startsiden.no##div[class*=__adContainer__] +fjellforum.no##li[class=ipsDataItem] +fjellforum.no###elPostFeed > form > center ! — — — — — ! 🇳🇴: Oppføringer med spesielle omstendigheter ! 🇬🇧: Entries with special circumstances diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 21cae4128..41e1d545b 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: 17April2023v1 +! Version: 19April2023v1 ! 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 @@ -1628,6 +1628,8 @@ klikk.no##article[id^=lpc_belowArticle_] jyllands-posten.dk##section[id^=monster_] dagbladet.no#?#div[class^=styles__StudioSpacer-]:has(div[class^=AdWrapper__]) startsiden.no##div[class*=__adContainer__] +fjellforum.no##li[class=ipsDataItem] +fjellforum.no###elPostFeed > form > center ! — — — — — ! 🇳🇴: Oppføringer med spesielle omstendigheter ! 🇬🇧: Entries with special circumstances diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index bda3559d0..58ea21849 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: 17April2023v1 +! Version: 19April2023v1 ! 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 @@ -1628,6 +1628,8 @@ klikk.no##article[id^=lpc_belowArticle_] jyllands-posten.dk##section[id^=monster_] dagbladet.no#?#div[class^=styles__StudioSpacer-]:has(div[class^=AdWrapper__]) startsiden.no##div[class*=__adContainer__] +fjellforum.no##li[class=ipsDataItem] +fjellforum.no###elPostFeed > form > center ! — — — — — ! 🇳🇴: Oppføringer med spesielle omstendigheter ! 🇬🇧: Entries with special circumstances diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index c099baaf1..e0edf8e1e 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: 17April2023v1-Deprecated +# Version: 19April2023v1-Deprecated # Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md # Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md # 🇳🇴: Denne listen dekker nettsteder for Norge, Danmark, Island, Færøyene, Grønland, Schleswig-Holsteins danske minoritet, og samebefolkningen. For mere informasjon, detaljer, hjelpemidler, og andre lister jeg har laget, gå til https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md#norsk diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 2623b10e8..4cf6a3ef8 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -190,6 +190,12 @@ def prepare_ag(lines) -> str: line ) + line = re.sub( + r"^\$[a-z0-9-]{1,}$", + r"", + line + ) + text += line + '\n' return text @@ -848,6 +854,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"^\$[a-z0-9-]{1,}$", + r"", + line + ) + if is_supported_abp(line): text += line + '\n' @@ -2158,6 +2170,12 @@ def prepare_xul(lines) -> str: line ) + line = re.sub( + r"^\$[a-z0-9-]{1,}$", + r"", + line + ) + text += line + '\n' return text @@ -2209,7 +2227,7 @@ if __name__ == "__main__": import requests import re -SOURCES = ['https://gitlab.com/DandelionSprout/adfilt/-/raw/master/NorwegianList.txt', 'https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFilters-NotBrave.txt', 'https://raw.githubusercontent.com/DandelionSprout/Swedish-List-for-Adblock-Plus/main/Swedish%20List%20for%20Adblock%20Plus.txt', 'https://raw.githubusercontent.com/finnish-easylist-addition/finnish-easylist-addition/master/Finland_adb.txt'] +SOURCES = ['https://gitlab.com/DandelionSprout/adfilt/-/raw/master/NorwegianList.txt', 'https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFilters-NotBrave.txt', 'https://raw.githubusercontent.com/DandelionSprout/Swedish-List-for-Adblock-Plus/main/Swedish%20List%20for%20Adblock%20Plus.txt', 'https://raw.githubusercontent.com/finnish-easylist-addition/finnish-easylist-addition/gh-pages/Finland_adb.txt'] UNSUPPORTED_ABP = ['$important', ',important', '$redirect=', ',redirect=', ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^', '!#i', '$app', ':not(:-abp-', ':not(:has','$csp=upgrade-insecure-requests', '$removeparam', 'badfilter'] @@ -2987,6 +3005,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"^\$[a-z0-9-]{1,}$", + r"", + line + ) + if is_supported_abp(line): text += line + '\n' @@ -4409,6 +4433,12 @@ def prepare_ag(lines) -> str: line ) + line = re.sub( + r"^\$[a-z0-9-]{1,}$", + r"", + line + ) + text += line + '\n' return text @@ -4674,6 +4704,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"^\$[a-z0-9-]{1,}$", + r"", + line + ) + if is_supported_abp(line): text += line + '\n' @@ -5079,6 +5115,12 @@ def prepare_tpl(lines) -> str: line ) + line = re.sub( + r"^\$[a-z0-9-]{1,}$", + r"", + line + ) + if is_supported_tpl(line): text += line + '\n' @@ -6871,6 +6913,12 @@ def prepare_domains(lines) -> str: line ) + line = re.sub( + r"^\$[a-z0-9-]{1,}$", + r"", + line + ) + if not line == '': text += line + '\n' @@ -6947,6 +6995,12 @@ def prepare_domains(lines) -> str: line ) + line = re.sub( + r"^\$[a-z0-9-]{1,}$", + r"", + line + ) + if not line == '': text += line + '\n' @@ -7035,6 +7089,12 @@ def prepare_domains(lines) -> str: line ) + line = re.sub( + r"^\$[a-z0-9-]{1,}$", + r"", + line + ) + if not line == '': text += line + '\n'