From 49c93a0fcc566ee9200134a7af5c38c3ccb5c85d Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 1 Mar 2023 05:47:33 +0100 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 3 ++- .../NordicFilters-uBOLegacy.txt | 4 +++- .../NordicFilters-uMatrixSupplement.txt | 2 +- .../NordicFiltersABP-Inclusion.txt | 7 +++++-- .../NordicFiltersABP.txt | 4 +++- .../NordicFiltersAdGuard.txt | 6 ++++-- .../NordicFiltersPrivacy.txt | 6 ++++-- .../NordicFiltersPrivoxy.action | 3 ++- .../XYZPrepareFilters.py | 6 ++++++ 9 files changed, 30 insertions(+), 11 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index c8790ab05..5c7f9dbe8 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: 19February2023v1-Deprecated +# Version: 23February2023v1-Deprecated : 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 @@ -544,6 +544,7 @@ msFilterList # farmatid.no (16 11 2021) # https://radioh.no/norsk-opphenting-mot-nederland-sikret-vm-kvartfinale-storm-i-kastene/ (14 12 2021) # nordlys.no, an.no (19 06 2022) +# nidaros.no (22 02 2023) # πŸ‡³πŸ‡΄ πŸ‡©πŸ‡°: β€”β€”β€” Sporingsfiler β€”β€”β€” # πŸ‡³πŸ‡΄πŸž: β€”β€”β€” Sporingsfilar β€”β€”β€” # ❄: β€”β€”β€” Guorrafiilaid β€”β€”β€” diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt index 3c792ecfd..991df5d84 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: 19February2023v1-Beta +! Version: 23February2023v1-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 @@ -1846,6 +1846,8 @@ _980banner_ ! nordlys.no, an.no (19/06/2022) ##optimus-element[linecount=undefined][width="980"] ##optimus-element[linecount=undefined][width="480"]:first-of-type:nth-last-of-type(2) +! nidaros.no (22/02/2023) +##div[id^=art-challengeAd-] ! πŸ‡³πŸ‡΄/πŸ‡©πŸ‡°: β€”β€”β€” Sporingsfiler β€”β€”β€” ! πŸ‡³πŸ‡΄πŸž: β€”β€”β€” Sporingsfilar β€”β€”β€” diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index e88441998..a11f5f57f 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: 19February2023v1-Alpha +! Version: 23February2023v1-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 d041843e4..90c7a854f 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: 190220231 +! Version: 230220231 ! 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 @@ -1775,6 +1775,8 @@ _980banner_ ! nordlys.no, an.no (19/06/2022) ##optimus-element[linecount=undefined][width="980"] ##optimus-element[linecount=undefined][width="480"]:first-of-type:nth-last-of-type(2) +! nidaros.no (22/02/2023) +##div[id^=art-challengeAd-] ! πŸ‡³πŸ‡΄/πŸ‡©πŸ‡°: β€”β€”β€” Sporingsfiler β€”β€”β€” ! πŸ‡³πŸ‡΄πŸž: β€”β€”β€” Sporingsfilar β€”β€”β€” @@ -4693,7 +4695,7 @@ vmj.se#?#.sidebox:-abp-contains(/Externa lΓ€nkar|Artiklar/) @@||doubleclick.net/tag/js/gpt.js$domain=feber.se feber.se##.maxetise [Adblock Plus 3.13] -! Version: 120220231 +! Version: 190220231 ! Title: Adblock List for Finland ! Description: Finnish adblock list ! Expires: 4 days @@ -5340,6 +5342,7 @@ lauttakyla.fi##.hasordercontent.orange-bg lauttakyla.fi##.mainbanner lauttakyla.fi#?#.fullwidth-banner:-abp-has(> a[href="https://www.lauttakyla.fi/tilaa/"]) lbaanijakuva.fi##.adremark +lbaanijakuva.fi##.popup-overlay leffatykki.com###ad-300x150 leffatykki.com###ad-300x300 leffatykki.com##div[class="ad230x90"] diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 252e6bbf2..fac44100e 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: 190220231 +! Version: 230220231 ! 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 @@ -1781,6 +1781,8 @@ _980banner_ ! nordlys.no, an.no (19/06/2022) ##optimus-element[linecount=undefined][width="980"] ##optimus-element[linecount=undefined][width="480"]:first-of-type:nth-last-of-type(2) +! nidaros.no (22/02/2023) +##div[id^=art-challengeAd-] ! πŸ‡³πŸ‡΄/πŸ‡©πŸ‡°: β€”β€”β€” Sporingsfiler β€”β€”β€” ! πŸ‡³πŸ‡΄πŸž: β€”β€”β€” Sporingsfilar β€”β€”β€” diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 60f706e7e..af5631bed 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: 19February2023v1 +! Version: 23February2023v1 ! 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 @@ -1845,6 +1845,8 @@ _980banner_ ! nordlys.no, an.no (19/06/2022) ##optimus-element[linecount=undefined][width="980"] ##optimus-element[linecount=undefined][width="480"]:first-of-type:nth-last-of-type(2) +! nidaros.no (22/02/2023) +##div[id^=art-challengeAd-] ! πŸ‡³πŸ‡΄/πŸ‡©πŸ‡°: β€”β€”β€” Sporingsfiler β€”β€”β€” ! πŸ‡³πŸ‡΄πŸž: β€”β€”β€” Sporingsfilar β€”β€”β€” @@ -2139,7 +2141,7 @@ $removeparam=utm_id,domain=elkjop.no|elgiganten.dk ||tv2.no^$removeparam=r $removeparam=afid,domain=proshop.dk|proshop.no $removeparam=scid,domain=elgiganten.dk|elkjop.no -||adressa.no^$removeparam=/^rs[0-9]/ +||adressa.no^$removeparam=/^rs\d/ ||adressa.no^$removeparam=t ||bilhusnord.dk^$removeparam=au_advert_id ||bilhusnord.dk^$removeparam=au_car_id diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 345f7b955..0b44e1c7e 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: 19February2023v1 +! Version: 23February2023v1 ! 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 @@ -1845,6 +1845,8 @@ _980banner_ ! nordlys.no, an.no (19/06/2022) ##optimus-element[linecount=undefined][width="980"] ##optimus-element[linecount=undefined][width="480"]:first-of-type:nth-last-of-type(2) +! nidaros.no (22/02/2023) +##div[id^=art-challengeAd-] ! πŸ‡³πŸ‡΄/πŸ‡©πŸ‡°: β€”β€”β€” Sporingsfiler β€”β€”β€” ! πŸ‡³πŸ‡΄πŸž: β€”β€”β€” Sporingsfilar β€”β€”β€” @@ -2139,7 +2141,7 @@ $removeparam=utm_id,domain=elkjop.no|elgiganten.dk ||tv2.no^$removeparam=r $removeparam=afid,domain=proshop.dk|proshop.no $removeparam=scid,domain=elgiganten.dk|elkjop.no -||adressa.no^$removeparam=/^rs[0-9]/ +||adressa.no^$removeparam=/^rs\d/ ||adressa.no^$removeparam=t ||bilhusnord.dk^$removeparam=au_advert_id ||bilhusnord.dk^$removeparam=au_car_id diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 823d7f620..cd3f9ddc4 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: 19February2023v1-Deprecated +# Version: 23February2023v1-Deprecated # 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 @@ -778,6 +778,7 @@ # farmatid.no (16/11/2021) {+block{https://radioh.no/norsk-opphenting-mot-nederland-sikret-vm-kvartfinale-storm-i-kastene/ (14/12/2021)}} # nordlys.no, an.no (19/06/2022) +# nidaros.no (22/02/2023) # πŸ‡³πŸ‡΄/πŸ‡©πŸ‡°: β€”β€”β€” Sporingsfiler β€”β€”β€” # πŸ‡³πŸ‡΄πŸž: β€”β€”β€” Sporingsfilar β€”β€”β€” # ❄: β€”β€”β€” Guorrafiilaid β€”β€”β€” diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 895a98bed..2f934811f 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -6820,6 +6820,12 @@ def prepare_domains(lines) -> str: line ) + line = re.sub( + r"^twitter\.com,twitter3e4tixl4xyajtrzo62zg5vztmjuricljdp2c5kshju4avyoid\.onion#\?#\.article", + r"nitter.net,nitter.lacontrevoie.fr#?#.timeline-item", + line + ) + line = re.sub( r"^! Title: πŸͺ‘ .*", r"πŸŒ‚ Anti-'K-pop on Twitter' List - Nitter Supplement",