From a220e0176691fff5cde8f396f49728d859501b45 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 25 Feb 2020 22:09:20 +0100 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 4 ++-- .../NordicFiltersABP.txt | 6 +++++- .../NordicFiltersAdGuard.txt | 6 +++++- .../NordicFiltersPrivacy.txt | 6 +++++- .../NordicFiltersPrivoxy.action | 3 ++- .../XYZPrepareFilters.py | 6 ++++++ 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 1d1e47f87..353b4b27b 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 22February2020v1-Beta +# Version: 25February2020v2-Beta # Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 @@ -108,7 +108,6 @@ contentMarketing -d advertising.no -d fotbolti.net banners -d samfilm.codelab.is --d finn.no # β€” β€” β€” β€” β€” # πŸ‡³πŸ‡΄: Generelle oppfΓΈringer med kilder # πŸ‡¬πŸ‡§: Generic entries that have sources @@ -129,6 +128,7 @@ contentMarketing # tv2.no # bt.no -d finn.no distribution-carousel? +# https://kulturplot.no/synspunkt/2020/hva-er-malet-for-kultur-i-regionreformen # πŸ‡³πŸ‡΄: β€”β€”β€” Tomme restebokser som EasyList har etterlatt β€”β€”β€” # πŸ‡©πŸ‡°: β€”β€”β€” Tomme restebokser, som EasyList har efterladt β€”β€”β€” # πŸ‡³πŸ‡΄πŸž: β€”β€”β€” Tomme resteboksar som EasyList har slengd ifrΓ₯ seg β€”β€”β€” diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 72d66f272..999611778 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 220220201 +! Version: 250220202 ! Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdBlock and Adblock Plus) ! Expires: 12 hours @@ -286,6 +286,8 @@ bt.no##section[class$=-ad] tv2.no##.spklw-post-attr[data-pc] ! bt.no ||finn.no/distribution-carousel?$object,third-party +! https://kulturplot.no/synspunkt/2020/hva-er-malet-for-kultur-i-regionreformen +##.spklw-post-attr[data-recommendation-type=sprinkleit] ! πŸ‡³πŸ‡΄: β€”β€”β€” Tomme restebokser som EasyList har etterlatt β€”β€”β€” ! πŸ‡©πŸ‡°: β€”β€”β€” Tomme restebokser, som EasyList har efterladt β€”β€”β€” @@ -422,6 +424,7 @@ information.dk##.masthead itavisen.no##.fifth-article-ad itavisen.no,tvguide.dk##div[id^=ad-] jn.fo##.lysingarspot +sol.no##[class^=AdPrefix-] jubii.dk##.mobiletakeover-background jyllands-posten.dk###MegaBoard_Top jyllands-posten.dk##div[id^=MediumRectangle] @@ -605,6 +608,7 @@ bt.no##.vertical-x1-ad > .column--big friflyt.no###wallpaperCenterAd trening.no##.mb-top-banner-wrapper trening.no##.dfp-netboard +kulturplot.no,dagensperspektiv.no,velferd.no###main > .small-12:nth-of-type(1) ! β€” β€” β€” β€” β€” ! πŸ‡³πŸ‡΄: Generelle oppfΓΈringer med kilder ! πŸ‡¬πŸ‡§: Generic entries that have sources diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index c466ff389..4d606d987 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 22February2020v1 +! Version: 25February2020v2 ! Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard) ! Expires: 12 hours @@ -289,6 +289,8 @@ bt.no##section[class$=-ad] tv2.no##.spklw-post-attr[data-pc] ! bt.no ||finn.no/distribution-carousel?$object,third-party +! https://kulturplot.no/synspunkt/2020/hva-er-malet-for-kultur-i-regionreformen +##.spklw-post-attr[data-recommendation-type=sprinkleit] ! πŸ‡³πŸ‡΄: β€”β€”β€” Tomme restebokser som EasyList har etterlatt β€”β€”β€” ! πŸ‡©πŸ‡°: β€”β€”β€” Tomme restebokser, som EasyList har efterladt β€”β€”β€” @@ -428,6 +430,7 @@ information.dk##.masthead itavisen.no##.fifth-article-ad itavisen.no,tvguide.dk##div[id^=ad-] jn.fo##.lysingarspot +sol.no##[class^=AdPrefix-] jubii.dk##.mobiletakeover-background jyllands-posten.dk###MegaBoard_Top jyllands-posten.dk##div[id^=MediumRectangle] @@ -622,6 +625,7 @@ bt.no##.vertical-x1-ad > .column--big friflyt.no###wallpaperCenterAd trening.no##.mb-top-banner-wrapper trening.no##.dfp-netboard +kulturplot.no,dagensperspektiv.no,velferd.no###main > .small-12:nth-of-type(1) ! β€” β€” β€” β€” β€” ! πŸ‡³πŸ‡΄: Generelle oppfΓΈringer med kilder ! πŸ‡¬πŸ‡§: Generic entries that have sources diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 356a6146a..8f29a89b4 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 22February2020v1 +! Version: 25February2020v2 ! Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) ! Expires: 12 hours @@ -289,6 +289,8 @@ bt.no##section[class$=-ad] tv2.no##.spklw-post-attr[data-pc] ! bt.no ||finn.no/distribution-carousel?$object,3p +! https://kulturplot.no/synspunkt/2020/hva-er-malet-for-kultur-i-regionreformen +##.spklw-post-attr[data-recommendation-type=sprinkleit] ! πŸ‡³πŸ‡΄: β€”β€”β€” Tomme restebokser som EasyList har etterlatt β€”β€”β€” ! πŸ‡©πŸ‡°: β€”β€”β€” Tomme restebokser, som EasyList har efterladt β€”β€”β€” @@ -428,6 +430,7 @@ information.dk##.masthead itavisen.no##.fifth-article-ad itavisen.no,tvguide.dk##div[id^=ad-] jn.fo##.lysingarspot +sol.no##[class^=AdPrefix-] jubii.dk##.mobiletakeover-background jyllands-posten.dk###MegaBoard_Top jyllands-posten.dk##div[id^=MediumRectangle] @@ -622,6 +625,7 @@ bt.no##.vertical-x1-ad > .column--big friflyt.no###wallpaperCenterAd trening.no##.mb-top-banner-wrapper trening.no##.dfp-netboard +kulturplot.no,dagensperspektiv.no,velferd.no###main > .small-12:nth-of-type(1) ! β€” β€” β€” β€” β€” ! πŸ‡³πŸ‡΄: Generelle oppfΓΈringer med kilder ! πŸ‡¬πŸ‡§: Generic entries that have sources diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index b20389d92..f183cf878 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 22February2020v1-Alpha +# Version: 25February2020v2-Alpha # Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy) # Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy) # Expires: 12 hours @@ -149,6 +149,7 @@ contentMarketing # tv2.no # bt.no .finn.no/distribution-carousel? +# https://kulturplot.no/synspunkt/2020/hva-er-malet-for-kultur-i-regionreformen # # πŸ‡³πŸ‡΄: β€”β€”β€” Tomme restebokser som EasyList har etterlatt β€”β€”β€” # πŸ‡©πŸ‡°: β€”β€”β€” Tomme restebokser, som EasyList har efterladt β€”β€”β€” diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 2190e6401..ef8329496 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -813,6 +813,12 @@ def prepare_tpl(lines) -> str: line ) + line = re.sub( + r"^-d finn\.no$", + r"", + line + ) + if is_supported_tpl(line) and not line == '': text += line + '\r\n'