diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index a407cfae7..278f96dca 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 06December2020v1-Alpha +# Version: 06December2020v2-Alpha # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 @@ -445,6 +445,7 @@ msFilterList # 🇳🇴: Får Dplay sin påloggingsside til å vises riktig # 🇬🇧: Makes Dplay's login page show up properly +d mparticle.com +# https://github.com/easylist/easylist/issues/6633 # ——— Caused by «Fanboy's Social Blocking List», if I recall correctly ——— +d api.instagram.com # https://github.com/ryanbr/fanboy-adblock/issues/1261 @@ -468,6 +469,9 @@ msFilterList -d v.fwmrm.net 1?resp= # ——— Caused by «I Don't Care About Cookies» (Its maintainer couldn't reproduce it) ——— # Fullpage uncloseable overlay when browsing around on Telenor Norway's TV section +# ——— Caused by «AdGuard Annoyances filter» ——— +# https://github.com/AdguardTeam/AdguardFilters/issues/69425 ++d js.pusher.com # ——— Unknown cause ——— # https://github.com/DandelionSprout/adfilt/issues/67 # https://old.reddit.com/r/uBlockOrigin/comments/gye2f2/cant_watch_videos_on_a_specific_website_with/ft9zlse/ diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index e271b4117..be3cd99e7 100644 --- a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt +++ b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt @@ -1,4 +1,4 @@ -! Version: 06December2020v1-Alpha +! Version: 06December2020v2-Alpha ! 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) ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md @@ -96,6 +96,7 @@ ekstrabladet.dk consent.dk third-party allow ! Forum feeds in the upper right of articles ! Unbreak a "Read out loud for the deaf" banner ! Fullpage uncloseable overlay when browsing around on Telenor Norway's TV section +nrk.no js.pusher.com * allow ekstrabladet.dk notice.sp-prod.net frame allow ekstrabladet.dk sp-prod.net xhr allow ! diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index df7f22cf0..fd1ee1701 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 061220201 +! Version: 061220202 ! Title: 🏔️ Dandelion Sprouts vestnordiske filtre for ryddigere nettsider (for Adblock Plus - Møter ABP sine inkluderingsregler) ! Translated title: Dandelion Sprout's West Nordic filters for tidier websites (for Adblock Plus with ABP inclusion compliance) ! Expires: 1 day @@ -1343,6 +1343,8 @@ avvir.no###block-block-1 > p:nth-of-type(4) ! 🇬🇧: Makes Dplay's login page show up properly @@||mparticle.com$script,domain=auth.dplay.no|auth.dplay.dk @@||assets.adobedtm.com/*/satelliteLib-$domain=auth.dplay.no|auth.dplay.dk +! https://github.com/easylist/easylist/issues/6633 +@@||adlibris.com/pixel.gif ! ——— Caused by «Fanboy's Social Blocking List», if I recall correctly ——— krom.is#@#.share-container @@/images/*youtube.jpg$domain=realityportalen.dk @@ -1384,6 +1386,9 @@ nytid.no#@#.td-a-rec ! ——— Caused by «I Don't Care About Cookies» (Its maintainer couldn't reproduce it) ——— ! Fullpage uncloseable overlay when browsing around on Telenor Norway's TV section +! ——— Caused by «AdGuard Annoyances filter» ——— +! https://github.com/AdguardTeam/AdguardFilters/issues/69425 +@@||js.pusher.com^$domain=nrk.no ! ——— Unknown cause ——— ! https://github.com/DandelionSprout/adfilt/issues/67 @@||fe.adstate.net/assets/common/img/web_ad^$domain=ba.no|nidaros.no diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index d1dd220e9..19b19ed12 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 061220201 +! Version: 061220202 ! 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) ! Expires: 1 day @@ -1352,6 +1352,8 @@ avvir.no###block-block-1 > p:nth-of-type(4) ! 🇬🇧: Makes Dplay's login page show up properly @@||mparticle.com$script,domain=auth.dplay.no|auth.dplay.dk @@||assets.adobedtm.com/*/satelliteLib-$domain=auth.dplay.no|auth.dplay.dk +! https://github.com/easylist/easylist/issues/6633 +@@||adlibris.com/pixel.gif ! ——— Caused by «Fanboy's Social Blocking List», if I recall correctly ——— krom.is#@#.share-container @@/images/*youtube.jpg$domain=realityportalen.dk @@ -1393,6 +1395,9 @@ nytid.no#@#.td-a-rec ! ——— Caused by «I Don't Care About Cookies» (Its maintainer couldn't reproduce it) ——— ! Fullpage uncloseable overlay when browsing around on Telenor Norway's TV section telenor.no##.global-overlay-background +! ——— Caused by «AdGuard Annoyances filter» ——— +! https://github.com/AdguardTeam/AdguardFilters/issues/69425 +@@||js.pusher.com^$domain=nrk.no ! ——— Unknown cause ——— ! https://github.com/DandelionSprout/adfilt/issues/67 @@||fe.adstate.net/assets/common/img/web_ad^$domain=ba.no|nidaros.no diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 0196b35f0..6da5d89ea 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 06December2020v1 +! Version: 06December2020v2 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard) ! Expires: 1 day @@ -1412,6 +1412,8 @@ hero-magazine.com###header:style(position: inherit !important) ! 🇬🇧: Makes Dplay's login page show up properly @@||mparticle.com$script,domain=auth.dplay.*|~auth.dplay.it|~auth.dplay.es @@||assets.adobedtm.com/*/satelliteLib-$domain=auth.dplay.*|~auth.dplay.it|~auth.dplay.es +! https://github.com/easylist/easylist/issues/6633 +@@||adlibris.com/pixel.gif ! ——— Caused by «Fanboy's Social Blocking List», if I recall correctly ——— krom.is#@#.share-container @@/images/*youtube.jpg$domain=realityportalen.dk @@ -1457,6 +1459,9 @@ nytid.no#@#.td-a-rec ! ——— Caused by «I Don't Care About Cookies» (Its maintainer couldn't reproduce it) ——— ! Fullpage uncloseable overlay when browsing around on Telenor Norway's TV section telenor.no##.global-overlay-background +! ——— Caused by «AdGuard Annoyances filter» ——— +! https://github.com/AdguardTeam/AdguardFilters/issues/69425 +@@||js.pusher.com^$domain=nrk.no ! ——— Unknown cause ——— ! https://github.com/DandelionSprout/adfilt/issues/67 @@||fe.adstate.net/assets/common/img/web_ad^$domain=ba.no|nidaros.no diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 9e3be3eef..48f08cfa0 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 06December2020v1 +! Version: 06December2020v2 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) ! Expires: 1 day @@ -1412,6 +1412,8 @@ hero-magazine.com###header:style(position: inherit !important) ! 🇬🇧: Makes Dplay's login page show up properly +! https://github.com/easylist/easylist/issues/6633 +@@||adlibris.com/pixel.gif ! ——— Caused by «Fanboy's Social Blocking List», if I recall correctly ——— krom.is#@#.share-container @@/images/*youtube.jpg$domain=realityportalen.dk @@ -1457,16 +1459,19 @@ nytid.no#@#.td-a-rec ! ——— Caused by «I Don't Care About Cookies» (Its maintainer couldn't reproduce it) ——— ! Fullpage uncloseable overlay when browsing around on Telenor Norway's TV section telenor.no##.global-overlay-background +! ——— Caused by «AdGuard Annoyances filter» ——— +! https://github.com/AdguardTeam/AdguardFilters/issues/69425 +@@||js.pusher.com^$domain=nrk.no ! ——— Unknown cause ——— ! https://github.com/DandelionSprout/adfilt/issues/67 -@@||fe.adstate.net/assets/common/img/web_ad^$domain=ba.no|nidaros.no -@@||fe.adstate.net/stream_file.php?type=ad_preview_image$domain=ba.no|nidaros.no + + ! https://old.reddit.com/r/uBlockOrigin/comments/gye2f2/cant_watch_videos_on_a_specific_website_with/ft9zlse/ @@||cmp.ekstrabladet.dk/get_site_data$xhr,1p -@@||dialogue.sp-prod.net/messagingWithoutDetection.js$script,domain=ekstrabladet.dk -@@||notice.sp-prod.net^$frame,domain=ekstrabladet.dk + + !#if env_firefox -@@||sp-prod.net^$xhr,domain=ekstrabladet.dk + !#endif ! diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index b3c1e591e..a0c4b1f1f 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 06December2020v1-Alpha +# Version: 06December2020v2-Alpha # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy) # Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy) # Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md @@ -626,6 +626,9 @@ .auth.dplay.it .auth.dplay.es +{+block{https://github.com/easylist/easylist/issues/6633}} +{-block} +.adlibris.com/pixel.gif # ——— Caused by «Fanboy's Social Blocking List», if I recall correctly ——— {-block} @@ -673,6 +676,10 @@ # ——— Caused by «I Don't Care About Cookies» (Its maintainer couldn't reproduce it) ——— # Fullpage uncloseable overlay when browsing around on Telenor Norway's TV section +# ——— Caused by «AdGuard Annoyances filter» ——— +{+block{https://github.com/AdguardTeam/AdguardFilters/issues/69425}} +{-block} + # ——— Unknown cause ——— {+block{https://github.com/DandelionSprout/adfilt/issues/67}} {-block} diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index a486b5bf9..a92edf1b6 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -1560,6 +1560,18 @@ def prepare_privacy(lines) -> str: line ) + line = re.sub( + r"^@@\|\|fe\.adstate\.net.*", + "", + line + ) + + line = re.sub( + r"^@@\|\|.*sp-prod\.net.*", + "", + line + ) + line = re.sub( "Dandelion Sprouts nordiske filtre for ryddigere nettsider", "Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting)",