From 726f2e677aef6e1cdaa5ee162bd2c03cf5916001 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 17 Dec 2019 01:21:12 +0100 Subject: [PATCH] I finally took the hint for real this time, part 2/2 As per https://github.com/AdguardTeam/AdguardFilters/issues/46086. --- .../DandelionSproutsNorskeFiltre.tpl | 10 ++++++--- .../NordicFiltersABP.txt | 21 ++++++++++++++----- .../NordicFiltersAdGuard.txt | 21 ++++++++++++++----- .../NordicFiltersPrivacy.txt | 21 ++++++++++++++----- .../NordicFiltersPrivoxy.action | 11 +++++++--- 5 files changed, 63 insertions(+), 21 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 453dce62d..1a52a412c 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 10December2019v2-Beta +# Version: 17December2019v1-Beta # Title: πŸ”οΈ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 @@ -136,7 +136,7 @@ contentMarketing # dv.is # dinside.no, seher.no # bt.no -# https://www.latterkula.no/se-streamerne-som-vinner-store-gevinster-mens-de-streamer-live/ +# latterkula.no se-streamerne-som-vinner-store-gevinster-mens-de-streamer-live # www.latterkula.no artikler # www.mbl.is frettir # adressa.no @@ -151,6 +151,8 @@ contentMarketing # ba.no # https://github.com/DandelionSprout/adfilt/pull/53 -d services.api.no bazaar +# aftenbladet.no +# avisalofoten.no # πŸ‡³πŸ‡΄: β€”β€”β€” Tomme skillebokser β€”β€”β€” # πŸ‡©πŸ‡°: β€”β€”β€” Tomme adskillerbokser β€”β€”β€” # πŸ‡¬πŸ‡§: β€”β€”β€” Empty divider spaces β€”β€”β€” @@ -180,8 +182,10 @@ contentMarketing +d mparticle.com # πŸ‡©πŸ‡°: Fikser knΓ¦kking af videoer pΓ₯ TV 2 nΓ₯r "EasyList" bliver brugt # πŸ‡¬πŸ‡§: Unbreaks videos at TV2 Denmark when using "EasyList" -# https://github.com/ryanbr/fanboy-adblock/issues/1243/ +# https://github.com/ryanbr/fanboy-adblock/issues/1243 -d ktg-content.cdn.prismic.io *(my.newsletter_popup.uid +# https://github.com/ryanbr/fanboy-adblock/issues/1261 ++d cookieinformation.com # πŸ‡³πŸ‡΄ πŸ‡©πŸ‡°: β€”β€”β€” Anti-anti-reklameblokkering β€”β€”β€” # πŸ‡¬πŸ‡§: β€”β€”β€” Anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273/were/to/specifically/mention/such/entries as a reason to be denied EasyList affiliation or native ABP inclusion β€”β€”β€” +d bondebladet.screen9.tv diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 829ab8f4b..3f9965578 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 101220192 +! Version: 171220191 ! 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 @@ -537,7 +537,6 @@ yrkesbil.no###side > div:nth-of-type(1) ||bilnorge.no/gifs/*emty.gif$image ||gaysir.no/rek/bb_inline$subdocument ||static.vg.no/css/admark_top.gif -~raymond.cc,~bolha.com,~wiwo.de,~game.co.uk,~farnell.com##.ad:not(html):not(a) gamer.no##.aaa-placeholder google.no,google.dk,google.is###cnsi ~ [jsaction*=dismiss] 180.no##.ai-top-ad-outer @@ -558,6 +557,9 @@ dagbladet.no##[class^="AdPrefix-"] tunnelsyn.no#?#.widget_media_image:-abp-contains(/^ANNONSE/) tv2.no##.lp-r > div tidssonen.no##.widget_custom_html +finn.no#?#div[class^=ads__unit]:-abp-has(:scope > div[id^=ad-stream__google]) +mbl.is#?#.col-sm-6.col-12:-abp-has(.augl):not(:-abp-has(.fluid)) +gulesider.no,degulesider.dk,krak.dk##.e-banner ! β€” β€” β€” β€” β€” @@ -597,7 +599,7 @@ vafo.dk##.adform-flexblock ##.adunit-wrapper ! bt.no ##.premium-spot -! https://www.latterkula.no/se-streamerne-som-vinner-store-gevinster-mens-de-streamer-live/ +! latterkula.no/se-streamerne-som-vinner-store-gevinster-mens-de-streamer-live/ ##.annonser ! www.latterkula.no/artikler/ ##.mh-loop-ad @@ -623,11 +625,16 @@ vafo.dk##.adform-flexblock ##.vc_empty_space ! demokraten.no, avisa-hordaland.no, blv.no, gat.no, lp.no, osogfusa.no, raumnes.no, setesdolen.no, sunnhordland.no, vaksdalposten.no, vtb.no ##.banners.post_sticky +##div[data-adtext] ! ba.no ! https://github.com/DandelionSprout/adfilt/pull/53 ##bazaar-ad ##[id^=art-bazaarAd] ||services.api.no/api/bazaar^$third-party +! aftenbladet.no +##.ad[data-config-name] +! avisalofoten.no +##.ad.text-center ! πŸ‡³πŸ‡΄: β€”β€”β€” Tomme skillebokser β€”β€”β€” ! πŸ‡©πŸ‡°: β€”β€”β€” Tomme adskillerbokser β€”β€”β€” @@ -674,7 +681,7 @@ krom.is#@#.share-container @@_prebid_$domain=seher.no ! πŸ‡³πŸ‡΄: Solcellespesialisten, innlastingsproblem ! πŸ‡¬πŸ‡§: Solcellespesialisten, loading issue -||wo.tc +||wo.tc^ ! πŸ‡³πŸ‡΄: FΓ₯r Dplay sin pΓ₯loggingsside til Γ₯ vises riktig nΓ₯r Β«EasyPrivacyΒ» blir brukt ! πŸ‡¬πŸ‡§: Makes Dplay's login page show up properly when using "EasyPrivacy" @@||mparticle.com$script,domain=auth.dplay.no|auth.dplay.dk @@ -682,8 +689,10 @@ krom.is#@#.share-container ! πŸ‡©πŸ‡°: Fikser knΓ¦kking af videoer pΓ₯ TV 2 nΓ₯r "EasyList" bliver brugt ! πŸ‡¬πŸ‡§: Unbreaks videos at TV2 Denmark when using "EasyList" @@||imasdk.googleapis.com/js/sdkloader/ima3.js$script,domain=tv2.dk -! https://github.com/ryanbr/fanboy-adblock/issues/1243/ +! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid +! https://github.com/ryanbr/fanboy-adblock/issues/1261 +@@||cookieinformation.com^$third-party,domain=kart.gulesider.no|map.krak.dk|kort.degulesider.dk|kartor.eniro.se ! πŸ‡³πŸ‡΄/πŸ‡©πŸ‡°: β€”β€”β€” Anti-anti-reklameblokkering β€”β€”β€” ! πŸ‡¬πŸ‡§: β€”β€”β€” Anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion β€”β€”β€” @@ -707,6 +716,8 @@ minmote.no,godt.no##.adblock-info ||elderlyscissors.com^ ||imasdk.googleapis.com/pal/sdkloader/pal.js$script,rewrite=abp-resource:blank-js,domain=dplay.dk|dplay.no ||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,~third-party + + @@/js/ads.js$~third-party,domain=tvkampen.com|tvsporten.dk @@||www.tv2.no/s/js/ads.js$script,~third-party diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index a58528d56..69399e86e 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 10December2019v2 +! Version: 17December2019v1 ! 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 @@ -555,7 +555,6 @@ yrkesbil.no###side > div:nth-of-type(1) ||bilnorge.no/gifs/*emty.gif$image ||gaysir.no/rek/bb_inline$subdocument ||static.vg.no/css/admark_top.gif -~raymond.cc,~bolha.com,~wiwo.de,~game.co.uk,~farnell.com##.ad:not(html):not(a) gamer.no##.aaa-placeholder google.no,google.dk,google.is###cnsi ~ [jsaction*=dismiss] 180.no##.ai-top-ad-outer @@ -577,6 +576,9 @@ dagbladet.no##[class^="AdPrefix-"] tunnelsyn.no#?#.widget_media_image:-abp-contains(/^ANNONSE/) tv2.no##.lp-r > div tidssonen.no##.widget_custom_html +finn.no#?#div[class^=ads__unit]:-abp-has(:scope > div[id^=ad-stream__google]) +mbl.is#?#.col-sm-6.col-12:-abp-has(.augl):not(:-abp-has(.fluid)) +gulesider.no,degulesider.dk,krak.dk##.e-banner ! β€” β€” β€” β€” β€” !#if !env_mobile seher.no##.content-marketing-ribbon:style(margin-top: 20px !important) @@ -617,7 +619,7 @@ vafo.dk##.adform-flexblock ##.adunit-wrapper ! bt.no ##.premium-spot -! https://www.latterkula.no/se-streamerne-som-vinner-store-gevinster-mens-de-streamer-live/ +! latterkula.no/se-streamerne-som-vinner-store-gevinster-mens-de-streamer-live/ ##.annonser ! www.latterkula.no/artikler/ ##.mh-loop-ad @@ -643,11 +645,16 @@ vafo.dk##.adform-flexblock ##.vc_empty_space ! demokraten.no, avisa-hordaland.no, blv.no, gat.no, lp.no, osogfusa.no, raumnes.no, setesdolen.no, sunnhordland.no, vaksdalposten.no, vtb.no ##.banners.post_sticky +##div[data-adtext] ! ba.no ! https://github.com/DandelionSprout/adfilt/pull/53 ##bazaar-ad ##[id^=art-bazaarAd] ||services.api.no/api/bazaar^$third-party +! aftenbladet.no +##.ad[data-config-name] +! avisalofoten.no +##.ad.text-center ! πŸ‡³πŸ‡΄: β€”β€”β€” Tomme skillebokser β€”β€”β€” ! πŸ‡©πŸ‡°: β€”β€”β€” Tomme adskillerbokser β€”β€”β€” @@ -695,7 +702,7 @@ krom.is#@#.share-container @@_prebid_$domain=seher.no ! πŸ‡³πŸ‡΄: Solcellespesialisten, innlastingsproblem ! πŸ‡¬πŸ‡§: Solcellespesialisten, loading issue -||wo.tc +||wo.tc^ ! πŸ‡³πŸ‡΄: FΓ₯r Dplay sin pΓ₯loggingsside til Γ₯ vises riktig nΓ₯r Β«EasyPrivacyΒ» blir brukt ! πŸ‡¬πŸ‡§: Makes Dplay's login page show up properly when using "EasyPrivacy" @@||mparticle.com$script,domain=auth.dplay.no|auth.dplay.dk @@ -703,8 +710,10 @@ krom.is#@#.share-container ! πŸ‡©πŸ‡°: Fikser knΓ¦kking af videoer pΓ₯ TV 2 nΓ₯r "EasyList" bliver brugt ! πŸ‡¬πŸ‡§: Unbreaks videos at TV2 Denmark when using "EasyList" @@||imasdk.googleapis.com/js/sdkloader/ima3.js$script,domain=tv2.dk -! https://github.com/ryanbr/fanboy-adblock/issues/1243/ +! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid +! https://github.com/ryanbr/fanboy-adblock/issues/1261 +@@||cookieinformation.com^$third-party,domain=kart.gulesider.no|map.krak.dk|kort.degulesider.dk|kartor.eniro.se ! πŸ‡³πŸ‡΄/πŸ‡©πŸ‡°: β€”β€”β€” Anti-anti-reklameblokkering β€”β€”β€” ! πŸ‡¬πŸ‡§: β€”β€”β€” Anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion β€”β€”β€” @@ -735,7 +744,9 @@ vg.no##+js(addEventListener-defuser.js, load, concat) ||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,~third-party viafree.no,viafree.dk##+js(addEventListener-defuser.js, /^ad/) viafree.no,viafree.dk##+js(addEventListener-defuser.js, /^media/) +!#if !env_firefox viafree.no,viafree.dk##+js(setTimeout-defuser.js, r, 0) +!#endif viafree.no,viafree.dk##.avodp.pause-ad-showing .vjs-progress-control, .avodp.ad-playing .vjs-progress-control:style(display: initial !important;) @@/js/ads.js$~third-party,domain=tvkampen.com|tvsporten.dk @@||www.tv2.no/s/js/ads.js$script,~third-party diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index e9bee1f9d..692cd9df5 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 10December2019v2 +! Version: 17December2019v1 ! 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 @@ -555,7 +555,6 @@ yrkesbil.no###side > div:nth-of-type(1) ||bilnorge.no/gifs/*emty.gif$image ||gaysir.no/rek/bb_inline$subdocument ||static.vg.no/css/admark_top.gif -~raymond.cc,~bolha.com,~wiwo.de,~game.co.uk,~farnell.com##.ad:not(html):not(a) gamer.no##.aaa-placeholder google.*###cnsi ~ [jsaction*=dismiss] 180.no##.ai-top-ad-outer @@ -577,6 +576,9 @@ dagbladet.no##[class^="AdPrefix-"] tunnelsyn.no#?#.widget_media_image:-abp-contains(/^ANNONSE/) tv2.no##.lp-r > div tidssonen.no##.widget_custom_html +finn.no#?#div[class^=ads__unit]:-abp-has(:scope > div[id^=ad-stream__google]) +mbl.is#?#.col-sm-6.col-12:-abp-has(.augl):not(:-abp-has(.fluid)) +gulesider.no,degulesider.dk,krak.dk##.e-banner ! β€” β€” β€” β€” β€” !#if !env_mobile seher.no##.content-marketing-ribbon:style(margin-top: 20px !important) @@ -617,7 +619,7 @@ vafo.dk##.adform-flexblock ##.adunit-wrapper ! bt.no ##.premium-spot -! https://www.latterkula.no/se-streamerne-som-vinner-store-gevinster-mens-de-streamer-live/ +! latterkula.no/se-streamerne-som-vinner-store-gevinster-mens-de-streamer-live/ ##.annonser ! www.latterkula.no/artikler/ ##.mh-loop-ad @@ -643,11 +645,16 @@ vafo.dk##.adform-flexblock ##.vc_empty_space ! demokraten.no, avisa-hordaland.no, blv.no, gat.no, lp.no, osogfusa.no, raumnes.no, setesdolen.no, sunnhordland.no, vaksdalposten.no, vtb.no ##.banners.post_sticky +##div[data-adtext] ! ba.no ! https://github.com/DandelionSprout/adfilt/pull/53 ##bazaar-ad ##[id^=art-bazaarAd] ||services.api.no/api/bazaar^$3p +! aftenbladet.no +##.ad[data-config-name] +! avisalofoten.no +##.ad.text-center ! πŸ‡³πŸ‡΄: β€”β€”β€” Tomme skillebokser β€”β€”β€” ! πŸ‡©πŸ‡°: β€”β€”β€” Tomme adskillerbokser β€”β€”β€” @@ -695,7 +702,7 @@ krom.is#@#.share-container ! πŸ‡³πŸ‡΄: Solcellespesialisten, innlastingsproblem ! πŸ‡¬πŸ‡§: Solcellespesialisten, loading issue -||wo.tc +||wo.tc^ ! πŸ‡³πŸ‡΄: FΓ₯r Dplay sin pΓ₯loggingsside til Γ₯ vises riktig nΓ₯r Β«EasyPrivacyΒ» blir brukt ! πŸ‡¬πŸ‡§: Makes Dplay's login page show up properly when using "EasyPrivacy" @@ -703,8 +710,10 @@ krom.is#@#.share-container ! πŸ‡©πŸ‡°: Fikser knΓ¦kking af videoer pΓ₯ TV 2 nΓ₯r "EasyList" bliver brugt ! πŸ‡¬πŸ‡§: Unbreaks videos at TV2 Denmark when using "EasyList" -! https://github.com/ryanbr/fanboy-adblock/issues/1243/ +! https://github.com/ryanbr/fanboy-adblock/issues/1243 ||ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid +! https://github.com/ryanbr/fanboy-adblock/issues/1261 +@@||cookieinformation.com^$third-party,domain=kart.gulesider.no|map.krak.dk|kort.degulesider.dk|kartor.eniro.se ! πŸ‡³πŸ‡΄/πŸ‡©πŸ‡°: β€”β€”β€” Anti-anti-reklameblokkering β€”β€”β€” ! πŸ‡¬πŸ‡§: β€”β€”β€” Anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion β€”β€”β€” @@ -735,7 +744,9 @@ vg.no##+js(addEventListener-defuser.js, load, concat) ||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,1p viafree.*##+js(addEventListener-defuser.js, /^ad/) viafree.*##+js(addEventListener-defuser.js, /^media/) +!#if !env_firefox viafree.*##+js(setTimeout-defuser.js, r, 0) +!#endif viafree.*##.avodp.pause-ad-showing .vjs-progress-control, .avodp.ad-playing .vjs-progress-control:style(display: initial !important;) @@/js/ads.js$1p,domain=tvkampen.com|tvsporten.dk @@||www.tv2.no/s/js/ads.js$script,1p diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index b1c4ca81d..c0773e359 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 10December2019v2-Alpha +# Version: 17December2019v1-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 @@ -160,7 +160,7 @@ contentMarketing # dv.is # dinside.no, seher.no # bt.no -# https://www.latterkula.no/se-streamerne-som-vinner-store-gevinster-mens-de-streamer-live/ +# latterkula.no/se-streamerne-som-vinner-store-gevinster-mens-de-streamer-live/ # www.latterkula.no/artikler/ # www.mbl.is/frettir/ # adressa.no @@ -175,6 +175,8 @@ contentMarketing # ba.no # https://github.com/DandelionSprout/adfilt/pull/53 .services.api.no/api/bazaar +# aftenbladet.no +# avisalofoten.no # # πŸ‡³πŸ‡΄: β€”β€”β€” Tomme skillebokser β€”β€”β€” # πŸ‡©πŸ‡°: β€”β€”β€” Tomme adskillerbokser β€”β€”β€” @@ -204,8 +206,9 @@ contentMarketing {+block{Makes Dplay's login page show up properly when using "EasyPrivacy"}} # πŸ‡©πŸ‡°: Fikser knΓ¦kking af videoer pΓ₯ TV 2 nΓ₯r "EasyList" bliver brugt {+block{Unbreaks videos at TV2 Denmark when using "EasyList"}} -# https://github.com/ryanbr/fanboy-adblock/issues/1243/ +# https://github.com/ryanbr/fanboy-adblock/issues/1243 .ktg-content.cdn.prismic.io/api/*/documents/*(my.newsletter_popup.uid +# https://github.com/ryanbr/fanboy-adblock/issues/1261 # # πŸ‡³πŸ‡΄/πŸ‡©πŸ‡°: β€”β€”β€” Anti-anti-reklameblokkering β€”β€”β€” {+block{β€”β€”β€” Anti-anti-adblocking, in the event that https://forums.lanik.us/viewtopic.php?f=23&t=42273 were to specifically mention such entries as a reason to be denied EasyList affiliation or native ABP inclusion β€”β€”β€”}} @@ -216,6 +219,8 @@ contentMarketing # # # +# +# # πŸ‡³πŸ‡΄: β€”β€”β€” Vindusviskere for betalte artikler (sΓ₯nn at de nederste linjene i en forhΓ₯ndsvisning ikke toner ut) β€”β€”β€” # Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppfΓΈringene. # πŸ‡©πŸ‡°: β€”β€”β€” Vinduesviskere for betalte artikler (sΓ₯ de sidste par linjer i en forhΓ₯ndsvisning ikke falder ud) β€”β€”β€”