diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index d94a96e23..61af52121 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 02July2020v1-Alpha +# Version: 02July2020v2-Alpha # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Eyeo.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Eyeo.txt index 22ce02259..b7f166c7a 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Eyeo.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Eyeo.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 020720201 +! Version: 020720202 ! Title: 🏔️ Dandelion Sprouts vestnordiske filtre for ryddigere nettsider (for Adblock Plus - Møter Eyeo sine regler) ! Translated title: Dandelion Sprout's West Nordic filters for tidier websites (for Adblock Plus with Eyeo compliance) ! Expires: 12 hours @@ -725,6 +725,7 @@ pressfire.no##.section-10 fvn.no##.brandboard-container united.no#?#.fl-visible-desktop-medium:-abp-has(div[class^=ann-forside]:-abp-contains(/Annonse:/)) filmweb.no##.mpu +byas.no##.vertical-x1-ad > .column--big */gifs/*emty.gif^$domain=yrkesbil.no|bilnorge.no ||yrkesbil.no/gifs/1pix.gif^ ||730.no/banner/*/sonymusic/$subdocument diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 2cd2d8b27..6141dd93a 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 020720201 +! Version: 020720202 ! 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 @@ -725,6 +725,7 @@ pressfire.no##.section-10 fvn.no##.brandboard-container united.no#?#.fl-visible-desktop-medium:-abp-has(div[class^=ann-forside]:-abp-contains(/Annonse:/)) filmweb.no##.mpu +byas.no##.vertical-x1-ad > .column--big */gifs/*emty.gif^$domain=yrkesbil.no|bilnorge.no ||yrkesbil.no/gifs/1pix.gif^ ||730.no/banner/*/sonymusic/$subdocument diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 9d586dde6..6a663230f 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 02July2020v1 +! Version: 02July2020v2 ! 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 @@ -751,6 +751,7 @@ pressfire.no##.section-10 fvn.no##.brandboard-container united.no#?#.fl-visible-desktop-medium:has(div[class^=ann-forside]:has-text(/Annonse:/)) filmweb.no##.mpu +byas.no##.vertical-x1-ad > .column--big */gifs/*emty.gif^$domain=yrkesbil.no|bilnorge.no ||yrkesbil.no/gifs/1pix.gif^ ||730.no/banner/*/sonymusic/$subdocument diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt index 256a74e99..2dec008f9 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 02July2020v1-Alpha +! Version: 02July2020v2-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 @@ -16,11 +16,12 @@ ! 🇬🇱: ——— Pilerisaarniarlugit ——— ! ❄: ——— Reklámaid ——— ! 🇬🇧: ——— Advertisements ——— -contentMarketing$xmlhttprequest,domain=sol.no +contentMarketing$xhr,domain=sol.no |blob:https://www.veier24.no/$image ||1819.is/infosmall/$image ||3.248.18.175^ -||acdn.adnxs.com/ast/ast.js$script,domain=vg.no +||acdn.adnxs.com/ast/ast.js$script,important,domain=vg.no +||acdn.adnxs.com/ast/ast.js$script,redirect=noopjs,important,domain=vgtv.no ||ad.*.no^ ||ad.no.doubleclick.net^ ||ad1.*.dk^ @@ -46,14 +47,15 @@ contentMarketing$xmlhttprequest,domain=sol.no ||banner.landbrugsavisen.dk/reklame.aspx$subdocument ||boligkanalen-maestro-new.azurewebsites.net$image ||bornholm.nu/nonsec/banner$image -||brandstudio.inventory.schibsted.io$subdocument,third-party -||cdn.rikstoto.no/expert/GameShop^$subdocument,third-party,domain=~tipster.no -||cdnboligkanalen.azureedge.net^$third-party -||cluster.chart.dk$third-party +||brandstudio.inventory.schibsted.io$subdocument,3p +||cdn.rikstoto.no/expert/GameShop^$subdocument,3p,domain=~tipster.no +||cdnboligkanalen.azureedge.net^$3p +||cluster.chart.dk$3p +||damoh.vgtv.no/hic_qos$script,redirect=noopjs,domain=vg.no ||deiligejenter.no$image,domain=nakenprat.com -||delivered-by-madington.com^$third-party +||delivered-by-madington.com^$3p ||dnitv.com^$media,domain=dplay.dk -||dotbanner.dk$third-party +||dotbanner.dk$3p ||dust2.dk/img/banners/*$image ||easy-ad.no^ ||easy-ads.dk^ @@ -65,14 +67,14 @@ contentMarketing$xmlhttprequest,domain=sol.no ||finn.no$subdocument,domain=bt.no ||fotbolti.net/banners^ ||gratisxxx.no$image,domain=nakenprat.com -||heartbeat.airserve.net^$third-party +||heartbeat.airserve.net^$3p ||helios.*.no^ ||isweb.no^$subdocument ||karfan.is/*-470x130*.jpg^ ||karfan.is/*300x250.jpg^ ||langrenn.com/getbanner.php/*/getfile.php/$image -||matriell.dm-storage.no$image,third-party -||media.sonymusic.no/marketing/*.html$subdocument,third-party +||matriell.dm-storage.no$image,3p +||media.sonymusic.no/marketing/*.html$subdocument,3p ||myad.no^ ||nettklikk.no^ ||norskenettsider.no/images/ageras-banner.jpg @@ -80,32 +82,32 @@ contentMarketing$xmlhttprequest,domain=sol.no ||nvnytt.no/images/*annonse-$image ||ad.primetime.net^ ||rett24.no/*/_/attachment/inline/$image -||samfilm.codelab.is^$third-party +||samfilm.codelab.is^$3p ||samler.no/images/banners/$image -||sannsyn.com^$third-party -||soda.is$third-party -||ssl.p.jwpcdn.com^*/freewheel.js$script,domain=eurosport.no|eurosport.dk -||ssl.p.jwpcdn.com^*/jwpsrv.js$script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk|vg.no -||ssl.p.jwpcdn.com^*/sharing.js$script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk -||ssl.p.jwpcdn.com^*/vast.js$script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk|vg.no -||static.airserve.net^$third-party -||tankeogteknikk.no^$third-party +||sannsyn.com^$3p +||soda.is$3p +||ssl.p.jwpcdn.com^*/freewheel.js$important,script,domain=eurosport.no|eurosport.dk +||ssl.p.jwpcdn.com^*/jwpsrv.js$important,script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk|vg.no +||ssl.p.jwpcdn.com^*/sharing.js$important,script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk +||ssl.p.jwpcdn.com^*/vast.js$important,script,domain=eurosport.no|eurosport.dk|gamereactor.no|gamereactor.dk|vg.no +||static.airserve.net^$3p +||tankeogteknikk.no^$3p ||track.adform.net$domain=118.dk ||track.adform.net/Banners/ -||tracking-genesisaffiliates.com$image,third-party +||tracking-genesisaffiliates.com$image,3p ||tunnelsyn1.files.wordpress.com/*/sotra-trelast-isolasjon$image ||tvkampen.com/media/*/banner*$image ||tvkampen.com/media/partners/unibet-lo$image ||utrop.no/wp-content/uploads/*.gif$image ||utrop.no/wp-content/uploads/*/Banner_utrop$image -||vevlysingar.fo$subdocument,third-party +||vevlysingar.fo$subdocument,3p ||viasport-assets.mtg-api.com/*/prod/comScore-*.js$script ||vikari.is/skjol/frjalsi-lif*.png$image ||webclick.no^ ||youtube.com/embed/*&origin=https%3A%2F%2Fwww.feltet.dk&widgetid=1$subdocument -||vevlysingar.*.com^$third-party +||vevlysingar.*.com^$3p ||melkoghonning.no/wp-content/uploads/*_Banner_$image -||deals.innocode.no/api^$third-party,subdocument +||deals.innocode.no/api^$3p,subdocument -bazaar-$script,domain=nettavisen.no .dk/ad/ .dk/ads/ @@ -157,66 +159,147 @@ contentMarketing$xmlhttprequest,domain=sol.no ! — — — — — ! 🇳🇴: Generelle oppføringer med kilder ! 🇬🇧: Generic entries that have sources +!#if !ext_ublock +@@||vgtv.no$generichide ||adnxs.com^$domain=vgtv.no +!#endif +! framtia.no, sovesten.no, arendalstidende.no, bil24.no, 730.no, frettatiminn.is, opp.no, melkoghonning.no +! https://www.totensblad.no/2019/nyheter/forsynte-seg-gradig-av-medaljene-i-nm/ +! arendalstidende.no +! https://www.langrenn.com/cppage.6250314-1743.html +! https://sport.tv2.dk/formel-1/2019-10-15-jeg-viste-alle-hvad-man-ikke-skal-goere-siger-magnussen @@||tv2a.dk/js/lazysizes +! https://nyheder.tv2.dk/samfund/2019-11-04-vold-fanget-paa-video-gerningsmand-fik-lov-at-gaa-fri-i-tre-aar @@||tv2a.dk/js/Video @@||tv2a.dk/js/tv2player +! bobilverden.no /annonse-$image -||finn.no/distribution-carousel?$object,third-party +! norskenettsider.no, sva.no +! https://www.diskusjon.no/topic/1760306-ogs%C3%A5-onecall-lanserer-rollover-av-data/ +! tv2.no +! bt.no +||finn.no/distribution-carousel?$object,3p +! https://kulturplot.no/synspunkt/2020/hva-er-malet-for-kultur-i-regionreformen +! https://www.dagbladet.no/mat/spaghetti--la-capri-italienerne-liker-sausen-men-n-ting-far-slakt---dette-er-ikke-pasta/67659821 ! Copied over from the New AdAway list -||admob.no^$third-party -||admob.dk^$third-party -||api.advista.no^$third-party +||admob.no^$3p +||admob.dk^$3p +||api.advista.no^$3p +! bilasolur.is (03/05/2020) /lykill_banner$image ||bilasolur.is/banners^ +! portal.fo (09/05/2020) +! https://portal.fo/dagur-28901/tad-figurativa-og-abstrakta-landslagid.grein (09/05/2020) ! Bet365 widget triggered for Norwegian audiences only +! jyllands-posten.dk +! buildingsupply.no, maskinregisteret.no, metalsupply.no, plastforum.no ||f.nordiskemedier.dk/*.gif^$image ||f.nordiskemedier.dk/2*.jpg^$image @@||f.nordiskemedier.dk/2*_*.jpg^$image +! metalsupply.no ||f.nordiskemedier.dk/2*.png^$image @@||f.nordiskemedier.dk/2*_*.png^$image +! building-supply.dk ||f.nordiskemedier.dk/banner^ -l%C3%BDsing-$image,domain=news.fo ! — — — — — ! 🇳🇴: Generelle oppføringer med kilder ! 🇬🇧: Generic entries that have sources +!#if !env_mobile +!#endif +! sol.no +! www.qxl.no +! www.vtb.no +! vafo.dk +! reelligestilling.dk +! www.rbnett.no +! www.op.no +! journalisten.dk +! www.altomfotball.no +! dv.is +! dinside.no, seher.no +! bt.no +! latterkula.no/se-streamerne-som-vinner-store-gevinster-mens-de-streamer-live/ +! www.latterkula.no/artikler/ +! www.mbl.is/frettir/ +! adressa.no +! kk.no, sol.no +! historienet.no, natgeo.no, komputer.no +! https://www.nettavisen.no/okonomi/3423875562.html +! qxl.no +! nickelodeon.no, tv2.dk, klikk.no, zooom.no, adressa.no, blogg.no, kjarkinn.is +! gamer.no, veier24.no, at.no, porten.no, insidetelecom.no, elektronikkbransjen.no, tu.no, digi.no +! steigan.no, allers.no, icelandreview.com, resett.no +! demokraten.no, avisa-hordaland.no, blv.no, gat.no, lp.no, osogfusa.no, raumnes.no, setesdolen.no, sunnhordland.no, vaksdalposten.no, vtb.no +! ba.no +! https://github.com/DandelionSprout/adfilt/pull/53 +! aftenbladet.no +! avisalofoten.no +! blv.no/nyheter/kan-bruke-23-millioner-pa-the-whale-undersokelsene +! https://www.aftenposten.no/sport/sjakk/i/4qKxMg/carlsen-overbeviste-verdensmestertakter +! https://www.aftenposten.no/sport/sjakk/i/0nyKLG/sjakkstjernen-mistet-kona +! https://www.aftenposten.no/ (Mobile useragent) +! http://www.brannmannen.no/brann/store-utfordringer-ved-togulykken-pa-asta/ +! https://krs247.no/ +! lsk.no +! https://www.budstikka.no/ +! e24.no, aftenbladet.no, sysla.no +! https://www.austurfrett.is/frettir/lagt-smithlutfall-a-austurlandi (15/04/2020) +! https://fiskur.fo/gitte-henning-1-landar-i-maloy (09/05/2020) ||*.fo/css/img/banner2x1.png$image +! https://www.dagsavisen.no/nyheter/verden/1.1731911 (18/06/2020) +! 🇳🇴: ——— Distraherende bakgrunnsbilder ——— +||images.media.xxlsports.com/images/h90/h9d/9339713159198/bg.jpg$image +||platekompaniet.no/assets/img/background.png$image +||pepcall.no/wp-content/uploads/2015/04/bakgrunn-forside.jpg$image +||tv2.no/s/lab/2.5/p/img/tv2-background.svg$image ! 🇳🇴: ——— Fiksing av knekte sider ——— ! 🇩🇰: ——— Fiksing af knækte websider ——— ! 🇮🇸: ——— Óbrot ——— ! 🇬🇧: ——— Unbreakage ——— ! Makes articles that would be counted as ads anywhere else on SeHer, show up on that page. +@@||seher.no/reise$generichide ! ——— Caused by «EasyPrivacy» ——— ! Attempting to fix a problem with voting online on Idol Norway -@@||tv2.no/*/config/analytics.json$xmlhttprequest,~third-party +@@||tv2.no/*/config/analytics.json$xhr,1p ! Attempts to resolve how some frontpage articles are hard to open @@||schibsted.com/autoTracker$domain=vg.no ! 🇳🇴: Får Dplay sin påloggingsside til å vises riktig ! 🇬🇧: 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/ryanbr/fanboy-adblock/issues/1261 ! ——— 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 ! ——— Caused by «EasyList» (Should be submitted to EasyList itself at some point) ——— +! https://github.com/easylist/easylist/issues/1861 @@_prebid_$domain=seher.no +! https://raw.githubusercontent.com/hkarn/scandinavianlist/master/scandinavianlist/scandinavianlist_whitelist.txt @@||cdn.easy-ads.com/js/swipemod.js^$script,domain=oa.no|rb.no|ta.no|sb.no @@||easy-ads.com/subscriber^$image,domain=oa.no|rb.no|ta.no|sb.no ! ——— Caused by «RU AdList» (Should be submitted to RU AdList itself at some point) ——— ! Makes E-newspaper previews show up properly @@/teasers/*$domain=agderposten.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 -@@||cmp.ekstrabladet.dk/get_site_data$xmlhttprequest,~third-party +! 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 -@@||sp-prod.net^$xmlhttprequest,domain=ekstrabladet.dk +!#if env_firefox +@@||sp-prod.net^$xhr,domain=ekstrabladet.dk +!#endif ! +!#include NorwegianExperimentalList%20alternate%20versions/AntiAdblockEntries.txt ! ! 🇳🇴: ——— Forsøker å få nettleseren til å laste inn filer i HTTPS, dersom nettstedet ikke automatisk omdirigerer HTTP til dens HTTPS-versjon ——— ! 🇬🇧: ——— Tries to make the web browser load files in HTTPS, if the website itself doesn't automatically redirect from HTTP to its HTTPS version ——— ! Credit to https://raw.githubusercontent.com/Cybo1927/Hosts/master/Anti/Anti%2520Third-Party%2520HTTP for showing me the existence of this particular CSP command. ! Though in all fairness, you'd get better results from using https://github.com/ilGur1132/Smart-HTTPS as your main solution for these kinds of HTTPS upgrades. +$csp=upgrade-insecure-requests,domain=skessuhorn.is|sporttv.is|bobilverden.no|win-xp.no ! 🇳🇴: ——— 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) ——— @@ -224,42 +307,55 @@ contentMarketing$xmlhttprequest,domain=sol.no ! 🇬🇧: ——— De-blurrers for paid articles (so that the last few lines of a preview doesn't fade out) ——— ! Thanks to THEtomaso (https://github.com/THEtomaso) for most of these entries. ||dagligvarehandelen.no/sites/all/themes/custom/ledelseas/gfx/veil.png$image +! dagbladet.no,elbil24.no +! digi.no, tu.no, medier24.no, porten.no +! https://www.klikk.no/side3/vimenn/viggo-bloffet-hele-norge-6857944 +! https://www.vg.no/nyheter/i/y3Mka2/ (08/04/2020) +! https://www.vg.no/nyheter/innenriks/i/3JbRzv/ (09/04/2020) ! 🇳🇴: ——— Norsk Tipping, inkl. tvilsomt motiverte lottoreklamer (Noen ikke-påtrengende tippereklamer er greit nok i mine øyne) ——— ! 🇩🇰: ——— Norsk Tipping, inkl. nogle tvivlsomt motiverede lottoreklamer (Nogle ikke-påtrængende sportstipsreklamer er akseptabelt i mine øjne) ——— ! 🇬🇧: ——— Norsk Tipping, incl. poorly motivated lotto ads (A few non-pushy football pool ads are fine in my book) ——— ||widget.norsktippingpartner.no$subdocument ||widget.tippebannere.no$subdocument,domain=~tipster.no ||tipster.no/embed$subdocument +! https://www.nettavisen.no/ +! https://www.ba.no/s/5-8-1221171 ||vg.no/vgc/pool/tipster.png$image ||vgc.no/pustehullet/betting-header.png$image ! ——— Gamereactor + Viafree ——— ! 🇳🇴: Disse oppføringene synkroniseres med de til «Frellwit's Swedish Filter» med noen måneders mellomrom, så det hadde blitt for strevsomt å kategorisere dem. ! 🇩🇰: Disse regler bliver synkroniseret med de hos «Frellwit's Swedish Filter» med nogle måneders mellemrum, så det hadde blivet for tungt at kategorisere dem. ! 🇬🇧: These entries are synchronised with those of "Frellwit's Swedish Filter" every few months-ish, and as such it'd be too much work to categorise them. -/adblock_mobile.$script,domain=gamereactor.no|gamereactor.dk -/insert_grtv_stats.$xmlhttprequest,domain=gamereactor.no|gamereactor.dk +/adblock_mobile.$important,script,domain=gamereactor.no|gamereactor.dk +/insert_grtv_stats.$xhr,domain=gamereactor.no|gamereactor.dk /prerolls/*$domain=gamereactor.no|gamereactor.dk -/viewability.$script,domain=gamereactor.no|gamereactor.dk -@@||openx.gamereactor.dk/www/delivery/fc.php$xmlhttprequest,domain=gamereactor.no|gamereactor.dk -||gamereactor.*/lay/ad-video-stats.$script -||gamereactor.*/lay/js/adblock_desktop.$script -||gamereactor.*/lay/js/background.$script -||gamereactor.*/lay/js/banners_config.$script +/viewability.$important,script,domain=gamereactor.no|gamereactor.dk +@@||openx.gamereactor.dk/www/delivery/fc.php$xhr,domain=gamereactor.no|gamereactor.dk +||gamereactor.*/lay/ad-video-stats.$important,script +||gamereactor.*/lay/js/adblock_desktop.$important,script +||gamereactor.*/lay/js/background.$important,script +||gamereactor.*/lay/js/banners_config.$important,script ||gamereactor.*/media/eventad/$image -||openx.gamereactor.dk/multi.php?$script -||ssl.p.jwpcdn.com^*/gapro.js$script,domain=gamereactor.no|gamereactor.dk +||media.gamereactor.dk/prerolls/*$media,redirect=noopmp3-0.1s,domain=gamereactor.no|gamereactor.dk +||openx.gamereactor.dk/multi.php?$important,script +||ssl.p.jwpcdn.com^*/gapro.js$important,script,domain=gamereactor.no|gamereactor.dk @@||imasdk.googleapis.com/js/sdkloader/ima3.$script,domain=gamereactor.no|gamereactor.dk -||viafree.*/collect$xmlhttprequest +||viafree.*/collect$important,xmlhttprequest ||client-stream-events.mtg-api.com^$domain=viafree.no|viafree.dk ||freewheel-mtgx-tv.akamaized.net^$media,domain=viafree.no|viafree.dk -@@||fwmrm.net/ad/$image,xmlhttprequest,domain=viafree.no|viafree.dk -@@||fwmrm.net/crossdomain.xml$xmlhttprequest,domain=viafree.no|viafree.dk +@@||fwmrm.net/ad/$image,xhr,domain=viafree.no|viafree.dk +@@||fwmrm.net/crossdomain.xml$xhr,domain=viafree.no|viafree.dk ! 🇳🇴: Oppføringer for ytre-høyre-nettsteder. Støtte for disse nettstedene er begrenset, og de fleste nye oppføringer som blir foreslått for dem vil bli ordrett godkjent. ! 🇬🇧: Entries for far-right websites. Support for these sites is limited, and most new entries that are suggested for them will be accepted verbatim. /*-annonse-*$image,domain=resett.no ! 🇬🇧: Category: Compatibility entries for ABP users, EasyList, and/or functionality whitelisting +! https://github.com/AdguardTeam/AdguardForWindows/issues/3209 +!#if adguard_app_windows +!#endif +!#if !adguard ! 🇬🇧: Entries that are also present in AdGuard Base Filter, for those who use ABP and AdBlock, or who haven't felt a need to spend 8 seconds to subscribe to it in uBlock Origin. ||panel.cint.com^$domain=gulindex.no +!#endif ! —————————————————————————————————————————————————————————————————————————————————————————— ! 🇳🇴: Svindelnettsteder og virusnettsteder (Ikke besøk dem hvis du har dine datamaskiner og lommebøker kjært) ! Rask leksjon: Mange svindelnettsteder bruker adresser som ligner på adressene til store nettsteder, men som inneholder tilfeldige ekstra smådetaljer som gjør dem til en helt annen adresse. "||vg.no." vil blokkere vg.no.iphone-svindel-eksempel.xyz, men ikke vg.no eller vg.no/sport @@ -275,7 +371,7 @@ contentMarketing$xmlhttprequest,domain=sol.no ||finn.no. ||posten.no. ||postnord.no. -||*/finn.no/finno.htm +||*/finn.no/finno.htm$doc,domain=~facebook.com ||dnb.no. ||sparebank1.no. ||nordea.no. @@ -293,23 +389,23 @@ contentMarketing$xmlhttprequest,domain=sol.no ||*/Norgesecure/ ||.gratis-reisebilletter. ||*/KiwiErbjudanden1/ -||trackvoluum.com^ +||trackvoluum.com^$doc ||*/pakkerlevering/ -||102.112.2o7.net^ +||102.112.2o7.net^$doc ||tromselementbygg.no^ ||no.zxxyw.com^ -||apple-account-locked.losjevegen.no^ +||apple-account-locked.losjevegen.no^$doc ||arvetellefsen.no/curry^ ||holmedalblikk.no^ ||vipps-sikkerhet.*^ ||*/dnb11111/^ -||nymelding.com^ +||nymelding.com^$doc ||mrcal365.com^ ||ultimate-tech-products.myshopify.com^ ||look-like-star.myshopify.com^ ||limitedvoucher.com^ ||djurs.com-*.*^ -||com-airs1.com^ +||com-airs1.com^$doc ||pensjonistferie.no^ ||postuksus.com^ ||52.216.146.90^ @@ -326,55 +422,94 @@ contentMarketing$xmlhttprequest,domain=sol.no ! 🇳🇴: Som nevnt i diverse nyhetsartikler om svindelsider ! 🇩🇰: Som nævnt i diverse nyhedsartikler om fupwebsider ! 🇬🇧: As mentioned in various news articles about fraud sites +! https://www.tv2.no/nyheter/10493336/ ||rnbinance.com^ ||brightertrade.com^ +! https://www.nrk.no/ytring/1.14496024 ||cost2buy.net^ +! https://www.nrk.no/norge/1.14511067 ||kongeparken.com-*^ ||kiwi.com-*^ +! https://www.aftenposten.no/osloby/i/mRK8xq/Fatt-tilbud-om-gratis-kollektivbillett-Svindel_-melder-Ruter ||ruter.top^ +! https://www.faktisk.no/faktasjekker/YAb/nei-olav-thon-har-ikke-investert-850-millioner-kroner-i-bitcoin-program ||gokkw.com^ ||earnmoneyglobal.com^ +! https://www.datahjelperne.no/stein-erik-hagen-og-fredrik-skavlan-misbrukes-i-bitcoin-svindel/ ||trendyn.me^ +! https://www.datahjelperne.no/verifiser-get-konto-falsk-mail/ ||getmail-no.*^ -||surveryrewards1.com^ +! https://www.datahjelperne.no/falske-telenor-undersokelser/ +||surveryrewards1.com^$doc +! https://www.nrk.no/mr/1.14649436 ||pprfct.com^ +! https://www.datahjelperne.no/gratulerer-du-har-vunnet-en-gave-mail-svindel/ ||liveshopdealz.com^ +! https://www.nrk.no/livsstil/1.14732503 ||elkjop*.club^ +! https://www.datahjelperne.no/sparebank1-kortet-ditt-er-blokkert-mail-phishing/ ||*/css/*sparebank1.no^ +! https://www.faktisk.no/notiser/l5/nei-petter-stordalen-har-ikke-investert-i-bitcoin-program ||phosphox.com^ ||nodzoom.com^ +! https://www.faktisk.no/notiser/ql/nei-du-far-ikke-rayban-briller-til-22299-kr-pa-denne-nettsiden ||rbgeg.com^ ||rbkbb.com^ +! https://www.facebook.com/viralspiralen/posts/2494251397311027 ||addmoviesnow.com^ +! https://www.mm.dk/tjekdet/artikel/faarup-sommerland-advarer-mod-gratis-billetter-det-er-spam-og-fup ||faarup.com-*.*^ -||com-dk.com^ +||com-dk.com^$doc +! https://www.mm.dk/tjekdet/artikel/det-er-fup-heller-ikke-denne-gang-giver-legoland-5-gratis-billetter-vaek ||legoland.com-*.*^ +! https://www.mm.dk/tjekdet/artikel/norwegian-billetter-til-valgfri-destination-er-snyd-og-bedrag ||bondiblue.co.uk^ +! https://www.mm.dk/tjekdet/artikel/overrasket-bjarne-riis-kender-intet-til-investering-i-bitcoin-platform ||ucrhealthyhearts.com^ +! https://www.mm.dk/tjekdet/artikel/svindel-breder-sig-ogsaa-lars-larsen-misbruges-nu-i-bitcoin-fup ||myk-news.com^ +! https://www.mm.dk/tjekdet/artikel/tidligere-lego-chef-misbruges-i-bitcoin-svindelnummer ||meretro.com^ +! https://www.mm.dk/tjekdet/artikel/ogsaa-chili-klaus-maa-staa-model-til-falske-annoncer ||hcliips.com^ +! https://www.mm.dk/tjekdet/artikel/han-afviser-at-have-investeret-500-mio-i-bitcoin-platform-graensende-til-humor ||bestphoneapplication.com^ +! https://www.mm.dk/tjekdet/artikel/michael-laudrup-har-ikke-vaeret-i-go-morgen-danmark-for-at-fortaelle-om-bitcoin-fidus ||vision-hey.club^ +! https://www.mm.dk/tjekdet/artikel/fup-dovne-robert-har-ikke-tjent-en-boejet-5-oere-paa-bitcoins ||marissatomei.com^ +! https://www.mm.dk/tjekdet/artikel/deltagere-i-go-morgen-danmark-misbrugt-i-bitcoin-svindelnummer ||top-topic.co^ +! https://www.nrk.no/troms/1.14788086 ||geometra-bologna.it^ +! https://www.nrk.no/nyheter/1.14793929 ||sky.gs^ +! https://www.online.no/sikkerhet/falsk-online-nettside ||is-a-personaltrainer.com^ +! https://nyheder.tv2.dk/krimi/2020-02-11-politiet-advarer-mod-svindler-smser-forsoger-at-fa-billede-af-nemid ||rigspolitiet.com^ ||nemid.org^ +! https://www.tv2.no/nyheter/11203952/ ||topgadgetboom.com^ +! https://www.faktisk.no/faktasjekker/vw8/erik-gikk-fra-arbeidsledig-til-millionaer-pa-8-uker ||ocgadgets.com^ ||ocgadgetss.myshopify.com^ +! https://www.mm.dk/tjekdet/artikel/nej-mads-mikkelsen-har-stadig-ikke-skraemt-de-store-banker-med-bitcoins ||onelifetechno.com^ +! https://www.mm.dk/tjekdet/artikel/ny-boelge-af-falske-ray-ban-annoncer-skyller-ind-over-danskerne ||rbaab.net^ ||rbppg.net^ +! https://www.mm.dk/tjekdet/artikel/fup-artikel-hun-er-tiltalt-for-millionsvindel-men-nu-pludselig-loesladt ||ekstrabiadet.*^ +! https://www.mm.dk/tjekdet/artikel/folkekaer-fodboldhelt-ked-af-at-blive-misbrugt-af-svindlere ||kronoscm.com^ +! https://www.mm.dk/tjekdet/artikel/nej-joergen-leth-har-ikke-investeret-500-millioner-kroner-i-bitcoins ||daily-news.tech^ ||limevow.com^ +! https://www.faktisk.no/notiser/ywM/se-opp-for-bitcoin-svindlere ||travelersloch.com^ ||trainingcalculate.com^ +! https://www.tv2.no/nyheter/11516670/ ||fintechnow*.buzz^ ||wealthnews*.xyz^ ! IP addresses of servers notorious for hosting many of the sites above @@ -484,10 +619,20 @@ contentMarketing$xmlhttprequest,domain=sol.no ! 🇬🇧: ——— Anti-anti-adblocking ——— ! Last updated: 10June2020v1-Extension ||aftenposten.no/seksjon/dist/ads-$script +||dni-adops-proxy-prod-adopsmediaconverter.mercury.dnitv.com/$media,redirect=noopmp3-0.1s,domain=dplay.no|dplay.dk ||elderlyscissors.com^ -||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,~third-party +||imasdk.googleapis.com/pal/sdkloader/pal.js$script,redirect=noopjs,domain=dplay.no|dplay.dk +||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,1p @@.dk/assets/templates/*/ads.png$image,domain=maskinbladet.dk|agrar-plus.dk|fritidsmarkedet.dk|dagensbyggeri.dk|maskinteknik.dk|gronteknik.dk -@@/js/ads.js$~third-party,domain=tvkampen.com|tvsporten.dk +@@/js/ads.js$1p,domain=tvkampen.com|tvsporten.dk +@@||bondebladet.screen9.tv^$generichide +@@||eurosport.*^$generichide @@||fwmrm.net/ad/$script,domain=dplay.no|dplay.dk -@@||sixscissors.com^$third-party,domain=itavisen.no -@@||www.tv2.no/s/js/ads.js$script,~third-party +@@||sixscissors.com^$3p,domain=itavisen.no +@@||www.tv2.no/s/js/ads.js$script,1p +!#if !ext_ublock +@@||bildeler.name$generichide +@@||reservedele.name$generichide +!#endif +!#if env_firefox +!#endif diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 04160f1d5..39284fbf8 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 02July2020v1 +! Version: 02July2020v2 ! 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 @@ -751,6 +751,7 @@ pressfire.no##.section-10 fvn.no##.brandboard-container united.no#?#.fl-visible-desktop-medium:-abp-has(div[class^=ann-forside]:-abp-contains(/Annonse:/)) filmweb.no##.mpu +byas.no##.vertical-x1-ad > .column--big */gifs/*emty.gif^$domain=yrkesbil.no|bilnorge.no ||yrkesbil.no/gifs/1pix.gif^ ||730.no/banner/*/sonymusic/$subdocument diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 8d527816a..23f85cb8d 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 02July2020v1-Alpha +# Version: 02July2020v2-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 diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index fa3b1c565..7da3a321d 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -7,7 +7,7 @@ UNSUPPORTED_ABP = ['$important', ',important', '$redirect=', ',redirect=', ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^'] UNSUPPORTED_TPL = ['##', '#@#', '#?#', r'\.no\.$'] UNSUPPORTED_PRIVOXY = ['##', '#@#', '#?#', '@@', '!#'] -UNSUPPORTED_BRAVE = ['##', '#@#', '#?#', '!#', '!+', '$csp', '$generichide', '$elemhide', '$specificblock', '$redirect', ',redirect', 'emty.gif', '1pix.gif', '730.no/banner/', 'gaysir.no/rek/', '85.17.76.181', 'youtube.jpg', 'instagram', 'cookieinformation', 'Social Blocking', '/admark_', 'PFBLOCKERNG', 'boks', 'rammar', ' spaces', 'services.api.no', 'Viatrumf', 'Internet Explorer', 'Elkjøp', ' elding.fo', ' background', 'baggrund', 'EasyList —', 'baksýn'] +UNSUPPORTED_BRAVE = ['##', '#@#', '#?#', 'emty.gif', '1pix.gif', '730.no/banner/', 'gaysir.no/rek/', '85.17.76.181', 'youtube.jpg', 'instagram', 'cookieinformation', 'Social Blocking', '/admark_', 'PFBLOCKERNG', 'boks', 'rammar', ' spaces', 'services.api.no', 'Viatrumf', 'Internet Explorer', 'Elkjøp', ' elding.fo', ' background', 'baggrund', 'EasyList —', 'baksýn', '!+ NOT_OPTIMIZED'] OUTPUT = 'xyzzyx.txt' OUTPUT_ABP = 'NordicFiltersABP.txt' @@ -1096,73 +1096,7 @@ def prepare_brave(lines) -> str: # remove $document modifier from the rule line = re.sub( - r"\$doc.*", - r"", - line - ) - - line = re.sub( - r"\$all.*", - r"", - line - ) - - line = re.sub( - r"([$,])xhr", - r"\1xmlhttprequest", - line - ) - - line = re.sub( - r"([$,])3p", - r"\1third-party", - line - ) - - line = re.sub( - r"([$,])1p", - r"\1~third-party", - line - ) - - line = re.sub( - r"([$,])important$", - r"", - line - ) - - line = re.sub( - r"\$important,", - r"$", - line - ) - - line = re.sub( - r",important,", - r",", - line - ) - - line = re.sub( - r".*background.*\$image", - r"", - line - ) - - line = re.sub( - r".*bakgrunn.*", - r"", - line - ) - - line = re.sub( - r".*xxlsports.*", - r"", - line - ) - - line = re.sub( - r"! Version: [0-9]{4}.*", + r"\$doc,domain=~ .*", "", line ) @@ -1179,21 +1113,9 @@ def prepare_brave(lines) -> str: line ) - line = re.sub( - r"^! [a-z].*", - r"", - line - ) - - line = re.sub( - r"^! \(.*", - r"", - line - ) - line = re.sub( r"(! Version: .*)", - r"\1-Alpha", + r"\1-Beta", line )