diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index f67105f58..0c00580cf 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 13November2020v1-Alpha +# Version: 18November2020v2-Alpha # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 @@ -417,6 +417,7 @@ msFilterList +d isdownorblocked.com # https://github.com/DandelionSprout/adfilt/issues/63#issuecomment-689373261 -d prod-adops-proxy.dnitv.net +# https://github.com/uBlockOrigin/uAssets/issues/8230/ # ——— Caused by «EasyPrivacy» ——— # Attempting to fix a problem with voting online on Idol Norway # Attempts to resolve how some frontpage articles are hard to open @@ -426,6 +427,7 @@ msFilterList # ——— Caused by «Fanboy's Social Blocking List», if I recall correctly ——— +d api.instagram.com # https://github.com/ryanbr/fanboy-adblock/issues/1261 +# https://github.com/ryanbr/fanboy-adblock/issues/1434 # ——— Caused by «Fanboy's Annoyances List» ——— # https://github.com/ryanbr/fanboy-adblock/issues/1243 -d ktg-content.cdn.prismic.io *(my.newsletter_popup.uid diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt index f3d025c94..bf6d68200 100644 --- a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt +++ b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt @@ -1,4 +1,4 @@ -! Version: 13November2020v1-Alpha +! Version: 18November2020v2-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 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index 5c9f531e4..3623222d4 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 131120201 +! Version: 181120202 ! 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 @@ -1291,6 +1291,7 @@ avvir.no###block-block-1 > p:nth-of-type(4) @@.isdownorblocked.com^ ! https://github.com/DandelionSprout/adfilt/issues/63#issuecomment-689373261 ||prod-adops-proxy.dnitv.net^$domain=dplay.no|dplay.dk +! https://github.com/uBlockOrigin/uAssets/issues/8230/ ! ——— Caused by «EasyPrivacy» ——— ! Attempting to fix a problem with voting online on Idol Norway @@||tv2.no/*/config/analytics.json$xmlhttprequest,~third-party @@ -1306,6 +1307,8 @@ krom.is#@#.share-container @@||api.instagram.com^$domain=samiteahter.org ! https://github.com/ryanbr/fanboy-adblock/issues/1261 @@||cookieinformation.com/*/*.js$domain=gulesider.no|degulesider.dk|krak.dk +! https://github.com/ryanbr/fanboy-adblock/issues/1434 +@@/rrssb.js$domain=partyking.no|partyking.dk ! ——— Caused by «Fanboy's Annoyances List» ——— ! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid @@ -1463,6 +1466,7 @@ resett.no##a[href*="pureorganic.no"] norgesavisen.no##.td-fix-index frihetskamp.net##a[href*="greenpilled.com"] frihetskamp.net##a[href*="nordenstil.no"] +politainment.no#?#.widget:-abp-contains(Annonse) ! https://github.com/ryanbr/fanboy-adblock/issues/1405 @@||politainment.no^*/cookieconsent.min.js diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 45f1f4ad3..ff49fbbac 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 131120201 +! Version: 181120202 ! 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 @@ -1300,6 +1300,7 @@ avvir.no###block-block-1 > p:nth-of-type(4) @@.isdownorblocked.com^ ! https://github.com/DandelionSprout/adfilt/issues/63#issuecomment-689373261 ||prod-adops-proxy.dnitv.net^$domain=dplay.no|dplay.dk +! https://github.com/uBlockOrigin/uAssets/issues/8230/ ! ——— Caused by «EasyPrivacy» ——— ! Attempting to fix a problem with voting online on Idol Norway @@||tv2.no/*/config/analytics.json$xmlhttprequest,~third-party @@ -1315,6 +1316,8 @@ krom.is#@#.share-container @@||api.instagram.com^$domain=samiteahter.org ! https://github.com/ryanbr/fanboy-adblock/issues/1261 @@||cookieinformation.com/*/*.js$domain=gulesider.no|degulesider.dk|krak.dk +! https://github.com/ryanbr/fanboy-adblock/issues/1434 +@@/rrssb.js$domain=partyking.no|partyking.dk ! ——— Caused by «Fanboy's Annoyances List» ——— ! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid @@ -1474,6 +1477,7 @@ resett.no#?#.code-block:-abp-contains(Reklame):not(:-abp-contains(butikk)) norgesavisen.no##.td-fix-index frihetskamp.net##a[href*="greenpilled.com"] frihetskamp.net##a[href*="nordenstil.no"] +politainment.no#?#.widget:-abp-contains(Annonse) ! https://github.com/ryanbr/fanboy-adblock/issues/1405 @@||politainment.no^*/cookieconsent.min.js diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 1e13225ad..68a94e7e7 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 13November2020v1 +! Version: 18November2020v2 ! 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 @@ -1359,6 +1359,8 @@ avvir.no###block-block-1 > p:nth-of-type(4) !#if env_chromium ||prod-adops-proxy.dnitv.net^$empty,domain=dplay.*|~dplay.it|~dplay.es !#endif +! https://github.com/uBlockOrigin/uAssets/issues/8230/ +hero-magazine.com###header:style(position: inherit !important) ! ——— Caused by «EasyPrivacy» ——— ! Attempting to fix a problem with voting online on Idol Norway @@||tv2.no/*/config/analytics.json$xmlhttprequest,~third-party @@ -1374,6 +1376,8 @@ krom.is#@#.share-container @@||api.instagram.com^$domain=samiteahter.org ! https://github.com/ryanbr/fanboy-adblock/issues/1261 @@||cookieinformation.com/*/*.js$domain=gulesider.no|degulesider.dk|krak.dk +! https://github.com/ryanbr/fanboy-adblock/issues/1434 +@@/rrssb.js$domain=partyking.* ! ——— Caused by «Fanboy's Annoyances List» ——— ! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid @@ -1547,6 +1551,7 @@ resett.no#?#.code-block:has-text(Reklame):not(:has-text(butikk)) norgesavisen.no##.td-fix-index frihetskamp.net##a[href*="greenpilled.com"] frihetskamp.net##a[href*="nordenstil.no"] +politainment.no#?#.widget:has-text(Annonse) ! https://github.com/ryanbr/fanboy-adblock/issues/1405 @@||politainment.no^*/cookieconsent.min.js diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index da87dfba0..7e6e4c68b 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 13November2020v1 +! Version: 18November2020v2 ! 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 @@ -1359,6 +1359,8 @@ avvir.no###block-block-1 > p:nth-of-type(4) !#if env_chromium ||prod-adops-proxy.dnitv.net^$empty,domain=dplay.*|~dplay.it|~dplay.es !#endif +! https://github.com/uBlockOrigin/uAssets/issues/8230/ +hero-magazine.com###header:style(position: inherit !important) ! ——— Caused by «EasyPrivacy» ——— ! Attempting to fix a problem with voting online on Idol Norway @@ -1374,6 +1376,8 @@ krom.is#@#.share-container @@||api.instagram.com^$domain=samiteahter.org ! https://github.com/ryanbr/fanboy-adblock/issues/1261 @@||cookieinformation.com/*/*.js$domain=gulesider.no|degulesider.dk|krak.dk +! https://github.com/ryanbr/fanboy-adblock/issues/1434 +@@/rrssb.js$domain=partyking.* ! ——— Caused by «Fanboy's Annoyances List» ——— ! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid @@ -1547,6 +1551,7 @@ resett.no#?#.code-block:-abp-contains(Reklame):not(:-abp-contains(butikk)) norgesavisen.no##.td-fix-index frihetskamp.net##a[href*="greenpilled.com"] frihetskamp.net##a[href*="nordenstil.no"] +politainment.no#?#.widget:-abp-contains(Annonse) ! https://github.com/ryanbr/fanboy-adblock/issues/1405 @@||politainment.no^*/cookieconsent.min.js diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 118285734..d3ab58e68 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 13November2020v1-Alpha +# Version: 18November2020v2-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 @@ -578,6 +578,7 @@ .dplay.it .dplay.es +{+block{https://github.com/uBlockOrigin/uAssets/issues/8230/}} # ——— Caused by «EasyPrivacy» ——— # Attempting to fix a problem with voting online on Idol Norway {-block} @@ -603,6 +604,9 @@ {+block{https://github.com/ryanbr/fanboy-adblock/issues/1261}} {-block} +{+block{https://github.com/ryanbr/fanboy-adblock/issues/1434}} +{-block} + # ——— Caused by «Fanboy's Annoyances List» ——— {+block{https://github.com/ryanbr/fanboy-adblock/issues/1243}} {+block} diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 66b74cd71..0e506a41f 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -733,6 +733,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"([a-z][=|])partyking\.\*", + r"\1partyking.no|partyking.dk", + line + ) + line = re.sub( r"\$ghide", r"$generichide", @@ -2508,6 +2514,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r"([a-z][=|])partyking\.\*", + r"\1partyking.no|partyking.dk", + line + ) + line = re.sub( r"\$ghide", r"$generichide",