From 5f61e469958ee331c56766d5436e14bee25edd56 Mon Sep 17 00:00:00 2001 From: Imre Eilertsen Date: Mon, 2 Dec 2024 06:49:23 +0100 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 3 ++- .../NordicFilters-uBOLegacy.txt | 9 +++++++-- .../NordicFilters-uMatrixSupplement.txt | 2 +- .../NordicFiltersABP-Inclusion.txt | 11 ++++++++--- .../NordicFiltersABP.txt | 4 ++-- .../NordicFiltersAdGuard.txt | 9 +++++++-- .../NordicFiltersPrivacy.txt | 9 +++++++-- .../NordicFiltersPrivoxy.action | 3 ++- .../XYZPrepareFilters.py | 8 +++++++- 9 files changed, 43 insertions(+), 15 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 75abe3eb8..53032cd49 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 # Title πŸ‡¬πŸ‡§: Dandelion Sprout's Nordic filters for tidier websites -# Last modified: 29November2024v2-Deprecated +# Last modified: 02December2024v1-Deprecated : expires = 18 hours # Lisens Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md # Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -708,6 +708,7 @@ msFilterList -d widget.tippebannere.no # jyllands-postenDK (09 07 2020) # specificTXT +# https://github.com/uBlockOrigin/uAssets/issues/26263/(02/12/2024) # πŸ‡¬πŸ‡§: Entries that are also present in Β«uBlock FiltersΒ», for those who use ABP and AdGuard # β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” # πŸ‡³πŸ‡΄: Svindelnettsteder og virusnettsteder (Ikke besΓΈk dem hvis du har dine datamaskiner og lommebΓΈker kjΓ¦rt) diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt index fda9d4341..55d958f11 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Β») ! Title πŸ‡¬πŸ‡§: Dandelion Sprout's Nordic filters for tidier websites (for Β«uBlock Origin LegacyΒ») -! Last modified: 29November2024v2-Beta +! Last modified: 02December2024v1-Beta ! Expires: 18 hours ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -882,7 +882,7 @@ menn.is##.vc_column:has(.mobile-ad):not(:has(a)) polarmedia.dk##p:has(a[href*=casino]) mytastenor.com,mytastednk.com##.modal-container.open:style(padding-top: unset !important) dk-kogebogen.dk###banners_right -flashscore.dk##.boxOverContent--a +flashscore.*##.boxOverContent--a kode24.no##.top-profile.row borsen.dk##[href*="://borsen.dk/sponsoreret"] bt.no##p ~ div[class^=hyperion-css-]:has(> div[id*=-ad- i]) @@ -2416,6 +2416,11 @@ thelocal.no,thelocal.dk##.row > div[class^="row-"]:has(> a[href="#"] > .panel-ad thelocal.no,thelocal.dk#?#div > .section:has(> div[class*=-label]:has-text(Sponsored)) radio-danmark.dk,radio-norge.org###team_ad gaamess.dk##div[class$="Ad"] +! https://github.com/uBlockOrigin/uAssets/issues/26263 (02/12/2024) +flashscore.*###detail > .detailLeaderboard +flashscore.*##.adsenvelope +flashscore.*##.boxOverContent__banner +flashscore.*##.prematchOddsBonus__bonus !#if !ext_ublock ! πŸ‡¬πŸ‡§: Entries that are also present in Β«uBlock FiltersΒ», for those who use ABP and AdGuard diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index d18d3e226..411a3f17c 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) ! Title πŸ‡¬πŸ‡§: Dandelion Sprout's Nordic filters for tidier websites (uMatrix rules to use together with the raw domains version) -! Last modified: 29November2024v2-Alpha +! Last modified: 02December2024v1-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 b88148718..343099210 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 β€” Firefox β‰₯v121,x og Chromium β‰₯105,x) ! Title πŸ‡¬πŸ‡§: Dandelion Sprout's All-Nordic filters for tidier websites (for Adblock Plus with ABP inclusion compliance β€” Firefox β‰₯v121.x, Chromium β‰₯105.x) -! Version: 291120242 +! Version: 021220241 ! Expires: 18 hours ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -15,7 +15,7 @@ !β€’ ! If you wish to remove cookie banners from Nordic websites, check out https://filters.adtidy.org/windows/filters/18.txt !β€’ -! If you see β€œ/v3/full/β€œ in the list's URL or a β€œ! DiffUrl:β€œ row above, while you're using Firefox, ABP 3.x, or a non-ABP extension, then you have been scammed and must change the list subscription to https://easylist-downloads.adblockplus.org/dandelion_sprouts_nordic_filters+easylist.txt immediately. If you use ABP 4.x in Chrome, there is no reason to worry. +! If you see β€œ/v3/full/β€œ in the list's URL or a β€œ! DiffUrl:β€œ row above, while you're using Firefox, ABP 3.x, or a non-ABP extension, then you have been scammed and must change the list subscription to https://easylist-downloads.adblockplus.org/dandelion_sprouts_nordic_filters+easylist.txt immediately. However, if you use ABP 4.x in Chrome, there is no reason to worry. !β€’ ! Starting 13 May 2024, reports about non-blocked banners on digi.no and tu.no must instead be sent to https://reports.adguard.com/new_issue.html and/or https://github.com/uBlockOrigin/uAssets/issues. No exceptions under any circumstances. They're simply far, far better at them than me. They must either fix it on their own, or have written all needed entries on their own in advance before they forward such reports to me. If they ever say otherwise, show them this line of text. @@ -2327,6 +2327,11 @@ thelocal.no,thelocal.dk##.row > div[class^="row-"]:has(> a[href="#"] > .panel-ad thelocal.no,thelocal.dk#?#div > .section:has(> div[class*=-label]:has-text(Sponsored)) radio-danmark.dk,radio-norge.org###team_ad gaamess.dk##div[class$="Ad"] +! https://github.com/uBlockOrigin/uAssets/issues/26263 (02/12/2024) +flashscore.dk###detail > .detailLeaderboard +flashscore.dk##.adsenvelope +flashscore.dk##.boxOverContent__banner +flashscore.dk##.prematchOddsBonus__bonus ! πŸ‡¬πŸ‡§: Entries that are also present in Β«uBlock FiltersΒ», for those who use ABP and AdGuard triplx.dk##.aff-inner-col @@ -4571,7 +4576,7 @@ sverigesnatur.org##div[id^=sverigesNaturPopup] sverigespringer.se##.cd-desktop-banner, .cd-mobile-banner, .cd-header-banner-wrapper sverige.nu##a[href*=casino] sweclockers.com###prisjakt-popular, .ad:not(.adPanorama), .adForumSticker, .dark-mode__sponsor -swedroid.se##div[id$=_ad], div[id$=_ad_mobile], .externalTopMobile, #externalTopMobile, a[href*="prisjakt.nu/produkt"], #nativendo-mainfeed + aside > .article, .article-footer > h3, .article-footer > .aeChart, #newExternal +swedroid.se##div[id$=_ad], div[id$=_ad_mobile], .externalTopMobile, #externalTopMobile, #nativendo-mainfeed + aside > .article, .article-footer > h3, .article-footer > .aeChart, #newExternal swedroid.se#?#.mostReadMobile:has-text(/annons/i) swedroid.se##.puff:has(script[src*="lwadm.com"], .pjSidebar) swehockey.se##[class*=-reklam], .sif-sponsorer, .teaserblock, .commonblock a:not([href^="/"], [href*="/swehockey.se"]) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 54aa3974e..91e9ff352 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) ! Title πŸ‡¬πŸ‡§: Dandelion Sprout's West Nordic filters for tidier websites (for AdBlock and Adblock Plus) -! Version: 291120242 +! Version: 021220241 ! Expires: 18 hours ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -850,7 +850,6 @@ lydogbilde.no,lydogbillede.dk##*:has(>.adunit-lazy) menn.is##.vc_column:has(.mobile-ad):not(:has(a)) polarmedia.dk##p:has(a[href*=casino]) dk-kogebogen.dk###banners_right -flashscore.dk##.boxOverContent--a kode24.no##.top-profile.row borsen.dk##[href*="://borsen.dk/sponsoreret"] bt.no##p ~ div[class^=hyperion-css-]:has(> div[id*=-ad- i]) @@ -2339,6 +2338,7 @@ thelocal.no,thelocal.dk##.row > div[class^="row-"]:has(> a[href="#"] > .panel-ad thelocal.no,thelocal.dk#?#div > .section:has(> div[class*=-label]:has-text(Sponsored)) radio-danmark.dk,radio-norge.org###team_ad gaamess.dk##div[class$="Ad"] +! https://github.com/uBlockOrigin/uAssets/issues/26263 (02/12/2024) ! πŸ‡¬πŸ‡§: Entries that are also present in Β«uBlock FiltersΒ», for those who use ABP and AdGuard triplx.dk##.aff-inner-col diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 82fa7f5e8..01305c15d 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) ! Title πŸ‡¬πŸ‡§: Dandelion Sprout's Nordic filters for tidier websites -! Last modified: 29November2024v2 +! Last modified: 02December2024v1 ! Expires: 18 hours ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -881,7 +881,7 @@ menn.is##.vc_column:has(.mobile-ad):not(:has(a)) polarmedia.dk##p:has(a[href*=casino]) mytastenor.com,mytastednk.com#$#.modal-container.open { padding-top: unset !important } dk-kogebogen.dk###banners_right -flashscore.dk##.boxOverContent--a +flashscore.*##.boxOverContent--a kode24.no##.top-profile.row borsen.dk##[href*="://borsen.dk/sponsoreret"] bt.no##p ~ div[class^=hyperion-css-]:has(> div[id*=-ad- i]) @@ -2421,6 +2421,11 @@ thelocal.no,thelocal.dk##.row > div[class^="row-"]:has(> a[href="#"] > .panel-ad thelocal.no,thelocal.dk#?#div > .section:has(> div[class*=-label]:has-text(Sponsored)) radio-danmark.dk,radio-norge.org###team_ad gaamess.dk##div[class$="Ad"] +! https://github.com/uBlockOrigin/uAssets/issues/26263 (02/12/2024) +flashscore.*###detail > .detailLeaderboard +flashscore.*##.adsenvelope +flashscore.*##.boxOverContent__banner +flashscore.*##.prematchOddsBonus__bonus !#if !ext_ublock ! πŸ‡¬πŸ‡§: Entries that are also present in Β«uBlock FiltersΒ», for those who use ABP and AdGuard diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index ae7252375..065718f3f 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) ! Title πŸ‡¬πŸ‡§: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) -! Last modified: 29November2024v2 +! Last modified: 02December2024v1 ! Expires: 18 hours ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md @@ -881,7 +881,7 @@ menn.is##.vc_column:has(.mobile-ad):not(:has(a)) polarmedia.dk##p:has(a[href*=casino]) mytastenor.com,mytastednk.com##.modal-container.open:style(padding-top: unset !important) dk-kogebogen.dk###banners_right -flashscore.dk##.boxOverContent--a +flashscore.*##.boxOverContent--a kode24.no##.top-profile.row borsen.dk##[href*="://borsen.dk/sponsoreret"] bt.no##p ~ div[class^=hyperion-css-]:has(> div[id*=-ad- i]) @@ -2415,6 +2415,11 @@ thelocal.no,thelocal.dk##.row > div[class^="row-"]:has(> a[href="#"] > .panel-ad thelocal.no,thelocal.dk#?#div > .section:has(> div[class*=-label]:has-text(Sponsored)) radio-danmark.dk,radio-norge.org###team_ad gaamess.dk##div[class$="Ad"] +! https://github.com/uBlockOrigin/uAssets/issues/26263 (02/12/2024) +flashscore.*###detail > .detailLeaderboard +flashscore.*##.adsenvelope +flashscore.*##.boxOverContent__banner +flashscore.*##.prematchOddsBonus__bonus !#if !ext_ublock ! πŸ‡¬πŸ‡§: Entries that are also present in Β«uBlock FiltersΒ», for those who use ABP and AdGuard diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 7a4181456..f0819c1f8 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) # Title πŸ‡¬πŸ‡§: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy) -# Last modified: 29November2024v2-Deprecated +# Last modified: 02December2024v1-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 @@ -1044,6 +1044,7 @@ .v.fwmrm.net/crossdomain.xml$domain=bold.dk # jyllands-postenDK (09/07/2020) {+block{specificTXT}} +{+block{https://github.com/uBlockOrigin/uAssets/issues/26263 (02/12/2024)}} {+block{πŸ‡¬πŸ‡§: Entries that are also present in Β«uBlock FiltersΒ», for those who use ABP and AdGuard}} # β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” # πŸ‡³πŸ‡΄: Svindelnettsteder og virusnettsteder (Ikke besΓΈk dem hvis du har dine datamaskiner og lommebΓΈker kjΓ¦rt) diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 4fbeef401..9bcfd2220 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -3307,7 +3307,7 @@ def prepare_abp(lines) -> str: line = re.sub( r"^(! If you wish to remove.*)", - r"!β€’\n\1\n!β€’\n! If you see β€œ/v3/full/β€œ in the list's URL or a β€œ! DiffUrl:β€œ row above, while you're using Firefox, ABP 3.x, or a non-ABP extension, then you have been scammed and must change the list subscription to https://easylist-downloads.adblockplus.org/dandelion_sprouts_nordic_filters+easylist.txt immediately. If you use ABP 4.x in Chrome, there is no reason to worry.\n!β€’", + r"!β€’\n\1\n!β€’\n! If you see β€œ/v3/full/β€œ in the list's URL or a β€œ! DiffUrl:β€œ row above, while you're using Firefox, ABP 3.x, or a non-ABP extension, then you have been scammed and must change the list subscription to https://easylist-downloads.adblockplus.org/dandelion_sprouts_nordic_filters+easylist.txt immediately. However, if you use ABP 4.x in Chrome, there is no reason to worry.\n!β€’", line ) @@ -3317,6 +3317,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"(^|,)flashscore.\*(#|,)", + r"\1flashscore.dk\2", + line + ) + if is_supported_abp(line): text += line + '\n'