gorhill / uBlock

uBlock Origin - An efficient blocker for Chromium and Firefox. Fast and lean.
GNU General Public License v3.0
44.49k stars 2.99k forks source link

Add the new uBO versions of Fanboy's Annoyance and Cookie #3869

Closed DandelionSprout closed 2 years ago

DandelionSprout commented 2 years ago

Fanboy appears to have split his annoyances lists into uBO- and ABP-targeting versions, with the former having considerably more entries from I can determine at a surface glance when it comes to Annoyance (84,197 vs 74,607, ±500).

And although there hasn't been much fanfare or announcements of that split, I can only presume that Fanboy wishes for uBO users to use the new uBO list versions.

gorhill commented 2 years ago

Both lists are essentially the same, the current "Easylist Cookie" contains a directive understood by uBO to load https://secure.fanboy.co.nz/easylist_cookie_specific_uBO.txt as a sublist:

! Include ubO specific
!#include easylist_cookie_specific_uBO.txt
DandelionSprout commented 2 years ago

Okay, so on re-analysis, it appears that the EasyList Cookie versions are the same.

However, one small section seems to be differenct and unique in Annoyance (according to text comparison in Sublime Text), although the difference is much smaller than what it originally seemed like:

Old version's unique entries (43) ``` minhaconexao.com.br#?#section[id][class]:-abp-has(:scope > div[class] > button[class][onclick^="onClickCookiesBannerWeb"]) eduface.ru,edumsko.ru#@#.cookies_popup podleze-piekielko.pl#$#abort-on-property-read cookieman epolisbari.com#@##COOKIEmodal epolisbari.com#@##accept_cookie clever-zoeger.de,datakauppa.fi#@##cliSettingsPopup homify.ae,homify.ca,homify.cl,homify.co.id,homify.co.kr,homify.co.th,homify.co.uk,homify.co.za,homify.com,homify.com.ar,homify.com.br,homify.com.co,homify.com.eg,homify.com.mx,homify.com.my,homify.com.tr,homify.com.ve,homify.de,homify.es,homify.fr,homify.hk,homify.in,homify.it,homify.jp,homify.nl,homify.pe,homify.pk,homify.pl,homify.pt,homify.ru,homify.sa,homify.sg,homify.tw,homify.ua,homify.vn#@##cookie-banner airam.fi,biotechusa.hu,hscollective.org#@##cookie-consent analog.com#@##cookie-consent-container okazik.pl#@##cookie-dialog clever-zoeger.de,datakauppa.fi,ddz24.eu,fantasyfootballgeek.co.uk,management30.com#@##cookie-law-info-bar dehn.at,dehn.de,dehn.fr,dehn.hu,dehn.it,desitek.dk#@##cookie-layer defencediscountservice.co.uk#@##cookie-popup:not(html):not(body) epolisbari.com#@##cookieModal mustijamirri.fi#@##cookie_consent bafin.de#@##cookiebanner d-power-modellbau.com,modellbau-metz.com,mustijamirri.fi#@##cookieform qastack.com.de#@##cookies-accept qastack.com.de#@##cookies-consent laboratoire-cellmade.fr#@##cookiesInfo laboratoire-cellmade.fr#@##cookiesPop britishairways.com#@##ensModalWrapper[role] britishairways.com#@##ensNotifyBanner n26.com#@##gdpr-notice pathe.nl#@##js-cookie-popup repostuj.pl#@##rodo-modal britishairways.com,homify.ae,homify.ca,homify.cl,homify.co.id,homify.co.kr,homify.co.th,homify.co.uk,homify.co.za,homify.com,homify.com.ar,homify.com.br,homify.com.co,homify.com.eg,homify.com.mx,homify.com.my,homify.com.tr,homify.com.ve,homify.de,homify.es,homify.fr,homify.hk,homify.in,homify.it,homify.jp,homify.nl,homify.pe,homify.pk,homify.pl,homify.pt,homify.ru,homify.sa,homify.sg,homify.tw,homify.ua,homify.vn#@#.cookie-banner:not(body):not(html) hscollective.org#@#.cookie-consent-background dovoba.de#@#.cookie-consent-v2 airam.fi,dovoba.de,hscollective.org,litebit.eu#@#.cookie-consent:not(body):not(html) dehn.at,dehn.de,dehn.fr,dehn.hu,dehn.it,desitek.dk#@#.cookie-layer:not(html):not(body) d-power-modellbau.com,modellbau-metz.com#@#.cookie-notice epolisbari.com#@#.cookie-text bynco.com#@#.cookie-wall-container mustijamirri.fi#@#.cookie_body mustijamirri.fi#@#.cookie_check mustijamirri.fi#@#.cookie_info britishairways.com#@#.ensNotifyBanner monolithdesign.it#@#.gdprModal--visible monolithdesign.it#@#.gdprModal__placeholder pathe.nl#@#.notification--cookie wentronic.com,wentronic.pl#@#cookie-modal d-power-modellbau.com,enesco.co.uk,modellbau-metz.com,steinmetz-baldauf.de#@#div#cookie-modal:not(html):not(body) win2day.at#@#div.cookie-notification ```
New version's unique entries (92) ``` downace.com##+js(acis, requestPermission) news18.com##+js(acis, serviceworker.register) shrinkzzy.link##+js(acis, firebase.initializeApp) rd.fi##.nivoSlider:remove() puuilo.fi##.cf-container-wrapper puuilo.fi##body:style(overflow: auto !important) autoevolution.com###notif_asker_div autoevolution.com##body,html:style(height: auto !important; overflow: auto !important) nu.nl##.webpush-popup nu.nl##body,html:style(height: auto !important; overflow: auto !important) phonearena.com###pa-survey-modal phonearena.com##.pa-modal-backdrop phonearena.com##body:style(overflow: auto !important; position: initial !important;) protocol.com###form_out otisoatmilk.co.nz###shopify-section-newsletter-popup theconversation.com##.MuiDialog-root socialitelife.com##.mfp-ready audioholics.com,protocol.com,theconversation.com##body:style(overflow: auto !important;) otisoatmilk.co.nz,socialitelife.com##html:style(overflow:auto !important) nationalgeographic.com## + js(aeld, scroll) nationalgeographic.com##.EmailStickyFooter__Modal nationalgeographic.com##body:style(overflow: auto !important; position: initial !important;) monroenews.com,poconorecord.com##.tp-backdrop monroenews.com,poconorecord.com##.tp-modal monroenews.com,poconorecord.com##body,html:style(height: auto !important; overflow: auto !important) thewrap.com##.wk-site-overlay thewrap.com##body:style(overflow: auto !important;) newrepublic.com##html:style(overflow: auto !important) brighteon.com##.overlay brighteon.com##body,html:style(overflow: auto !important; position: initial !important;) ftm.eu##.blockingOverlay ftm.eu##html:style(overflow: auto !important) zorbabooks.com##.modal zorbabooks.com##.modal-backdrop zorbabooks.com##body:style(overflow: auto !important;) curiocity.com##.fancybox-is-open curiocity.com##body:style(overflow: auto !important;) thethaiger.com##html:style(overflow: auto !important;) ba-bamail.com##body:style(overflow: auto !important;) babylonbee.com##.modal-backdrop babylonbee.com##body:style(overflow: auto !important;) informatykzakladowy.pl##body:style(overflow: auto !important;) prowritingaid.com##.exit-popup prowritingaid.com##body:style(overflow: auto !important;) kitchentime.com,kitchentime.de,kitchentime.dk,kitchentime.fi,kitchentime.no,kitchentime.se##.popup-overlay kitchentime.com,kitchentime.de,kitchentime.dk,kitchentime.fi,kitchentime.no,kitchentime.se##body,html:style(height: auto !important; overflow: auto !important) axios.com##.Modal_ctaContainer__kHYHl axios.com##body,html:style(overflow: auto !important; position: initial !important;) theblockcrypto.com##.modal-container theblockcrypto.com##body:style(overflow: auto !important;) megacatstudios.com##.mfp-bg megacatstudios.com##.mfp-wrap megacatstudios.com##html:style(overflow:auto !important) syfy.com##.blog-post__gated__wrapper syfy.com##body,html:style(overflow: auto !important; position: initial !important;) nieuwsblad.be##.cj-root nieuwsblad.be##body:style(overflow: auto !important;) fatgirlskinny.net##.pum fatgirlskinny.net##html:style(overflow:auto !important) washingtonpost.com###wall-bottom-drawer washingtonpost.com##.regwall-overlay washingtonpost.com##html:style(height: auto !important; overflow: auto !important) rakentaja.fi###ctl00_verkkolehdenmainos rakentaja.fi##.in.fade.modal-backdrop rakentaja.fi##body:style(overflow: auto !important) theepochtimes.com##.modal theepochtimes.com##body,html:style(overflow: auto !important; position: initial !important;) milenio.com##html:style(overflow: auto !important; position: initial !important;) staradvertiser.com##.breakingPopUp staradvertiser.com##.modal-backdrop staradvertiser.com##body,html:style(overflow: auto !important; position: initial !important;) numero.com##.type-newsletter_subscription numero.com##body,html:style(overflow: auto !important; position: initial !important;) newsnow.co.uk##.js-popup-active newsnow.co.uk##body,html:style(overflow: auto !important; position: initial !important;) theblock.co##body.overflow-hidden:style(overflow: auto !important;) cryptobriefing.com##body,html:style(overflow: auto !important; position: initial !important;) microsoft.com###modalsRenderedAfterPageLoad microsoft.com##.modal-backdrop microsoft.com##body,html:style(overflow: auto !important; position: initial !important;) readtangle.com##.intro readtangle.com##body,html:style(overflow: auto !important; position: initial !important;) thedispatch.com##.intro-popup thedispatch.com##body,html:style(overflow: auto !important; position: initial !important;) fxstreet.com##body,html:style(overflow: auto !important; position: initial !important;) thepetslife.online##.g1-popup-newsletter thepetslife.online##body,html:style(overflow: auto !important; position: initial !important;) decrypt.co##.left-0.top-0.fixed decrypt.co##body:style(overflow: auto !important; position: initial !important;) yesmagazine.org##.fajardo-campaign yesmagazine.org##body:style(overflow: auto !important; position: initial !important;) thebfd.co.nz##body:style(overflow: auto !important; position: initial !important;) ```
gorhill commented 2 years ago

I get zero filters used for https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt when I enable the stock "Easylist Cookie" while disabling all other lists in uBO.

DandelionSprout commented 2 years ago

That part I agree on. But my recentmost comment was for Fanboy's Annoyance instead.

Comparing Annoyances' versions in the same way: image

gorhill commented 2 years ago

Why not just ask @ryanbr to explain the discrepancy before making any change here?