Skip to content

Commit

Permalink
Update local assets and compression codebooks (#2379)
Browse files Browse the repository at this point in the history
Co-authored-by: remusao <remusao@users.noreply.github.com>
  • Loading branch information
ghostery-adblocker-bot[bot] and remusao committed Jan 14, 2022
1 parent d2a4c88 commit 97608bb
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 36 deletions.
6 changes: 4 additions & 2 deletions packages/adblocker/assets/easylist/easylist-cookie.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Adblock Plus 2.0]
! Checksum: A2ENEab2WE77Rh6atesdEg
! Checksum: 5Bit9zKkyTpQU/5LiIyv4g
! Title: Easylist Cookie List
! Updated: 2022-01-12 20:00 UTC
! Updated: 2022-01-13 20:00 UTC
! Expires: 9 days (update frequency)
! License: http://creativecommons.org/licenses/by/3.0/
! Please report any unblocked content or problems by email or in our forums
Expand Down Expand Up @@ -5214,6 +5214,7 @@ _vpcookieconsent/
###eksCookiePrompt
###el-cookie-consent
###elGuestTerms
###elc-cookie-consent
###element_cookie_banner
###elqOptInBannerDiv
###elumbus-cookies
Expand Down Expand Up @@ -13689,6 +13690,7 @@ _vpcookieconsent/
##div[class^="CookieWarn__"]
##div[class^="CookieWarning_"]
##div[class^="CookiesAdvice"]
##div[class^="CookiesAlert_"]
##div[class^="CookiesNotification"]
##div[class^="Cookies__Wrapper"]
##div[class^="Cookies__cookies"]
Expand Down
31 changes: 14 additions & 17 deletions packages/adblocker/assets/easylist/easylist.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Adblock Plus 2.0]
! Version: 202201121816
! Version: 202201131128
! Title: EasyList
! Last modified: 12 Jan 2022 18:16 UTC
! Last modified: 13 Jan 2022 11:28 UTC
! Expires: 4 days (update frequency)
! Homepage: https://easylist.to/
! Licence: https://easylist.to/pages/licence.html
Expand Down Expand Up @@ -13277,6 +13277,7 @@ _800x80_
###dvsmladlft
###dvsmladrgt
###dynamicAdDiv
###dynamicAdSlot1
###dynamicAdWinDiv
###ear_ad
###eastAds
Expand Down Expand Up @@ -31581,6 +31582,7 @@ amazon.com,faceyourmanga.com,isc2.org,liverc.com,liverpoolfc.com,mit.edu,muscatd
economist.com,flightcentre.co.uk,foodkick.com,liverpoolfc.com,olx.pl,payback.pl,pccomponentes.com,ripley.cl,ripley.com.pe,wsj.com#@#[id^="google_ads_iframe"]
revimedia.com#@#a[href*=".revimedia.com/"]
dr.dk,smartadserver.de#@#a[href*=".smartadserver.com"]
slickdeals.net#@#a[href*="adzerk.net"]
mail.yahoo.com#@#a[href^="https://ad.doubleclick.net/"]
badoinkvr.com#@#a[href^="https://badoinkvr.com/"]
privateinternetaccess.com#@#a[href^="https://www.privateinternetaccess.com/"]
Expand Down Expand Up @@ -52769,6 +52771,7 @@ tf2r.com#@#.adverts
||aurn.com/wp-content/banners/
||aveherald.com/images/banners/
||b.cdnst.net/javascript/amazon.js$script,domain=speedtest.net
||b27ni7.g02.ign.com^
||bahamaslocal.com/img/banners/
||beap.gemini.yahoo.com^
||bernama.com/storage/banner/
Expand Down Expand Up @@ -53802,11 +53805,6 @@ eetimes.com###WelcomeAdContainer
eetimes.com###WelcomeAdContainer + #overlay
turbobit.net###__bgd_link
ytmp3.cc###a-320-50
myabandonware.com###a104CLX
myabandonware.com###a104CT
myabandonware.com###a104SB
myabandonware.com###a104ST
myabandonware.com###a104STD
egotastic.com###a46c6331
egotasticsports.com###a83042c4
krunker.io###aHolder
Expand Down Expand Up @@ -54091,6 +54089,12 @@ trakt.tv###hu-ck-s-t-er-de-sk-top-sidenav
trakt.tv###hu-ck-s-t-er-de-sk-top-wrapper
nettiauto.com,nettikaravaani.com,nettikone.com,nettimarkkina.com,nettimokki.com,nettimoto.com,nettivene.com,nettivuokraus.com###huge_banner
nzbindex.com###i > .inner
myabandonware.com###i112CB
myabandonware.com###i112SB
myabandonware.com###i112ST
myabandonware.com###i112myabandonware_medrec_left_atf
myabandonware.com###i112myabandonware_medrec_right_atf
myabandonware.com###i112myabandonware_medrec_right_btf
hltv.org###i3_middle
klmanga.com,weloma.net###id-custom_banner
unitconversion.org###ileft
Expand Down Expand Up @@ -54178,11 +54182,6 @@ whatshappening.com.ph###mrecCarousel
nitrome.com###mu_3_container
atlantatribune.com,footballleagueworld.co.uk,tribune.net.ph###mvp-leader-wrap
twinfinite.net###mvp-main-content-wrap
myabandonware.com###myabandonware_leaderboard_atf
myabandonware.com###myabandonware_leaderboard_btf
myabandonware.com###myabandonware_medrec_left_atf
myabandonware.com###myabandonware_medrec_right_atf
myabandonware.com###myabandonware_medrec_right_btf
mediaupdate.co.za###mycarousel
comicbook.com###native-plus-top1
comicbook.com###native-plus-top2
Expand Down Expand Up @@ -54679,7 +54678,6 @@ geekflare.com##.b-sticky-sidebar-wrapper-simple
bizcommunity.com##.b-topbanner
scorespro.com##.b160_600
bing.com##.b_poleContent > #ifeu
myabandonware.com##.ba
namepros.com##.backer
mcvuk.com,technologyx.com,thessdreview.com##.background-cover
gayexpress.co.nz##.backstretch
Expand Down Expand Up @@ -55359,6 +55357,7 @@ rottentomatoes.com##.leaderboard_wrapper
northernstar.info,theprospectordaily.com##.leaderboardwrap
zdnet.com##.leadgen
mapquest.co.uk,mapquest.com##.leadin
dnsleak.com##.leak__submit
republicbroadcasting.org##.left-sidebar-padder > #text-8
gogetaroomie.com##.left-space
10minutemail.net##.leftXL
Expand Down Expand Up @@ -55494,7 +55493,6 @@ nplusonemag.com##.nurble
cheezburger.com##.nw-rail-min-250
marineelectronics.com,marinetechnologynews.com,maritimeprofessional.com##.nwm-banner
mediaite.com##.o-promo-unit
myabandonware.com##.o820
comicbook.com##.oas
distractify.com##.obIeh
softexia.com##.offer
Expand Down Expand Up @@ -56066,7 +56064,6 @@ fastpic.ru##.vright
vaughn.live##.vs_v75_MvnAbvsLowerThirdWrapper
ebook-searcher.com##.w-100
userscript.zone##.w300
myabandonware.com##.w828st
dailymail.co.uk##.watermark
watson.ch##.watson-ad
wbal.com##.wbal-banner
Expand Down Expand Up @@ -56187,7 +56184,6 @@ unogs.com##[href^="/ad/"]
discord.me##[href^="/cr/"]
audiobookbay.nl##[href^="/down-"]
steroid.com##[href^="/out.php"]
myabandonware.com##[href^="/visual/r-2/"]
radiotoday.co.uk##[href^="http://go.radiotoday.co.uk/"]
howtogeek.com##[href^="http://macpaw.7eer.net/"]
hltv.org##[href^="http://out.hltv.org/"]
Expand Down Expand Up @@ -57593,7 +57589,7 @@ youporn.com#?#aside:-abp-has(a.ad-remove)
@@||hutchgo.advertserve.com^$domain=hutchgo.com|hutchgo.com.cn|hutchgo.com.hk|hutchgo.com.sg|hutchgo.com.tw
@@||hw-ads.datpiff.com/news/$image,domain=datpiff.com
@@||imasdk.googleapis.com/js/core/bridge*.html$subdocument,domain=~spotify.com
@@||imasdk.googleapis.com/js/sdkloader/ima3.js$domain=247sports.com|api.screen9.com|bbc.com|blastingnews.com|bloomberg.com|cbsnews.com|cbssports.com|chicagotribune.com|cnet.com|crhoy.com|distro.tv|einthusan.tv|embed.comicbook.com|etonline.com|games.usatoday.com|howstuffworks.com|iheart.com|insideedition.com|metacritic.com|missoulian.com|newsweek.com|paralympic.org|player.abacast.net|player.earthtv.com|player.performgroup.com|popculture.com|tdn.com|truvid.com|zdnet.com|zeebiz.com
@@||imasdk.googleapis.com/js/sdkloader/ima3.js$domain=247sports.com|api.screen9.com|bbc.com|blastingnews.com|bloomberg.com|cbsnews.com|cbssports.com|chicagotribune.com|cnet.com|crhoy.com|distro.tv|einthusan.tv|embed.comicbook.com|etonline.com|games.usatoday.com|howstuffworks.com|iheart.com|insideedition.com|metacritic.com|missoulian.com|newsweek.com|paralympic.org|player.abacast.net|player.earthtv.com|player.performgroup.com|popculture.com|scrippsdigital.com|tdn.com|truvid.com|zdnet.com|zeebiz.com
@@||imasdk.googleapis.com/js/sdkloader/ima3_dai.js$domain=247sports.com|bloomberg.co.jp|bloomberg.com|cbc.ca|embed.comicbook.com|sbs.com.au
@@||imasdk.googleapis.com/js/sdkloader/ima3_debug.js$domain=abcnews.go.com|brightcove.net
@@||img-cdn.mediaplex.com^$image,domain=betfair.com
Expand Down Expand Up @@ -57668,6 +57664,7 @@ youporn.com#?#aside:-abp-has(a.ad-remove)
@@||productioncars.com/pics/menu/$~third-party
@@||promo.com/embed/$subdocument,third-party
@@||promo.zendesk.com^$xmlhttprequest,domain=promo.com
@@||radiotimes.com/static/advertising/$script,~third-party
@@||redventures.io/lib/dist/prod/bidbarrel-$script,domain=techrepublic.com|zdnet.com
@@||renewcanceltv.com/porpoiseant/banger.js$script,~third-party
@@||rumble.com/embedJS/$script,domain=usawatchdog.com
Expand Down
11 changes: 6 additions & 5 deletions packages/adblocker/assets/easylist/easyprivacy.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Adblock Plus 1.1]
! Version: 202201121816
! Version: 202201131128
! Title: EasyPrivacy
! Last modified: 12 Jan 2022 18:16 UTC
! Last modified: 13 Jan 2022 11:28 UTC
! Expires: 4 days (update frequency)
! Homepage: https://easylist.to/
! Licence: https://easylist.to/pages/licence.html
Expand Down Expand Up @@ -6003,6 +6003,7 @@ _mongo_stats/
||admother.com^$third-party
||adobedtm.com^$third-party,domain=~adobe.com
||adobetag.com^$third-party
||adobetarget.com^$third-party
||adoftheyear.com^$third-party
||adoric-om.com^$third-party
||adpaths.com^$third-party
Expand Down Expand Up @@ -14720,9 +14721,8 @@ $third-party,xmlhttprequest,domain=opensubtitles.org
||a-reporting.nytimes.com^
||a.electerious.com^
||aa.avvo.com^
! [dup] from peter-lowe/serverlist.txt
! ||aax-eu-dub.amazon.com^
||aax-us-iad.amazon.com^
||aax-eu-dub.amazon.com^$script
||aax-us-iad.amazon.com^$script
||ab-machine.forbes.com^
||ab.fanatical.com^
||abcnews.com/assets/dtci/js/abcnews_visitorId.js
Expand Down Expand Up @@ -15544,6 +15544,7 @@ $third-party,xmlhttprequest,domain=opensubtitles.org
||stats.wwitv.com^
||streamstats.prd.dlive.tv^
||streamta.pe/stat/
||streamta.site/stat/
||streamtape.com/stat/
||strtapeadblock.club/stat/
||strtpe.link/stat/
Expand Down
5 changes: 4 additions & 1 deletion packages/adblocker/assets/ublock-origin/badware.txt
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ thepiratebay3.com^$all
||retargetcore.com^$all
.com/c/*?s1=$doc,domain=com
.net/c/*?s1=$doc,domain=net
/aff.php?dynamicpage=*&_cbUrl=$doc
/aff.php?dynamicpage=$doc
/fg/tds/ae?tds_campaign=$doc
/site/redirectpage?ca=link&sid=$doc
/tds/ae?tdsId=*&clickid=$doc
Expand Down Expand Up @@ -674,6 +674,8 @@ okashimag.com,tech4yougadgets.com##+js(aopr, Notification)
||adserver7.sbs^$all
||pergames.fun^$all
||stils-top.space^$all
||actgames.site^$all
||adserver5.sbs^$all

||hyperwage.com^$all
||ricavato.com^
Expand Down Expand Up @@ -882,6 +884,7 @@ okashimag.com,tech4yougadgets.com##+js(aopr, Notification)
||cat02tuzik.online^$all
||dating-herenow3.com^$all
||dating-space.top^$all
||conditioning1.space^$all

! https://github.com/AdguardTeam/AdguardFilters/issues/68588
! https://github.com/uBlockOrigin/uAssets/issues/8869
Expand Down
3 changes: 0 additions & 3 deletions packages/adblocker/assets/ublock-origin/filters-2020.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6011,9 +6011,6 @@ ladbible.com#@#div[class*="margin-Advert"]
! https://www.reddit.com/r/uBlockOrigin/comments/kilzmv/adblock_detected/
*$image,redirect-rule=1x1.gif,domain=rollercoin.com

! erocool.me popunder
erocool.*##+js(acis, document.querySelectorAll, popMagic)

! https://github.com/AdguardTeam/AdguardFilters/issues/70634
xxxhardcoretube.com##+js(acis, document.querySelectorAll, popMagic)
xxxhardcoretube.com##+js(ra, onclick, .player > div[onclick])
Expand Down
3 changes: 1 addition & 2 deletions packages/adblocker/assets/ublock-origin/filters-2021.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3305,6 +3305,7 @@ blog.crixurl.com##.banner
@@||adserver.juicyads.com/js/jads.js$script,domain=anydebrid.com
@@||pagead2.googlesyndication.com/pagead/js/adsbygoogle.js$script,domain=anydebrid.com
@@||pagead2.googlesyndication.com/pagead/managed/js/adsense/$script,domain=anydebrid.com
||adserver.juicyads.com/js/fib.js$script,redirect-rule=noopjs,domain=anydebrid.com

! mavplay. xyz popups
mavplay.xyz##+js(aeld, , _blank)
Expand Down Expand Up @@ -5426,8 +5427,6 @@ lightbook.org##.stream-item-widget
q1003.com##+js(nostif, google_ad)

! https://github.com/uBlockOrigin/uAssets/issues/9994
rjno1.com##+js(nostif, aswift_)
rjno1.com##.adsbygoogle:upward(1)
rjno1.com##style:has-text(@media screen):remove()

! https://github.com/uBlockOrigin/uAssets/issues/9998
Expand Down
19 changes: 14 additions & 5 deletions packages/adblocker/assets/ublock-origin/filters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,9 @@ wall-street.ro##.minh-lg-600.sidebarBox
*/wp-adblock-$script,redirect=fuckadblock.js-3.2.0

! https://github.com/gorhill/uBlock/issues/949
! https://github.com/uBlockOrigin/uAssets/issues/6541#issuecomment-1012435405
autobild.de##+js(no-fetch-if, damoh.autobild.de)
computerbild.de##+js(no-fetch-if, damoh.computerbild.de)
||s3.amazonaws.com/homad-global-configs.schneevonmorgen.com/hd-main.js$script,domain=autobild.de|cinema.de|computerbild.de|cdnapi.kaltura.com|focus.de|spieleaffe.de|sueddeutsche.de,redirect=hd-main.js
||svonm.com/hd-main.js$script,redirect=hd-main.js,domain=cinema.de|cdnapi.kaltura.com
||computerbild.de/assets/homad/*$xhr,redirect=nooptext,domain=computerbild.de
Expand Down Expand Up @@ -5742,8 +5745,7 @@ marcosfranciscodesouza.*##+js(nobab)

! https://github.com/uBlockOrigin/uAssets/issues/2278
*$script,redirect-rule=noopjs,domain=youmath.it
youmath.it##+js(nosiif, visibility)
youmath.it##+js(nostif, adb)
youmath.it##+js(acis, document.getElementById, _0x)
youmath.it###D_1
youmath.it###C_1

Expand Down Expand Up @@ -7551,8 +7553,10 @@ payskip.org###link-view a[href] > img

! https://github.com/uBlockOrigin/uAssets/issues/3130
@@||shortit.pw^$ghide
shortit.pw###ad
shortit.pw##.animated.slide
shortit.pw##+js(nowoif)
shortit.pw##+js(set, console.clear, noopFunc)
||allcoins.pw/js/ref.js
||shortit.pw/js/adbb.js

! https://github.com/NanoAdblocker/NanoFilters/issues/158
@@||thedigitalarc.com^$css,1p
Expand All @@ -7561,6 +7565,7 @@ shortit.pw##.animated.slide
pirateproxy.*##+js(nowebrtc)
pirateproxy.*,thehiddenbay.com##+js(acis, String.fromCharCode, decodeURIComponent)
pirate.*,piratebay.*,pirateproxy.*,proxytpb.*,thepiratebay.*##+js(aeld, /^(?:click|mousedown)$/, _0x)
piratebay.*##+js(aopw, _pop)
piratebay.*##+js(aopr, AaDetector)
piratebay.*,pirateproxy.*##+js(popads-dummy)
piratebay.*,pirateproxy.*##[href]:has-text(PLAY)
Expand Down Expand Up @@ -9401,6 +9406,8 @@ tonspion.de##+js(nostif, (), 15000)
! https://github.com/uBlockOrigin/uAssets/issues/4054
oncehelp.com##+js(aopr, app_vars.force_disable_adblock)
oncehelp.com##+js(aeld, click, trigger)
oncehelp.com##+js(aopr, open)
oncehelp.com##+js(set, blurred, false)
oncehelp.com##.banner-inner
oncehelp.com##[href*="?token"]

Expand Down Expand Up @@ -19103,10 +19110,12 @@ adomainscan.com,mynewsmedia.co,mynewspost.in###wpsafe-generate:style(display: bl
adomainscan.com,mynewsmedia.co##.show.modal-backdrop
adomainscan.com,mynewsmedia.co##.smart-link-banner-ad-container
adomainscan.com###ad-modal
mynewsmedia.co##.show.fade.modal
||gplinks.in^$3p
mynewspost.in##.box-main > div[style]:not(:has(#wpsafe-snp))
mynewsmedia.co##+js(aost, String.prototype.charCodeAt, https)
! https://github.com/uBlockOrigin/uAssets/issues/11278
mynewsmedia.co##+js(disable-newtab-links)
mynewsmedia.co##[href^="https://mauchopt.net"]

! https://github.com/NanoMeow/QuickReports/issues/2941
motohigh.pl##+js(nostif, , 1)
Expand Down
3 changes: 3 additions & 0 deletions packages/adblocker/assets/ublock-origin/privacy.txt
Original file line number Diff line number Diff line change
Expand Up @@ -358,3 +358,6 @@ reddit.com##+js(no-xhr-if, method:POST url:/^https:\/\/www\.reddit\.com$/)

! jzzo.com,xxxvogue.net, etc.
/s/js/ta-2.3.js?

! https://github.com/uBlockOrigin/uAssets/issues/11152#issuecomment-1011094338
||rjno1.com/cdn-cgi/challenge-platform/h/b/scripts/invisible.js
6 changes: 6 additions & 0 deletions packages/adblocker/assets/ublock-origin/unbreak.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4171,10 +4171,12 @@ myair2.resmed.com##+js(no-xhr-if, cloudflare.com/cdn-cgi/trace)
@@||fundingchoicesmessages.google.com^$script,domain=stooq.com|stooq.pl

! https://github.com/easylist/easylist/issues/2436#issuecomment-946886270
@@*ad2.$image,domain=sophiabushfan.net
@@_advertisment.$image,domain=gorgeouspfeiffer.com
@@_advertisement_$image,domain=jennifer-lawrence.com
@@/advertising_$image,domain=timfahlbusch.com
@@/advertisment/*$image,domain=taylorpictures.net
@@/advertisements-$image,domain=jennifer-lawrence.com
@@/ad_campaigns/*$image,domain=alicia-vikander.com
@@/adverts/*$image,domain=emily-blunt.com|isla-fisher.net|islafisher.net|reese-witherspoon.org|reesewitherspoon.org

Expand Down Expand Up @@ -4379,3 +4381,7 @@ heise.de#@#[data-ad-unit]
! https://github.com/AdguardTeam/AdguardFilters/issues/103489
! https://github.com/easylist/easylist/pull/10137
@@||comic-boost.com/gentosha/advertisement_view$frame,1p

! https://github.com/uBlockOrigin/uAssets/issues/11284
@@||cdn.onesignal.com/sdks/$script,domain=clash.ninja
@@||onesignal.com/api/$script,domain=clash.ninja
2 changes: 1 addition & 1 deletion packages/adblocker/src/engine/engine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import Resources from '../resources';
import CosmeticFilterBucket from './bucket/cosmetic';
import NetworkFilterBucket from './bucket/network';

export const ENGINE_VERSION = 494;
export const ENGINE_VERSION = 495;

function shouldApplyHideException(filters: NetworkFilter[]): boolean {
if (filters.length === 0) {
Expand Down

0 comments on commit 97608bb

Please sign in to comment.