From f8d355a4a3aa236647bf6c78dd89da33d4bc265b Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Mon, 3 Jul 2023 07:10:08 +0200 Subject: [PATCH] Add files via upload --- .../NordicFiltersABP-Inclusion.txt | 5 +-- .../XYZPrepareFilters.py | 36 ++++++++++++++++++- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index 0655d7b3f..de97a7dc3 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -4903,7 +4903,7 @@ feber.se##.maxetise ! Title: Adblock List for Finland ! Description: Finnish adblock list ! Expires: 4 days -! Last modified: %timestamp% +! Last modified: Fri, 30 Jun 2023 07:00:33 +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: @@ -5618,10 +5618,11 @@ metsastajaliitto.fi#?#.view-id-jahtimedia_latest .list-item:-abp-has([href^="htt metsastysjakalastus.fi##.Index_native-ads metsastysjakalastus.fi,rakennusmaailma.fi,tekniikanmaailma.fi##.Article_native-ads metsastysjakalastus.fi,rakennusmaailma.fi,tekniikanmaailma.fi##.in-text-ad-slot-wrapper +mikrobitti.fi##a[data-ga-teaser-name="PartnerContentTeaser"] +mikrobitti.fi##body:not(.is-style-kumppanisisallot) :is(aside, section) a[href^="https://www.mikrobitti.fi/kumppanisisallot/"] mikrobitti.fi#?#div[class]:-abp-has(> [width] > [id|="almad"]:not([id|="almad-mobileParade"])) mikrobitti.fi#?#div[class][width]:-abp-has([id|="almad-mobileParade"]) mikrobitti.fi#?#div[style="margin-bottom:0"]:-abp-has(a[href^="https://www.mikrobitti.fi/kumppanisisallot/"]) -mikrobitti.fi#?#section > div:-abp-has(a[href^="https://www.mikrobitti.fi/kumppanisisallot/"]) misssuomi.fi##.elementor-widget-container > a[href^="https://sortter.fi/"] mma.fi#?#.commercial__content:has-text(Kumppanilta) mobiili.fi###header_ad33 diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 40913aa9e..c621514fe 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",~inline-font$", + r"", + line + ) + line = re.sub( r"^\$[a-z0-9-]{1,}$", r"", @@ -4421,12 +4427,24 @@ def prepare_ag(lines) -> str: line ) + line = re.sub( + r",~inline-font$", + r"", + line + ) + line = re.sub( r",~inline-font,~inline-script,~domain=", r",~domain=", line ) + line = re.sub( + r",~inline-font,~domain=", + r",~domain=", + line + ) + line = re.sub( r"^\|\|amazonaws\.com(\^)?($|\$[ac-z,-]{1,}$).*", r"", @@ -4686,6 +4704,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r",~inline-font$", + r"", + line + ) + line = re.sub( r"-,popup$", r"-", @@ -5126,6 +5150,11 @@ def prepare_tpl(lines) -> str: r"", line ) + line = re.sub( + r".* amazonaws.*", + r"", + line + ) if is_supported_tpl(line): text += line + '\n' @@ -5269,6 +5298,12 @@ def prepare_privoxy(lines) -> str: line ) + line = re.sub( + r"^\.amazonaws.*", + r"", + line + ) + if is_supported_privoxy(line): text += line + '\n' @@ -5276,7 +5311,6 @@ def prepare_privoxy(lines) -> str: # ————— /hosts file version ————— -# Attempts to achieve Internet Explorer TPL support def is_supported_hosts(line) -> bool: for token in UNSUPPORTED_HOSTS: if token in line: