From 26a59deee8d080a16da8f8c5523ad7da2fc3eaaf Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 13 Sep 2020 19:00:31 +0200 Subject: [PATCH] Add files via upload --- .../DandelionSproutsNorskeFiltre.tpl | 6 +++-- .../NordicFiltersABP-Inclusion.txt | 14 ++++++++++- .../NordicFiltersABP.txt | 19 ++++++++++++--- .../NordicFiltersAdGuard.txt | 19 ++++++++++++--- .../NordicFiltersBrave.txt | 6 +++-- .../NordicFiltersPrivacy.txt | 19 ++++++++++++--- .../NordicFiltersPrivoxy.action | 6 +++-- .../XYZPrepareFilters.py | 24 +++++++++---------- 8 files changed, 85 insertions(+), 28 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 78272860b..3961361e1 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 11September2020v1-Alpha +# Version: 13September2020v1-Alpha # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 @@ -339,6 +339,7 @@ _toppbanner_ # https://www.nordlys.no/egon-i-tromso-evakuert-tok-fyr-i-en-ovn/s/5-34-1326807/(10/07/2020) # advokatbladet.no; https://gardsdrift.no/maskiner-potet-fagdag/folksomt-under-potato-scandinavia/185668/(16/08/2020) # folkebladet.no (26 08 2020) +# kimbino.no, kimbino.dk (13 09 2020) # 🇳🇴: ——— Tomme skillebokser ——— # 🇩🇰: ——— Tomme adskillerbokser ——— # 🇳🇴🏞: ——— Tomme skiljeboksar ——— @@ -721,6 +722,7 @@ _toppbanner_ -d brigitteheilmann.dk -d storustovu.dk -d campingnews.dk +  # 🇳🇴: ——— 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) ——— @@ -736,7 +738,7 @@ _toppbanner_ # 🇳🇴 🇩🇰: ——— Anti-anti-reklameblokkering ——— # 🇮🇸: ——— And-and-auglýsingshindrun ——— # 🇬🇧: ——— Anti-anti-adblocking ——— -# Last updated: 06September2020v1-Extension +# Last updated: 13September2020v1-Extension -d aftenposten.no ads- -d dni-adops-proxy-prod-adopsmediaconverter.mercury.dnitv.com -d elderlyscissors.com diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index 0c533049e..f94271a25 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 110920201 +! Version: 130920201 ! 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: 12 hours @@ -995,6 +995,16 @@ gastrofun.dk##div[id^=block-steprectangle] gastromand.dk##.mfrek-widget fyens.dk##.adform__text thetravelinspector.no##.code-block +alletilbudsaviser.co.no##.banner +alletilbudsaviser.co.no##.banner-inline +alletilbudsaviser.co.no##td.visible-lg +tilbudmaskin.no##.rek-container +tilbudmaskin.no##.page-body .col-sm-6 +tilbudmaskin.no##.page-body .col-xs-12 +kimbino.no,kimbino.dk##.signad +tilbudsuken.no##.contentBanner +tiendeo.no###advertising_div +tiendeo.no##li[style^="order:"]:not([style*="order: "]) ||730.no/banner/*/sonymusic/$subdocument ||danishfamilysearch.dk/images/xp2^$image ||gaysir.no/rek/bb_inline$subdocument @@ -1118,6 +1128,8 @@ vafo.dk##.adform-flexblock ##.adnuntius-ad ! folkebladet.no (26/08/2020) ###viewport > #outer +! kimbino.no, kimbino.dk (13/09/2020) +##.intersect-ads-load ! 🇳🇴: ——— Tomme skillebokser ——— ! 🇩🇰: ——— Tomme adskillerbokser ——— diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 7ef13d8ae..e9b2c0389 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 110920201 +! Version: 130920201 ! 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: 12 hours @@ -1006,6 +1006,16 @@ gastrofun.dk##div[id^=block-steprectangle] gastromand.dk##.mfrek-widget fyens.dk##.adform__text thetravelinspector.no##.code-block +alletilbudsaviser.co.no##.banner +alletilbudsaviser.co.no##.banner-inline +alletilbudsaviser.co.no##td.visible-lg +tilbudmaskin.no##.rek-container +tilbudmaskin.no##.page-body .col-sm-6 +tilbudmaskin.no##.page-body .col-xs-12 +kimbino.no,kimbino.dk##.signad +tilbudsuken.no##.contentBanner +tiendeo.no###advertising_div +tiendeo.no##li[style^="order:"]:not([style*="order: "]) ||730.no/banner/*/sonymusic/$subdocument ||danishfamilysearch.dk/images/xp2^$image ||gaysir.no/rek/bb_inline$subdocument @@ -1129,6 +1139,8 @@ vafo.dk##.adform-flexblock ##.adnuntius-ad ! folkebladet.no (26/08/2020) ###viewport > #outer +! kimbino.no, kimbino.dk (13/09/2020) +##.intersect-ads-load ! 🇳🇴: ——— Tomme skillebokser ——— ! 🇩🇰: ——— Tomme adskillerbokser ——— @@ -1674,6 +1686,7 @@ trendsales.dk##.top__banner ||brigitteheilmann.dk^ ||storustovu.dk^ ||campingnews.dk^ +  ! 🇳🇴: ——— 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) ——— @@ -1713,7 +1726,7 @@ vg.no##div[data-test-tag=timestamp] + p + div::before ! 🇳🇴/🇩🇰: ——— Anti-anti-reklameblokkering ——— ! 🇮🇸: ——— And-and-auglýsingshindrun ——— ! 🇬🇧: ——— Anti-anti-adblocking ——— -! Last updated: 06September2020v1-Extension +! Last updated: 13September2020v1-Extension gratiskostplaner.dk#$#abort-on-property-write KillAdBlock csp.screen9.com#@#.adsbox tv2.no#$#abort-current-inline-script adblockDetector @@ -1733,4 +1746,4 @@ gamereactor.no,gamereactor.dk#$#abort-current-inline-script AdsReloadConfig ||googletagmanager.com/gtm.js^$domain=dk|bornholm.nu ! To be submitted to "AdGuard Warning Removal List" as well minmote.no##.adblock-info -aftenposten.no,abcnyheter.no,recordere.dk,gastrofun.dk,fyens.dk##div[style^="bottom: 0px;"][style*="width: 10"][style*="z-index: 2147"] +aftenposten.no,abcnyheter.no,recordere.dk,gastrofun.dk,fyens.dk,tilbudsuken.no##div[style^="bottom: 0px;"][style*="width: 10"][style*="z-index: 2147"] diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 60dbd1f24..aa13ca434 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 11September2020v1 +! Version: 13September2020v1 ! 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 @@ -1048,6 +1048,16 @@ gastrofun.dk##div[id^=block-steprectangle] gastromand.dk##.mfrek-widget fyens.dk##.adform__text thetravelinspector.no##.code-block +alletilbudsaviser.co.no##.banner +alletilbudsaviser.co.no##.banner-inline +alletilbudsaviser.co.no##td.visible-lg +tilbudmaskin.no##.rek-container +tilbudmaskin.no##.page-body .col-sm-6 +tilbudmaskin.no##.page-body .col-xs-12 +kimbino.*##.signad +tilbudsuken.no##.contentBanner +tiendeo.no###advertising_div +tiendeo.no##li[style^="order:"]:not([style*="order: "]) ||730.no/banner/*/sonymusic/$subdocument ||danishfamilysearch.dk/images/xp2^$image ||gaysir.no/rek/bb_inline$subdocument @@ -1182,6 +1192,8 @@ vafo.dk##.adform-flexblock ##.adnuntius-ad ! folkebladet.no (26/08/2020) ###viewport > #outer +! kimbino.no, kimbino.dk (13/09/2020) +##.intersect-ads-load ! 🇳🇴: ——— Tomme skillebokser ——— ! 🇩🇰: ——— Tomme adskillerbokser ——— @@ -1759,6 +1771,7 @@ trendsales.dk##.top__banner ||storustovu.dk^ !+ NOT_OPTIMIZED ||campingnews.dk^ +  ! 🇳🇴: ——— 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) ——— @@ -1802,7 +1815,7 @@ vg.no##div[data-test-tag=timestamp] + p + div:before ! 🇳🇴/🇩🇰: ——— Anti-anti-reklameblokkering ——— ! 🇮🇸: ——— And-and-auglýsingshindrun ——— ! 🇬🇧: ——— Anti-anti-adblocking ——— -! Last updated: 06September2020v1-Extension +! Last updated: 13September2020v1-Extension gratiskostplaner.dk##+js(aopw, KillAdBlock) csp.screen9.com#@#.adsbox dagensbyggeri.dk##+js(std, (), 2500) @@ -1835,4 +1848,4 @@ gamereactor.*$$script[onError="adblockEnabled()"] ||googletagmanager.com/gtm.js^$domain=dk|bornholm.nu ! To be submitted to "AdGuard Warning Removal List" as well minmote.no##.adblock-info -aftenposten.no,abcnyheter.no,recordere.dk,gastrofun.dk,fyens.dk##div[style^="bottom: 0px;"][style*="width: 10"][style*="z-index: 2147"] +aftenposten.no,abcnyheter.no,recordere.dk,gastrofun.dk,fyens.dk,tilbudsuken.no##div[style^="bottom: 0px;"][style*="width: 10"][style*="z-index: 2147"] diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt index 8cb9177a3..1967f79f9 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 11September2020v1-Beta +! Version: 13September2020v1-Beta ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Brave Browser) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Brave Browser) ! Expires: 12 hours @@ -384,6 +384,7 @@ contentMarketing$app=no.sol ! https://www.nordlys.no/egon-i-tromso-evakuert-tok-fyr-i-en-ovn/s/5-34-1326807 (10/07/2020) ! advokatbladet.no; https://gardsdrift.no/maskiner-potet-fagdag/folksomt-under-potato-scandinavia/185668 (16/08/2020) ! folkebladet.no (26/08/2020) +! kimbino.no, kimbino.dk (13/09/2020) ! 🇳🇴: ——— Distraherende bakgrunnsbilder ——— ||images.media.xxlsports.com/images/h90/h9d/9339713159198/bg.jpg$image ||platekompaniet.no/assets/img/background.png$image @@ -817,6 +818,7 @@ gamereactor.*##+js(ra, autoplay) ||brigitteheilmann.dk^ ||storustovu.dk^ ||campingnews.dk^ +  ! 🇳🇴: ——— 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) ——— @@ -832,7 +834,7 @@ gamereactor.*##+js(ra, autoplay) ! 🇳🇴/🇩🇰: ——— Anti-anti-reklameblokkering ——— ! 🇮🇸: ——— And-and-auglýsingshindrun ——— ! 🇬🇧: ——— Anti-anti-adblocking ——— -! Last updated: 06September2020v1-Extension +! Last updated: 13September2020v1-Extension gratiskostplaner.dk##+js(aopw, KillAdBlock) dagensbyggeri.dk##+js(std, (), 2500) eurosport.*##+js(aeld, contextmenu) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index fc52ebb8f..fd6ba2671 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 11September2020v1 +! Version: 13September2020v1 ! 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 @@ -1048,6 +1048,16 @@ gastrofun.dk##div[id^=block-steprectangle] gastromand.dk##.mfrek-widget fyens.dk##.adform__text thetravelinspector.no##.code-block +alletilbudsaviser.co.no##.banner +alletilbudsaviser.co.no##.banner-inline +alletilbudsaviser.co.no##td.visible-lg +tilbudmaskin.no##.rek-container +tilbudmaskin.no##.page-body .col-sm-6 +tilbudmaskin.no##.page-body .col-xs-12 +kimbino.*##.signad +tilbudsuken.no##.contentBanner +tiendeo.no###advertising_div +tiendeo.no##li[style^="order:"]:not([style*="order: "]) ||730.no/banner/*/sonymusic/$subdocument ||danishfamilysearch.dk/images/xp2^$image ||gaysir.no/rek/bb_inline$subdocument @@ -1182,6 +1192,8 @@ vafo.dk##.adform-flexblock ##.adnuntius-ad ! folkebladet.no (26/08/2020) ###viewport > #outer +! kimbino.no, kimbino.dk (13/09/2020) +##.intersect-ads-load ! 🇳🇴: ——— Tomme skillebokser ——— ! 🇩🇰: ——— Tomme adskillerbokser ——— @@ -1759,6 +1771,7 @@ trendsales.dk##.top__banner ||storustovu.dk^ !+ NOT_OPTIMIZED ||campingnews.dk^ +  ! 🇳🇴: ——— 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) ——— @@ -1802,7 +1815,7 @@ vg.no##div[data-test-tag=timestamp] + p + div:before ! 🇳🇴/🇩🇰: ——— Anti-anti-reklameblokkering ——— ! 🇮🇸: ——— And-and-auglýsingshindrun ——— ! 🇬🇧: ——— Anti-anti-adblocking ——— -! Last updated: 06September2020v1-Extension +! Last updated: 13September2020v1-Extension gratiskostplaner.dk##+js(aopw, KillAdBlock) csp.screen9.com#@#.adsbox dagensbyggeri.dk##+js(std, (), 2500) @@ -1835,4 +1848,4 @@ gamereactor.*##^script[onError="adblockEnabled()"] ||googletagmanager.com/gtm.js^$domain=dk|bornholm.nu ! To be submitted to "AdGuard Warning Removal List" as well minmote.no##.adblock-info -aftenposten.no,abcnyheter.no,recordere.dk,gastrofun.dk,fyens.dk##div[style^="bottom: 0px;"][style*="width: 10"][style*="z-index: 2147"] +aftenposten.no,abcnyheter.no,recordere.dk,gastrofun.dk,fyens.dk,tilbudsuken.no##div[style^="bottom: 0px;"][style*="width: 10"][style*="z-index: 2147"] diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 41f6872b9..9a0e1c879 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 11September2020v1-Alpha +# Version: 13September2020v1-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 @@ -478,6 +478,7 @@ {+block{https://www.nordlys.no/egon-i-tromso-evakuert-tok-fyr-i-en-ovn/s/5-34-1326807 (10/07/2020)}} # advokatbladet.no; https://gardsdrift.no/maskiner-potet-fagdag/folksomt-under-potato-scandinavia/185668 (16/08/2020) # folkebladet.no (26/08/2020) +# kimbino.no, kimbino.dk (13/09/2020) # 🇳🇴: ——— Tomme skillebokser ——— # 🇩🇰: ——— Tomme adskillerbokser ——— # 🇳🇴🏞: ——— Tomme skiljeboksar ——— @@ -944,6 +945,7 @@ .brigitteheilmann.dk .storustovu.dk .campingnews.dk +  # 🇳🇴: ——— 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) ——— @@ -960,7 +962,7 @@ # 🇳🇴/🇩🇰: ——— Anti-anti-reklameblokkering ——— # 🇮🇸: ——— And-and-auglýsingshindrun ——— {+block{🇬🇧: ——— Anti-anti-adblocking ———}} -# Last updated: 06September2020v1-Extension +# Last updated: 13September2020v1-Extension {+block} .aftenposten.no/seksjon/dist/ads- {+block} diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 22651e6d9..c46a74d2e 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -295,12 +295,6 @@ def prepare_abp(lines) -> str: line ) - line = re.sub( - r"eurogamer\.\*([#,])", - r"eurogamer.dk\1", - line - ) - line = re.sub( "ticketmaster.\*#", "ticketmaster.no,ticketmaster.dk#", @@ -355,6 +349,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + "kimbino.\*#", + "kimbino.no,kimbino.dk#", + line + ) + line = re.sub( "^,", "^$", @@ -1737,12 +1737,6 @@ def prepare_abp(lines) -> str: line ) - line = re.sub( - r"eurogamer\.\*([#,])", - r"eurogamer.dk\1", - line - ) - line = re.sub( "ticketmaster.\*#", "ticketmaster.no,ticketmaster.dk#", @@ -1797,6 +1791,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + "kimbino.\*#", + "kimbino.no,kimbino.dk#", + line + ) + line = re.sub( "^,", "^$",