From 08f31910553d306431b7f26fca0a3c7c6d76f490 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 16 Jun 2021 13:46:35 +0200 Subject: [PATCH] Add files via upload --- .../NordicFiltersABP-Inclusion.txt | 13 +++++++------ .../XYZPrepareFilters.py | 12 ++++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index ebd7e32cc..cb4c9c1c3 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -2159,7 +2159,7 @@ sofabold.dk##.centerMgfx ! Title: 🇸🇪 Swedish List for Adblock Plus ! Expires: 6 days (update frequency) ! Version: 300520211 -! Homepage: https://github.com/DandelionSprout/Swedish-List-for-Adblock-Plus +! Swedish section's homepage: https://github.com/DandelionSprout/Swedish-List-for-Adblock-Plus ! 🇸🇪 Beskrivning: Den här listan fjärnar reklamar och sporing på svenskspråkiga websidor. Den er mycket närt tilknyttad «Frellwit's Swedish Filters», men har blivit modifiserad för at fjärna uppföringer som stridar imot reglementet för inkludering i Adblock Plus (så som anti-anti-adblocking, cookie-notifikationer, nyhetsbrev, med mer), och öka kompatibiliteten med ABP sin syntax, eftersom Frellwits lista inte tilbjuder offisiell brukerstöd för ABP-brukare. Planen är at synkronisera med listan honoms omkring en gång i månaden, och at vi i ABP-teamet lägger til båda variga och mildertidiga fixer i mällantiden. ! 🇬🇧 Description: This list removes advertising and tracking on Swedish-language websites. It is very closely connected to "Frellwit's Swedish Filters", but has been modified to remove entries that are against the rules for inclusion in Adblock Plus (such as anti-anti-adblocking, cookie notifications, newsletters, etc.), and increase compatibility with ABP's syntax, since Frellwit's list does not offer official user support for ABP users. The plan is to synchronise with his list roughly once a month, and that the ABP team add both permanent and temporary fixes in the meantime. @@ -4106,11 +4106,11 @@ wellness.se#?#*:-abp-has(> [id^=adPlacement]) ! /\/\/\/\/\/\/\/\/\/\ Manuella fixor tillagt av Adblock Plus-teamet / Manual fixes added by the Adblock Plus team /\/\/\/\/\/\/\/\/\/\ whowhatwear.co.uk#@#a[href*="/click.linksynergy"] img -! Version: 140620213 +! Version: 150620214 ! Title: Adblock List for Finland ! Description: Finnish adblock list ! Expires: 4 days -! Homepage: https://github.com/finnish-easylist-addition/finnish-easylist-addition +! 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: ! https://github.com/finnish-easylist-addition/finnish-easylist-addition/issues @@ -4194,6 +4194,7 @@ _mainosnappi. ##.tdt-desktop-ad ##.tdt-manager-element ##.tdt-minilanding-button +##.tdt-mobile-ad ##.yhteistyokaruselli ##.yhteistyokumppanit ##.yhteistyossa @@ -4221,13 +4222,14 @@ _mainosnappi. ! -----GENERAL FILTERS END----- ! -----SPECIFIC FILTERS----- +aamulehti.fi,hs.fi###header ~ .xl\:pr-sideAdOffset.bg-softwall aamulehti.fi##article.advertorial-teaser.bg-native-ad-1 aamulehti.fi##div.adContainer aamulehti.fi#?#article:-abp-has( > header > h2 > span:-abp-contains(Mainokset)) aamulehti.fi#?#div:-abp-has( > a > div > div > div > span:-abp-contains(Kaupallinen yhteistyö)) aamulehti.fi#?#div[id*="pipe"] > div > div:-abp-contains(Kaupallinen yhteistyö) aamulehti.fi#?#div[id^="morearticles_"]:-abp-has(h2:-abp-has(span:-abp-contains(Kaupallinen yhteistyö))) -aamulehti.fi,hs.fi,web.archive.org##article[class^="py-12 md:py-16 px-16 bg-ticker-20 mb-2 ticker-container bg-ticker-"] +aamulehti.fi,hs.fi,web.archive.org##article.ticker-promo-10 aamulehti.fi,satakunnankansa.fi,janakkalansanomat.fi,sydansatakunta.fi,jamsanseutu.fi,kankaanpaanseutu.fi,kmvlehti.fi,merikarvialehti.fi,nokianuutiset.fi,rannikkoseutu.fi,suurkeuruu.fi,tyrvaansanomat.fi,valkeakoskensanomat.fi###bottomBanner aamulehti.fi,satakunnankansa.fi,valkeakoskensanomat.fi,nokianuutiset.fi,janakkalansanomat.fi,kmvlehti.fi,jamsanseutu.fi,suurkeuruu.fi,kankaanpaanseutu.fi,rannikkoseutu.fi,tyrvaansanomat.fi,merikarvialehti.fi,sydansatakunta.fi##.parade-ad.ad aamuset.fi##div[class$="nativead"] @@ -4258,6 +4260,7 @@ anna.fi,kaksplus.fi##.widget_nativearticles anna.fi##div.grid__item_tn-1-2 arcticinsider.com##a[href*="bannerTrack"] arvokisat.com,eurheilu.org,herkkusuut.com,laliiga.com,leijonat.com,nainen.com,nhlsuomi.com,sketsi.net,suomif1.com,suomifutis.com,suomikiekko.com,suomikoris.com,suomiurheilu.com,susijengi.com,valioliiga.com,viikonloppu.com##div[class*="post"] > hr, hr ~ *:not(aside) +arvokisat.com,eurheilu.org,herkkusuut.com,laliiga.com,leijonat.com,nainen.com,nhlsuomi.com,sketsi.net,suomif1.com,suomifutis.com,suomikiekko.com,suomikoris.com,suomiurheilu.com,susijengi.com,valioliiga.com,viikonloppu.com#?#body.post-template-default * .td-main-content-wrap:-abp-has(.tdt-ad-wrap) arvopaperi.fi##div#skyscraper-height-div > div > aside > div > div > a[href^="/kumppaniblogit/"] arvopaperi.fi##div#skyscraper-height-div > div > aside > div > div > a[href^="https://studio.arvopaperi.fi/"] arvopaperi.fi#?#div#skyscraper-height-div > aside > div > a:-abp-contains(Kaupallinen yhteistyö) @@ -4356,10 +4359,8 @@ hintaseuranta.fi##.page-index__adholder hintaseuranta.fi##tr.rahalaitos__desktop.rahalaitos historianet.fi##div[id="stickyFooter"] hs.fi##.aldente-wrapper -hs.fi##.bg-ticker-promo-10.ticker-promo-10 hs.fi##.for-no-subscription.html-is-seuraa-myynti-bf.html-is-seuraa-myynti hs.fi##.hs-advertorial -hs.fi##.xl\:pr-sideAdOffset.shadow-toast.ease-in-out.transition-all.bottom-0.bg-softwall hs.fi##[id^="aldente-mobi"] hs.fi##a.block[href*="/mainos"] hs.fi##article[class*="bg-native-ad"] diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 23a225626..71f9d2060 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -2670,6 +2670,18 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"! Homepage: https://github\.com/finnish-easylist-addition/finnish-easylist-addition", + r"! Finnish section's homepage: https://github.com/finnish-easylist-addition/finnish-easylist-addition", + line + ) + + line = re.sub( + r"! Homepage: https://github\.com/DandelionSprout/Swedish-List-for-Adblock-Plus", + r"! Swedish section's homepage: https://github.com/DandelionSprout/Swedish-List-for-Adblock-Plus", + line + ) + if is_supported_abp(line): text += line + '\r\n'