From 210e9424da373863de1aa5d5ad89baacf3006046 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 17 Nov 2022 15:07:50 +0100 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 2 +- .../NordicFilters-uBOLegacy.txt | 3 ++- .../NordicFilters-uMatrixSupplement.txt | 2 +- .../NordicFiltersABP-Inclusion.txt | 22 +++++++++++++++---- .../NordicFiltersABP.txt | 3 ++- .../NordicFiltersAdGuard.txt | 3 ++- .../NordicFiltersPrivacy.txt | 3 ++- .../NordicFiltersPrivoxy.action | 2 +- .../XYZPrepareFilters.py | 2 +- 9 files changed, 30 insertions(+), 12 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 6bacc0d35..da6ac9014 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: 14November2022v1-Alpha +# Version: 16November2022v1-Alpha : 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 71bf0e633..3b5a6f7bf 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: 14November2022v1-Beta +! Version: 16November2022v1-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 @@ -1162,6 +1162,7 @@ google.*###cnsi ~ [jsaction*=dismiss] gratiskryssord.no###adSign gratiskryssord.no##.adSign gratisspil.dk###amLargeLeaderboard +tek.no##header ~ div > div:empty guloggratis.dk###bottomBanner guloggratis.dk###topBanner guloggratis.dk##.ad_form_header_right diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index 334627edd..e6d205b5f 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: 14November2022v1-Alpha +! Version: 16November2022v1-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 f4d39b872..82b1a308e 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: 141120221 +! Version: 161120221 ! 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 @@ -1126,6 +1126,7 @@ google.no,google.dk,google.is###cnsi ~ [jsaction*=dismiss] gratiskryssord.no###adSign gratiskryssord.no##.adSign gratisspil.dk###amLargeLeaderboard +tek.no##header ~ div > div:empty guloggratis.dk###bottomBanner guloggratis.dk###topBanner guloggratis.dk##.ad_form_header_right @@ -4544,7 +4545,7 @@ vmj.se#?#.sidebox:-abp-contains(/Externa länkar|Artiklar/) ! /\/\/\/\/\/\/\/\/\/\ Manuella fixor tillagt av Adblock Plus-teamet / Manual fixes added by the Adblock Plus team /\/\/\/\/\/\/\/\/\/\ ! (Currently empty.) [Adblock Plus 3.13] -! Version: 081120221 +! Version: 171120221 ! Title: Adblock List for Finland ! Description: Finnish adblock list ! Expires: 4 days @@ -4842,6 +4843,8 @@ etusuora.com#?#.pb30:-abp-has(.adsbygoogle) f1-forum.fi##.sponsoredrow facebook.com##a[aria-label="Mainostajan linkki"] facebook.com##a[aria-label=Mainostaja] +facebook.com#?#[role="feed"] [data-pagelet^="FeedUnit_"]:-abp-has([aria-label="Sponsoroitu"]) +facebook.com#?#[role="feed"] [data-pagelet^="FeedUnit_"]:-abp-has(div[class][role="button"][tabindex]:has-text(Sponsoroitu)) facebook.com#?#div[aria-label="Hakutulokset"][role="main"] [role="feed"] > [role="article"]:-abp-has(b[class]:has-text(Sponsoroitu)) facebook.com#?#div[role=complementary] > div > div > div > div > div:not([class], [data-visualcompletion]) > span:-abp-has([aria-label=Mainostaja]) facebook.com#?#span#ssrb_feed_start + div > div[class]:-abp-has(span[class][dir="auto"] > span[id]:has-text(Sponsoroitu)) @@ -4887,6 +4890,7 @@ fuengirola.fi##.elementor-widget-container > [href^="https://northernmarketing.f fuengirola.fi#?#.elementor-widget-divider.elementor-widget.elementor-widget-divider--element-align-center.elementor-widget-divider--view-line_text.elementor-element:has-text(Mainos) fuengirola.fi,mesta.net,paakallo.fi,puheenaiheet.fi##.gofollow futisfani.com,kiekkofani.com,penkkiurheilu.com,uutisankka.com##.adv-link +futisfani.com,kiekkofani.com,penkkiurheilu.com,uutisankka.com##.advr_box futisfani.com,kiekkofani.com,penkkiurheilu.com,uutisankka.com##.mvp-side-widget.widget_text futisfani.com,kiekkofani.com,penkkiurheilu.com,uutisankka.com##[class^=top-banner-] futisfani.com,kiekkofani.com,penkkiurheilu.com,uutisankka.com##[data-advadstrackid] @@ -4963,8 +4967,8 @@ hattulaan.fi,reska.fi##.top.panorama.banner hattulaan.fi,reska.fi##a[rel="lightbox[palvelut]"] hauskimmat.fi##.td-a-rec-id-content_inline hauskimmat.fi##.ylapala -hbl.fi##.bg-advertorial -hbl.fi##.dre-item--feature-advertorial +hbl.fi,ostnyland.fi,vastranyland.fi##.bg-advertorial +hbl.fi,ostnyland.fi,vastranyland.fi##.dre-item--feature-advertorial heili.fi###sp-alabanneri heili.fi##.autoboksi.moduletable heili.fi,outokummunseutu.fi,pielisjokiseutu.fi,pogostansanomat.fi,prsanomat.fi,ylakarjala.fi##.jattiboksi.moduletable @@ -5071,6 +5075,7 @@ kaleva.fi#?#.media-site__widget-container:-abp-has( * .media-widget__title:has-t kaleva.fi#?#aside.sidebar__column-container:-abp-has(.-ad) kaleva.fi,lapinkansa.fi###outstream-container kamera-lehti.fi###sidebar .simple-image > [href]:not([href^="https://kamera-lehti.fi"]) +kamera-lehti.fi###sidebar .widget[id|="custom_html"] kangasalansanomat.fi##.kaupallinen-general kangasalansanomat.fi##.ksnote kangasalansanomat.fi#?#.td-pb-span6:has-text(Kaupallinen yhteistyö) @@ -5097,6 +5102,11 @@ kauppalehti.fi#?#main:not(> h2:has-text(Kumppanisisältöä)) [class][data-test] kauppalehti.fi#?#main:not(> h2:has-text(Kumppanisisältöä)) a[href^="https://www.kauppalehti.fi/kumppanisisallot/"][target="_self"] kauppalehti.fi,mediuutiset.fi##aside > div[class] > a[href*="/kumppanisisallot/"] kauppalehti.fi,talouselama.fi#?#div[class]:-abp-has(> .lazyload-wrapper > .etua-react-embed) +kauppojen-aukioloajat.fi###search-top-wide-ad +kauppojen-aukioloajat.fi###specific-bottom-wide-ad +kauppojen-aukioloajat.fi###specific-bottom-rectangle-ad +kauppojen-aukioloajat.fi###specific-openinghours-rectangle-ad +kauppojen-aukioloajat.fi###specific-top-wide-ad keskipohjanmaa.fi#?#.col-xs-12.col-sm-6.col-md-12:has-text(mainosartikkelit) keskustelu.afterdawn.com###div-ad-below-message keskustelu.afterdawn.com##.pageWidth > div[style="min-height:90px;text-align:center;margin:auto;"] @@ -5328,6 +5338,7 @@ napsu.fi###banneriwrapper napsu.fi##.mobilead navigatormagazine.fi##.mob_panorama navigatormagazine.fi,promaintlehti.fi##.panorama +nelonen.fi#?#.chakra-container + div[class]:-abp-has(> div[class] > [data-adfscript^="track.adform.net/"]) nettiauto.com#?##art_right_banner:-abp-has(> [id|="almad"]) nopeustesti.com###offer nopeustesti.com###tulos-etu @@ -5388,6 +5399,7 @@ rakennusmaailma.fi,tekniikanmaailma.fi##.in-text-ad-slot-wrapper rakentaja.fi##div[id=kauppa_hot] rakentaja.fi##div[id^=banner] rakentaja.fi##img[id=js_ad] +rakentaja.fi#?##dimScreenAll:-abp-has([data-category="DisplayAD"]) rantapallo.fi###lomakone-results-horizontal-ads-3 rantapallo.fi##.ad-empty rantapallo.fi##.recommended.lomakone-results-row @@ -5724,6 +5736,7 @@ yrittajat.fi##div[class$=kaupallinen-yhteistyo] /telsu\.fi\/(?![^>].*\.(jpg|png|svg|ico)$).+/$image,domain=www.telsu.fi /telsu\.fi\/img\/(?!cloudcity|mindmax|navibg|prg|tvohjelmat)/$image,domain=telsu.fi /wp-content/uploads/2022/04/HymyAlibi2022_300x300_pupu.jpg$image,domain=alibi.fi|hymy.fi +/wp-content/uploads/pum/*$domain=futisfani.com|kiekkofani.com|penkkiurheilu.com|uutisankka.com ||aamuset.fi/Content/app/img/Latkaliiga_banneri.jpg$image ||ad.citycdn.fi^$third-party ||ad.ilcdn.fi^$third-party @@ -5796,6 +5809,7 @@ yrittajat.fi##div[class$=kaupallinen-yhteistyo] ||otavamedia.fi/ad/$script ||pirkkalainen.com/images/mainospaikat/3.jpg$image,domain=pirkkalainen.com ||popmedia.bbvms.com/a/pop_media_episodi_fi_inarticle$script,domain=episodi.fi +||rakentaja.fi/kuvat/esitykset/bannerit/*_Keittiomaailma-schibsted-*-kampanja$image,domain=rakentaja.fi ||rantapallo.fi^$third-party ||recommendations.asunnot.oikotie.fi^$domain=is.fi ||retkilehti.fi^*/Calazo_Banner_$image,domain=retkilehti.fi diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 4721887a6..f386eed18 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: 141120221 +! Version: 161120221 ! 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 @@ -1126,6 +1126,7 @@ golferen.no##.os_big_board_box gratiskryssord.no###adSign gratiskryssord.no##.adSign gratisspil.dk###amLargeLeaderboard +tek.no##header ~ div > div:empty guloggratis.dk###bottomBanner guloggratis.dk###topBanner guloggratis.dk##.ad_form_header_right diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 4125dc8a1..5994ef066 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: 14November2022v1 +! Version: 16November2022v1 ! 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 @@ -1161,6 +1161,7 @@ google.*###cnsi ~ [jsaction*=dismiss] gratiskryssord.no###adSign gratiskryssord.no##.adSign gratisspil.dk###amLargeLeaderboard +tek.no##header ~ div > div:empty guloggratis.dk###bottomBanner guloggratis.dk###topBanner guloggratis.dk##.ad_form_header_right diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index ae8fa9b62..ccfffe0ff 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: 14November2022v1 +! Version: 16November2022v1 ! 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 @@ -1161,6 +1161,7 @@ google.*###cnsi ~ [jsaction*=dismiss] gratiskryssord.no###adSign gratiskryssord.no##.adSign gratisspil.dk###amLargeLeaderboard +tek.no##header ~ div > div:empty guloggratis.dk###bottomBanner guloggratis.dk###topBanner guloggratis.dk##.ad_form_header_right diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index fac561c4f..20ffa99ea 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: 14November2022v1-Alpha +# Version: 16November2022v1-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/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 84b0159f9..16677ff8d 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -4165,7 +4165,7 @@ def prepare_ag(lines) -> str: line = re.sub( r"\[Adblock Plus 3\..*", - r"[AdGuard versions from 2019 onwards]", + r"[AdGuard]", line )