From 9313d0780b3afcdc6dcd003aa8e49d2d3d1a9a9f Mon Sep 17 00:00:00 2001 From: Imre Eilertsen Date: Sat, 20 Sep 2025 01:41:33 +0200 Subject: [PATCH] Add files via upload --- .../NordicFilters-uMatrixSupplement.txt | 2 +- .../NordicFiltersABP-Inclusion.txt | 16 +++++++++------- .../XYZPrepareFilters.py | 12 ++++++------ 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index e39625a0c..35e2abdf6 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) ! Title 🇬🇧: Dandelion Sprout's Nordic filters for tidier websites (uMatrix rules to use together with the raw domains version) -! Last modified: 08September2025v1-Alpha +! Last modified: 08September2025v1-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/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index 43ba7af32..d76f85b3a 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -6696,7 +6696,7 @@ dn.se##.bad--insider-tall ! Title: Adblock List for Finland ! Description: Finnish adblock list ! Expires: 4 days -! Last modified: Thu, 04 Sep 2025 16:41:30 +0300 +! Last modified: Tue, 16 Sep 2025 19:56:33 +0300 ! 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: @@ -6865,8 +6865,7 @@ alypaa.com##[class^=banner-slot-preroll] alypaa.com,pelikone.fi##.text-link[href*="&utm_medium=banner&utm_campaign="] alypaa.com,pelikone.fi##.text-link[href^="https://clk.tradedoubler.com/"] ampparit.com##.gtm-bottom-ticker -ampparit.com##.gtm-navi-ticker:has([href^="https://www.iltalehti.fi/plus"]) -ampparit.com##.gtm-navi-ticker:has(a[href^="https://www.iltalehti.fi/pelit/"]) +ampparit.com##.gtm-navi-ticker:has(> a[href$="tikkeri"]) ampparit.com##.mobile-leaderboard-container ampparit.com##.resize-container ampparit.com,keskustelu.suomi24.fi,kirkkojakaupunki.fi,kuntalehti.fi,luukku.com,mtvuutiset.fi,seiska.fi,styleroom.fi,viinilehti.fi##.ad-container @@ -7679,7 +7678,9 @@ tekniikkatalous.fi#?#.article-body > div[class]:has(> span:has-text(KAUPALLINEN tekniikkatalous.fi#?#div#skyscraper-height-div > aside > div > div > a:has-text(Kaupallinen yhteistyö) tekniikkatalous.fi#?#div#skyscraper-height-div > section > div > a:has-text(Kaupallinen yhteistyö) tekniikkatalous.fi,tivi.fi##[width]:has(.lazyload-wrapper) -telsu.fi##.ch:has(em>a) +telsu.fi##.ch:has(em > a) +telsu.fi##.dp +telsu.fi##.pb telsu.fi#?#.ch:has-text(/SP(O|0)NSOROITU/) telsu.fi#?#.ch:has-text(/SPON|SPONS|SPONSO|SPONSOR|SPONSORO|SPONSOROI|SPONSOROIT|SPONSOROITU/) tennis.fi##.ad-blocks @@ -7983,6 +7984,7 @@ _300x300_*.mp4$media,domain=futisfani.com|kiekkofani.com|penkkiurheilu.com|uutis ||riistalehti.fi^*/Haix-Nature-Camo-$image,domain=riistalehti.fi ||riistalehti.fi^*_Banner_Retki_Nature_Camo_$image,domain=riistalehti.fi ||script.ilcdn.fi/etua-lainalaskuri/etua-lainalaskuri.min.js$script,domain=iltalehti.fi +||scripts.claspo.io^$script,domain=huuto.net ||seksitreffit.fi/*popunder.js$script,domain=seksitreffit.fi ||seksitreffit.fi/banners/$domain=seksitreffit.fi ||sf.nm-ovp.nelonenmedia.fi/player/games/ruutu-player-loader.js$script,domain=10kysymysta.fi|alypaa.com @@ -8075,6 +8077,9 @@ arvopaperi.fi,kauppalehti.fi,mikrobitti.fi,talouselama.fi,tekniikkatalous.fi,tiv ! Adblock check murha.info#@#.adsbygoogle @@||adserve.adcoin.com/display/ad_block/$xmlhttprequest,domain=verkkouutiset.fi +@@||adform.net^$xmlhttprequest,domain=telsu.fi +||adform.net$xmlhttprequest,rewrite=abp-resource:blank-js,domain=telsu.fi + ! Redirect resources ||freewheel-jitt.sanoma.fi^$media,rewrite=abp-resource:blank-mp3,domain=ruutu.fi @@ -8182,6 +8187,3 @@ srk.fi#@##CookielawBanner @@/eu_cookie_compliance.min.js$script,domain=www.tek.fi ! -----UNBREAK END----- - - -! Will be removed after PR's accepted (whitelistings for issues caused by other lists or additions to the main Easylist) diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index bd086eb36..50feb4ad1 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -2248,7 +2248,7 @@ def prepare_umatrix(lines) -> str: line = re.sub( r"^(! (Version|Last[ -]?[Mm]odified):.*)$", - r"\1-Alpha", + r"\1-Deprecated", line ) @@ -4190,11 +4190,11 @@ def prepare_agh(lines) -> str: line ) - line = re.sub( - r"^(# ——— Dummy entry.*)$", - r"! Fikser en absurd feil hvor T-We sin Android-app kan mislykkes i å starte opp, grunnet en stor glitch mange enheter (inkl. Windows) har med IPv6-domener hvis IP-svar starter med «64:ff9b::».\n||tvs.telenor.net^$dnstype=AAAA\n! Lignende glitch i Klarna-appens kortbildeopplasting\n||s3.eu-west-1.amazonaws.com^$dnstype=AAAA\n! Glitch i BankID\n|toba.bankidapis.no|$dnstype=AAAA\n|stoeapp.no|$dnstype=AAAA\n! Mulig glitch i Hjelp 113-appen\n|ws.snla-it.no|$dnstype=AAAA\n! Glitch i Eika Mobilbank\n|app.eika.no|$dnstype=AAAA\n|www.eika.no|$dnstype=AAAA\n! Glitch i AtB\n||nexus-websocket-a.intercom.io^$dnstype=AAAA\n||events.mapbox.com^$dnstype=AAAA\n||api.mapbox.com^$dnstype=AAAA\n||atb-prod.api.mittatb.no^$dnstype=AAAA\n||vdemedo2-android.mobile-messenger.intercom.com^$dnstype=AAAA\n! Glitch i Coopay\n|api.*.amplitude.com|$dnstype=AAAA\n\n\1", - line - ) + # line = re.sub( + # r"^(# ——— Dummy entry.*)$", + # r"! Fikser en absurd feil hvor T-We sin Android-app kan mislykkes i å starte opp, grunnet en stor glitch mange enheter (inkl. Windows) har med IPv6-domener hvis IP-svar starter med «64:ff9b::».\n! Lignende glitch i Klarna-appens kortbildeopplasting\n||s3.eu-west-1.amazonaws.com^$dnstype=AAAA\n! Glitch i BankID\n|toba.bankidapis.no|$dnstype=AAAA\n|stoeapp.no|$dnstype=AAAA\n! Mulig glitch i Hjelp 113-appen\n|ws.snla-it.no|$dnstype=AAAA\n! Glitch i Eika Mobilbank\n|app.eika.no|$dnstype=AAAA\n|www.eika.no|$dnstype=AAAA\n! Glitch i AtB\n||nexus-websocket-a.intercom.io^$dnstype=AAAA\n||events.mapbox.com^$dnstype=AAAA\n||api.mapbox.com^$dnstype=AAAA\n||atb-prod.api.mittatb.no^$dnstype=AAAA\n||vdemedo2-android.mobile-messenger.intercom.com^$dnstype=AAAA\n! Glitch i Coopay\n|api.*.amplitude.com|$dnstype=AAAA\n\n\1", + # line + #) line = re.sub( r"^\|\|www\.[a-z0-9-]{1,}\.[a-z]{2,}\^$",