diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index d76f85b3a..7463a5f9f 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: Tue, 16 Sep 2025 19:56:33 +0300 +! Last modified: Mon, 22 Sep 2025 16:08:47 +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: @@ -7175,6 +7175,7 @@ irc-galleria.net,tilannehuone.fi##div[id^=Nostemedia_Desktop] is.fi##.teaser-ad__background is.fi##[data-testid|="laneitem"] > article:has(a[href^="https://media.sanoma.fi/"]) is.fi##[data-testid|="laneitem"]:has(a[href^="/mainos/"]) +is.fi##[data-testid|="laneitem"]:has(a[href^="https://www.admanager.fi/"]) is.fi##[href^="https://www.is.fi/tilaus/is-extra/"][href$="myyntitikkeri"] is.fi##div.sadblob-loading iskelma.fi##section.sbs-articleitems[data-module_position_id="814"] @@ -7307,6 +7308,10 @@ kotimikro.fi##.wg-banner koululainen.fi#?#.article__body > p:has-text(/^\xA0$/) kukasoitti.com##a[href*='adsrv'] kukasoitti.com##div[class=main-bottom] +kuka-soitti.fi##.text-center:has(> a[rel="nofollow noopener"][href]) +kuka-soitti.fi#?#body > .container:not(.mb-5, :has(.mb-5)):has-text(Mainos) +kuka-soitti.fi#?#p.text-center:has-text(Mainos) +kuka-soitti.fi#?#p.text-center:has-text(laina) kuljetusnet.fi###middle kuljetusnet.fi##div[class*=banner] kulutusluottovertailu.fi##.fusion-carousel @@ -7905,6 +7910,7 @@ _300x300_*.mp4$media,domain=futisfani.com|kiekkofani.com|penkkiurheilu.com|uutis ||aamuset.fi/Content/app/img/Latkaliiga_banneri.jpg$image ||ad.citycdn.fi^$third-party ||ad.ilcdn.fi^$third-party +||adsdk.bing.net^$third-party ||aff.carvertical.com/sdk.js$script,domain=koeajolle.com ||affiliate.guts.com^$third-party ||alibi.fi/wp-content/uploads/2018/03/AL_sivupalkin_myyntiviesti2.jpg$image diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 50feb4ad1..243d048c3 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -6038,6 +6038,12 @@ def prepare_hosts(lines) -> str: # remove or modifiy entries with unsupported modifiers for line in lines: + line = re.sub( + r"^(\|.*\.)(\$.*)?$", + r"\1com^\2", + line + ) + line = re.sub( r"^!!? ", r"# ", @@ -6098,33 +6104,9 @@ def prepare_hosts(lines) -> str: line ) - line = re.sub( - r"127\.0\.0\.1 gjtech\.net$", - "127.0.0.1 gjtech.net adblock.gjtech.net ww1.gjtech.net ww7.gjtech.net ww12.gjtech.net", - line - ) - - line = re.sub( - r"127\.0\.0\.1 tncrun\.net$", - "127.0.0.1 tncrun.net www.tncrun.net amanda.tncrun.net sarah.tncrun.net pamela.tncrun.net jessica.tncrun.net ics.tncrun.net katie.tncrun.net pbu.tncrun.net emily.tncrun.net", - line - ) - line = re.sub( r"127\.0\.0\.1 ublock\.org$", - "127.0.0.1 ublock.org www.ublock.org demo.ublock.org", - line - ) - - line = re.sub( - r"127\.0\.0\.1 ttnrd\.com$", - "127.0.0.1 ttnrd.com www.ttnrd.com amanda.ttnrd.com katie.ttnrd.com briana.ttnrd.com sarah.ttnrd.com pamela.ttnrd.com", - line - ) - - line = re.sub( - r"127\.0\.0\.1 \[(.*)\]", - r"", + "127.0.0.1 ublock.org\n127.0.0.1 www.ublock.org\n127.0.0.1 demo.ublock.org", line ) @@ -6308,6 +6290,12 @@ def prepare_hosts(lines) -> str: line ) + line = re.sub( + r"^(127\.0\.0\.1 \[.*)$", + r"", + line + ) + if is_supported_hosts(line): text += line + '\n' @@ -6328,6 +6316,12 @@ def prepare_domains(lines) -> str: # remove or modifiy entries with unsupported modifiers for line in lines: + line = re.sub( + r"^(\|.*\.)(\$.*)?$", + r"\1com^\2", + line + ) + line = re.sub( r"^!!? ", r"# ", @@ -6581,6 +6575,12 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r"^(.*)[$,]domain=~[a-z0-9]{1,}_[a-z0-9_]{1,}\.\*$", + r"\1", + line + ) + # Doesn't seem like $denyallow will be fixed in HostfilesRegistry anytime soon as of March 2023 line = re.sub( r"^(\||:)(.*)\$doc,domain=(.*)$", @@ -6925,6 +6925,12 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r"^.*/\?$", + "", + line + ) + if is_supported_agh(line) and not line == '': text += line + '\n'