Took care of some stuff a day overdue

As per https://github.com/DandelionSprout/adfilt/issues/7#issuecomment-565824906.
This commit is contained in:
Imre Kristoffer Eilertsen
2019-12-17 01:30:13 +01:00
committed by GitHub
parent 726f2e677a
commit bac0ee011d
+28 -39
View File
@@ -1,4 +1,4 @@
! Version: 17December2019v1
! Version: 17December2019v2
! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider
! Translated title: Dandelion Sprout's Nordic filters for tidier websites
! Expires: 12 hours
@@ -136,8 +136,6 @@ vg.no,e24.no,gamer.no,tek.no,digi.no##+js(abort-on-property-write.js, __AB__)
vgtv.no##+js(golem.de.js)
vgtv.no##.apnx-container
vgtv.no##.video-branding
viafree.*##.ad-click-through
viafree.*##.pause-ad
viaplay.*##.interaction-block
xlmoto.no##.overlay-bg
xlmoto.no##.overlay-container
@@ -169,7 +167,6 @@ rett24.no##.p_banner-responsive
/bilder/erotikk1.jpg$domain=eavisa.com
/entag.js$script,domain=eniro.se|eniro.no|eniro.dk|proff.se|proff.no|proff.dk
/js/smartbanner/*$domain=tvkampen.com|tvsporten.dk
/linktag2.js$important,script,domain=viafree.no|viafree.dk
/liveodds-button_nordicbet$domain=tvkampen.com|tvsporten.dk
/nordicbet_logo$domain=tvkampen.com|tvsporten.dk
/partners/*_ad_icon$image,domain=tvkampen.com|tvsporten.dk
@@ -194,15 +191,12 @@ rett24.no##.p_banner-responsive
||amino.dk/images/partners/agera/240x140-forside-hardcoded*.jpg$image
||annonser.*.no^
||austevollforlag.no/wp-content/*/yachtmarine2014.$image
||avod-fw-config.mtg-api.com^$important,xhr,domain=viafree.no|viafree.dk
||banner.*.no^
||banner.landbrugsavisen.dk/reklame.aspx$subdocument
||bannere.oslonett.no^
||boligkanalen-maestro-new.azurewebsites.net$image
||bornholm.nu/nonsec/banner$image
||brandstudio.inventory.schibsted.io$subdocument,3p
||cdn.ravenjs.com^$script,domain=viafree.no|viafree.dk
||client-stream-events.mtg-api.com^$domain=viafree.no|viafree.dk
||cluster.chart.dk$3p
||cmt.no^
||damoh.vgtv.no/hic_qos$script,redirect=noopjs,domain=vg.no
@@ -213,8 +207,6 @@ rett24.no##.p_banner-responsive
||emerio.no^
||euroads.no^
||eyjar.net/skrar/ads
||freewheel-mtgx-tv.akamaized.net^$media,domain=viafree.no|viafree.dk
||getsentry.com^$3p,domain=viafree.no|viafree.dk
||gratisxxx.no$image,domain=nakenprat.com
||helios.*.no
||i1media.no^
@@ -241,7 +233,6 @@ rett24.no##.p_banner-responsive
||tracking-genesisaffiliates.com$image,3p
||tvshop.com/tradedoubler_files/
||vevlysingar.fo$subdocument,3p
||viafree.*/collect$important,xhr
||viasport-assets.mtg-api.com/*/prod/comScore-*.js$script
||vikari.is/skjol/frjalsi-lif*.png$image
||webclick.no^
@@ -721,10 +712,6 @@ krom.is#@#.share-container
@@||5e529.v.fwmrm.net/ad/$script,domain=dplay.no|dplay.dk
@@||bondebladet.screen9.tv^$generichide
@@||eurosport.*^$generichide
@@||fwmrm.net/*/AdManager.js$script,domain=viafree.no|viafree.dk
@@||fwmrm.net/ad/$xhr,domain=viafree.no|viafree.dk
@@||fwmrm.net/ad/*$script,domain=viafree.no|viafree.dk
@@||fwmrm.net/crossdomain.xml$xhr,domain=viafree.no|viafree.dk
@@||sixscissors.com^$3p,domain=itavisen.no
1200kcalkostplan.dk,1800kcalkostplan.dk##+js(abort-on-property-write.js, KillAdBlock)
csp.screen9.com#@#.adsbox
@@ -742,12 +729,6 @@ vg.no##+js(addEventListener-defuser.js, load, concat)
||elderlyscissors.com^
||imasdk.googleapis.com/pal/sdkloader/pal.js$script,redirect=noopjs,domain=dplay.dk|dplay.no
||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
!#if !ext_ublock
@@ -799,46 +780,54 @@ vglive.no##.tipster-liveodds-embed
~norsk-tipping.no,~tipster.no##a[href*="norsk-tipping.no/lotteri/eurojackpot"]
~norsk-tipping.no,~tipster.no##a[href*="norsk-tipping.no/lotteri/extra"]
! ——— Gamereactor ———
! ——— 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.
gamereactor.*###pagebackground:style(background-image: none !important)
gamereactor.*##+js(abort-current-inline-script.js, phpads_deliver)
gamereactor.*##+js(abort-on-property-write.js, banner_video)
gamereactor.*##+js(set-constant.js, adblockEnabled, noopFunc)
gamereactor.*##+js(set-constant.js, trackAdblock, noopFunc)
||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
||openx.gamereactor.dk/multi.php?$important,script
gamereactor.*##^script[onError="adblockEnabled()"]
gamereactor.*#@#.afs_ads
/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.$important,script,domain=gamereactor.no|gamereactor.dk
@@||openx.gamereactor.dk/www/delivery/fc.php$xhr,domain=gamereactor.no|gamereactor.dk
gamereactor.*###ad_mobiletopinsidetext
gamereactor.*###ad_video
gamereactor.*###bigVideoAd
gamereactor.*###eventad
gamereactor.*###facebooknotification
gamereactor.*###fbnotification
gamereactor.*###pagebackground:style(background-image: none !important)
gamereactor.*###sky2_1
gamereactor.*##+js(abort-current-inline-script.js, phpads_deliver)
gamereactor.*##+js(abort-on-property-write.js, banner_video)
gamereactor.*##+js(nano-setTimeout-booster.js)
gamereactor.*##+js(set-constant.js, adblockEnabled, noopFunc)
gamereactor.*##+js(set-constant.js, trackAdblock, noopFunc)
gamereactor.*##.ad_smartphbig
gamereactor.*##.ad_video
gamereactor.*##.cocacola
gamereactor.*##.sponsor
gamereactor.*##^script[onError="adblockEnabled()"]
gamereactor.*##a[href*="/adclick.php"]
gamereactor.*##div[class^=ad300]
gamereactor.*##div[style*="width:300px;height:600px;"]
gamereactor.*##div[style="min-height: 600px; margin-bottom: 20px;"]
gamereactor.*#@#.afs_ads
||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
gamereactor.*##+js(nano-setTimeout-booster.js)
@@||openx.gamereactor.dk/www/delivery/fc.php$xhr,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
/insert_grtv_stats.$xhr,domain=gamereactor.no|gamereactor.dk
/prerolls/*$domain=gamereactor.no|gamereactor.dk
/adblock_mobile.$important,script,domain=gamereactor.no|gamereactor.dk
/viewability.$important,script,domain=gamereactor.no|gamereactor.dk
@@||fwmrm.net/ad/$image,xhr,domain=viafree.no|viafree.dk
@@||fwmrm.net/crossdomain.xml$xhr,domain=viafree.no|viafree.dk
viafree.*##.ad-click-through
viafree.*##.pause-ad
viafree.*##.pause-ad-container
||client-stream-events.mtg-api.com^$domain=viafree.no|viafree.dk
||freewheel-mtgx-tv.akamaized.net^$media,domain=viafree.no|viafree.dk
||viafree.*/collect$important,xhr
! 🇳🇴: Korrigerer veldig grell feilinformasjon på Elkjøp og Elgiganten Danmark, hvor EU-energimerkingen til en del produkter fortsatt brukte før-2016-fargene, som førte til tilfeller hvor f.eks. en A-merking var mørkegrønn mens en A+-merking var gul med et hint av grønt.
! 🇩🇰: Rætter op i rigtigt grim fejlinformation på Elgiganten og Elkjøp, der EU-energimærkingen til mange produkter stadigt benytter før-2016-fargene, noget der førede til tilfelder der fx. et A-merke var mørkegrøn mens et A+-merke var gult med et hint af grøn.