Skip to content

Commit

Permalink
Update local assets and compression codebooks (#3181)
Browse files Browse the repository at this point in the history
Co-authored-by: Ghostery Adblocker Bot <ghostery-adblocker-bot@users.noreply.github.com>
  • Loading branch information
ghostery-adblocker-bot[bot] and Ghostery Adblocker Bot committed Apr 8, 2023
1 parent cac383a commit ae2ea74
Show file tree
Hide file tree
Showing 15 changed files with 297 additions and 63 deletions.
26 changes: 15 additions & 11 deletions packages/adblocker/assets/easylist/easylist-cookie.txt

Large diffs are not rendered by default.

217 changes: 210 additions & 7 deletions packages/adblocker/assets/easylist/easylist.txt

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions packages/adblocker/assets/easylist/easylistgermany.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Adblock Plus 1.1]
! Version: 202304062118
! Version: 202304072047
! Title: EasyList Germany
! Last modified: 06 Apr 2023 21:18 UTC
! Last modified: 07 Apr 2023 20:47 UTC
! Expires: 1 days (update frequency)
! Homepage: https://easylist.to/
! Licence: https://easylist.to/pages/licence.html
Expand Down Expand Up @@ -3701,6 +3701,7 @@ verlagshaus-jaumann.de##.header-right
computersm.com##.header-top
gartenschlumpf.de##.header-widget-area
oxmoxhh.de##.header-widget-inner
mtb-news.de##.header__banner
bankkaufmann.com##.headeradvert_
techstage.de##.heise-ad-element-wrapper
fremdwort.de##.hinweisad
Expand Down
15 changes: 11 additions & 4 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: 202304071237
! Version: 202304081936
! Title: EasyPrivacy
! Last modified: 07 Apr 2023 12:37 UTC
! Last modified: 08 Apr 2023 19:36 UTC
! Expires: 4 days (update frequency)
! *** easylist:template_header.txt ***
!
Expand Down Expand Up @@ -6984,6 +6984,7 @@ _mongo_stats/
||getsmartlook.com^$third-party
||getstat.net^$third-party
||getstatistics.se^$third-party
||getstats.org^$third-party
||getviously.com^$third-party
||gez.io^$third-party
||gglscr.online^$third-party
Expand Down Expand Up @@ -12868,6 +12869,7 @@ $third-party,xmlhttprequest,domain=opensubtitles.org
||letv.com/cloud_pl/
||letv.com/env/
||levelaccess.net/analytics/
||libcdnjs.com/api/event
||licdn.com/*.gif?rnd=
||licensing.bitmovin.com/impression
||lift.acquia.com^
Expand Down Expand Up @@ -12941,7 +12943,6 @@ $third-party,xmlhttprequest,domain=opensubtitles.org
||loomia.com^*/setcookie.html
||lore.circulate.com^
||lps.qantas.com^
||lr-ingest.io/logger.min.js
||lsimg.net^*/vs.js
||ltwebstatic.com/she_dist/libs/devices/fpv2.
||ltwebstatic.com^*/libs/sensors/
Expand Down Expand Up @@ -30743,6 +30744,7 @@ $csp=child-src 'none'; frame-src *; worker-src 'none',domain=skyback.ru|szukajka
||cpx.golem.de^
||cpxl.golem.de^
||d.rp-online.de^
||data.sportdeutschland.tv^
||dein-plan.de/t.gif
||dejure.org/cgi-bin/sitzung.fcgi?
||derwesten.de/stats/
Expand All @@ -30751,6 +30753,7 @@ $csp=child-src 'none'; frame-src *; worker-src 'none',domain=skyback.ru|szukajka
||ens.luzernerzeitung.ch^
||ens.nzz.ch^
||ens.tagblatt.ch^
||epimetheus.navigator.web.de^
||event-collector.prd.data.s.joyn.de^
||fc.vodafone.de^
||fotocommunity.de/track/
Expand Down Expand Up @@ -30778,6 +30781,7 @@ $csp=child-src 'none'; frame-src *; worker-src 'none',domain=skyback.ru|szukajka
||metrics.n-tv.de^
||mlm-tracking-service.meinestadt.de^
||moviepilot.de/assets/autotrack-
||mtb-news.de/metric/
||muenchener-stadtplan.com/t.gif
||mydirtyhobby.de/tracker
||navigation-timing.meinestadt.de^
Expand All @@ -30792,6 +30796,7 @@ $csp=child-src 'none'; frame-src *; worker-src 'none',domain=skyback.ru|szukajka
||oxifwsabgd.nzz.ch^
||pi.technik3d.com^
||potsdamer-stadtplan.com/t.gif
||pstt.mtb-news.de^
||px.derstandard.at^
||pxc.otto.de^
||rem-track.bild.de^
Expand All @@ -30800,6 +30805,7 @@ $csp=child-src 'none'; frame-src *; worker-src 'none',domain=skyback.ru|szukajka
||rt.bunte.de^
||schnaeppchenfuchs.com/js/default-
||shoop.de/mgtrx/
||sportnews.bz/pcookie?
||spreewaldkarte.de/t.gif
||sqs.quoka.de^
||squirrel.cividi.ch^
Expand All @@ -30811,6 +30817,7 @@ $csp=child-src 'none'; frame-src *; worker-src 'none',domain=skyback.ru|szukajka
||stats.autoscout24.ch^
||stats.rocketbeans.tv^
||steuertipps.de/scripts/tracking/
||stol.it/pcookie?
||subpixel.4players.de^
||suche.web.de/click
||swmhdata.stuttgarter-nachrichten.de^
Expand Down Expand Up @@ -30877,7 +30884,6 @@ $csp=child-src 'none'; frame-src *; worker-src 'none',domain=skyback.ru|szukajka
||wa.gmx.net^
||wa.web.de^
||walbusch.de^$ping
||web.de/monitoring/
||werkenntdenbesten.de/js/tracking.
||werkenntdenbesten.de/pd.js
||wikipedia.de/tracking.js
Expand Down Expand Up @@ -31509,6 +31515,7 @@ $csp=child-src 'none'; frame-src *; worker-src 'none',domain=skyback.ru|szukajka
||log-lb.skyperfectv.co.jp^
||logql.yahoo.co.jp^
||m-oo-m.com/data/report/
||mangaraw.to/api/v1/view/
||measure.ameblo.jp^
||mixi.net/static/js/build/mixi-analysis.production.js
||nhk.or.jp^*/bc.js
Expand Down
4 changes: 4 additions & 0 deletions packages/adblocker/assets/ublock-origin/annoyances.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6776,3 +6776,7 @@ genesistls.com##html:style(-webkit-touch-callout: default !important; -webkit-us

! https://github.com/uBlockOrigin/uAssets/issues/17447
milenio.com##+js(aeld, copy)

! https://www.reddit.com/r/uBlockOrigin/comments/12fj0s3/
shortform.com##+js(aeld, /contextmenu|mousedown/, return"undefined")
shortform.com##[oncopy="return false"]:remove-attr(oncopy)
4 changes: 2 additions & 2 deletions packages/adblocker/assets/ublock-origin/badware.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1055,8 +1055,6 @@ okashimag.com,tech4yougadgets.com##+js(aopr, Notification)
! https://www.virustotal.com/gui/collection/e8b07232ca57df01f81a2b5d485ad0016ffaff9bf834aaf7d1a565f93b616e0a
||cs2-twitchs.com^$all
||dogehype.com^$all
! [dup] from ublock-origin/badware.txt
! ||cs2-twitchs.com^$all
||cosmicdrift.co^$all
||bbynetwork.nl^$all
||deltaproject.dev^$all
Expand Down Expand Up @@ -2981,3 +2979,5 @@ torrdroidforpc.com##[href^="http://slugmefilehos.xyz/"]
||windowshelps.site^$all
||orfon.site^$all
||pinkpussy.one^$all
||smalldingdong.top^$all
||sportwebsforu.site^$all
6 changes: 4 additions & 2 deletions packages/adblocker/assets/ublock-origin/filters-2021.txt
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ pornez.net###cb00
pornez.net###cb01
cutscenes.net##.item > div[id^="ts_ad_native"]:upward(1)
cutscenes.net##.item > iframe[src^="https://go."]:upward(1)
pornxday.com,twinkybf.com##.happy-sidebar
gotocam.net,pornxday.com,twinkybf.com##.happy-sidebar
twinkybf.com##.happy-under-player
###playerOverlay[style="position:absolute; z-index:3"]
roshy.tv##.roshy-widget
Expand Down Expand Up @@ -1199,6 +1199,8 @@ pagalworld.us##+js(nowoif)

! https://www.reddit.com/r/uBlockOrigin/comments/ln04t3/how_to_stop_popup_ads_on_anidl/
anidl.org##+js(aopw, _pop)
! https://github.com/uBlockOrigin/uAssets/issues/17499
anidl.org##+js(set, tie.ad_blocker_detector, '')

! https://github.com/uBlockOrigin/uAssets/issues/8598
@@||freecoursewebsite.com^$ghide
Expand Down Expand Up @@ -2775,7 +2777,7 @@ simplebits.io##+js(no-xhr-if, /ads)
simplebits.io##+js(no-fetch-if, /ads)

! https://github.com/AdguardTeam/AdguardFilters/issues/66742
gtoys.blog.fc2.com##+js(acis, document.addEventListener, google_ad_client)
hayamimi-gunpla.com##+js(acis, document.addEventListener, google_ad_client)

! https://www.reddit.com/r/uBlockOrigin/comments/ncbk72/ublock_detected_at_greeleytribunecom/
||prairiemountainmedia.com^$3p
Expand Down
12 changes: 6 additions & 6 deletions packages/adblocker/assets/ublock-origin/filters-2022.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1902,7 +1902,6 @@ alycia-debnam-carey.com,christinaricci.net,emmy-rossum.com,natalie-portman.org,r
!#endif
watchomovies.*##^script:has-text(decodeURIComponent)
||a.streamoupload.$script
/^https:\/\/a\.[-0-9a-z]{4,16}\.(?:club|com?|cyou|info|net|ru|site|top?|xxx|xyz)\/(?=[a-z]{0,6}[0-9A-Z])[0-9a-zA-Z]{7}\.js$/$script,match-case

! https://github.com/AdguardTeam/AdguardFilters/issues/114645
animesonehd.xyz##+js(aopw, _pop)
Expand Down Expand Up @@ -3471,11 +3470,6 @@ tvpolan.ml##+js(aopw, _pop)
90phut2.*##+js(ra, style, body, stay)
90phut2.*##html:style(overflow: auto !important;)

! https://github.com/AdguardTeam/AdguardFilters/issues/122381
! https://github.com/uBlockOrigin/uAssets/issues/16081
*$image,redirect-rule=1x1.gif,domain=easymc.io
easymc.io##+js(aopr, Image)

! https://github.com/uBlockOrigin/uAssets/issues/13812
@@||imasdk.googleapis.com/js/sdkloader/ima3.js$script,domain=worldledaily.com

Expand Down Expand Up @@ -4401,7 +4395,13 @@ enit.in,financerites.*,skincarie.com##.footerLink.hidden:style(display: block !i
enit.in,financerites.*,skincarie.com##.getlink:others()
financerites.*##p:has-text('[ad_')
financerites.*##h4:has-text(Ads)
financerites.*##+js(nowoif)
financerites.*##+js(set, blurred, false)
vocalley.com##+js(nano-sib, timeSec, *)
vocalley.com##+js(nano-stb, getlink, *)
||push-sdk.$3p
||a.labadena.com^$popup
||feistyhelicopter.com^$popup

! https://www.reddit.com/r/uBlockOrigin/comments/x5w2kt/adblock_detected_help/
truyenaudiocv.net##+js(aopr, adblockDetect)
Expand Down
24 changes: 14 additions & 10 deletions packages/adblocker/assets/ublock-origin/filters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ bild.de#@#.rectangle
bild.de#@#.fullbanner
bild.de#@#.ads
bild.de##div:matches-css-before(content:/Anzeige/i)
bild.de##.ad-wrapper:style(height: 1px !important; visibility: collapse;)
bild.de##.ad-wrapper
! bild.de##[style]:has-text(Anzeige):has(iframe):upward(1)
! https://github.com/uBlockOrigin/uAssets/issues/8257
! https://www.reddit.com/r/uBlockOrigin/comments/jxrzda/
Expand All @@ -726,6 +726,7 @@ bild.de##+js(nostif, offsetParent)
bild.de##+js(aopr, SmartAdServerASMI)
bild.de##+js(json-prune, adBlockWallEnabled)
bild.de##+js(set, __NUXT__.state.curation.page.config.ADBLOCKWALL, false)
bild.de##+js(aeld, load, adBlockerCheck)
! https://github.com/uBlockOrigin/uAssets/issues/8360
spiele.bild.de##+js(nano-stb, , 10000)
@@||imasdk.googleapis.com/js/sdkloader/ima3.js$script,xhr,domain=spiele.bild.de
Expand Down Expand Up @@ -4524,7 +4525,8 @@ cinedetodo.*##[id*="yellow"]
! https://github.com/uBlockOrigin/uAssets/issues/13424
! https://github.com/uBlockOrigin/uAssets/issues/15411
*$frame,redirect-rule=noopframe,domain=megaup.net
megaup.net##body .metaRedirectWrapperBottomAds > div:style(-webkit-mask-image: linear-gradient(transparent, transparent) !important;)
! megaup.net##body .metaRedirectWrapperBottomAds > div:style(-webkit-mask-image: linear-gradient(transparent, transparent) !important;)
megaup.net##body .metaRedirectWrapperBottomAds > div:style(pointer-events: none !important)

! https://github.com/uBlockOrigin/uAssets/issues/1850
aquipelis.*##+js(aopw, smrtSB)
Expand Down Expand Up @@ -5566,17 +5568,18 @@ ilpuntotecnico.com##[style^="text-align:center; height:"][style$="px;"]
@@||ilpuntotecnico.com^$ghide

! https://github.com/uBlockOrigin/uAssets/issues/2449
a2zapk.com##+js(acis, atob, decodeURIComponent)
a2zapk.com##+js(aopr, AaDetector)
||a2zapk.com/js/notification.js
! https://github.com/AdguardTeam/AdguardFilters/issues/147765
a2zapk.*##+js(acis, atob, decodeURIComponent)
a2zapk.*##+js(aopr, AaDetector)
||a2zapk.*/js/notification.js
@@||a2zupload.com^$ghide
@@||googlesyndication.com/pagead/$script,domain=a2zupload.com
@@*$image,domain=a2zupload.com
a2zupload.com##ins.adsbygoogle
educatiocenter.online##+js(acs, $, alertmsg)
@@||dl.a2zapk.com/getred.php$xhr,domain=educatiocenter.online
@@||tmp.a2zapk.com/js/advertisement/$frame,domain=educatiocenter.online
||googlesyndication.com^$image,redirect-rule=1x1.gif,domain=educatiocenter.online
a2zapk.*,a2zupload.com##ins.adsbygoogle
a2zapk.*,educatiocenter.online##+js(acs, $, alertmsg)
@@||dl.a2zapk.*/getred.php$xhr,domain=a2zapk.*|educatiocenter.online
@@||tmp.a2zapk.*/js/advertisement/$frame,domain=a2zapk.*|educatiocenter.online
||googlesyndication.com^$image,redirect-rule=1x1.gif,domain=a2zapk.*|educatiocenter.online

! https://github.com/uBlockOrigin/uAssets/issues/8292#issuecomment-955193548
o2tvseries.com##+js(aeld, /^(?:click|mousedown)$/, _0x)
Expand Down Expand Up @@ -8755,6 +8758,7 @@ smallseotools.com#@#.b
smallseotools.com##.m-auto.text-center:has(.adsbygoogle)
smallseotools.com##samp
smallseotools.com##div.side_area > a[onclick="tool_trigger('Grammarly sidebar carousal')"]
smallseotools.com##[data-alter]

! https://github.com/uBlockOrigin/uAssets/issues/4102
peeplink.in##+js(popads-dummy)
Expand Down
9 changes: 9 additions & 0 deletions packages/adblocker/assets/ublock-origin/unbreak.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4857,3 +4857,12 @@ scotsman.com##[class*="AdContainer"]
scotsman.com##[class*="AdLoading"]
scotsman.com##[class*="Ads__Container"]
scotsman.com##[class*="Billboard__Root"]

! https://github.com/tofukko/filter/issues/83
@@||taboola.com/magazine/$domain=taboolanews.com

! https://github.com/uBlockOrigin/uAssets/issues/17498
dark-gaming.com##+js(no-xhr-if, lr-ingest.io)

! https://twitter.com/forestone05/status/1644686599500996608
@@||user.userguiding.com/sdk/identify$xhr,domain=xaris.ai
4 changes: 2 additions & 2 deletions packages/adblocker/src/codebooks/network-filter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export default [
"/wp-content/uploads",
"/detroitchicago/",
"/appmeasurement",
"/(https?:\\/\\/)",
"/cdn-cgi/trace",
"/^https?:\\/\\/",
"[a-zA-Z0-9]{",
Expand Down Expand Up @@ -138,7 +139,6 @@ export default [
"/r",
"/w",
"\\.",
"\\/",
"00",
"a-",
"ac",
Expand Down Expand Up @@ -178,7 +178,6 @@ export default [
"li",
"lo",
"m/",
"mo",
"mp",
"ol",
"om",
Expand Down Expand Up @@ -221,6 +220,7 @@ export default [
"}",
"*",
"/",
"\\",
"&",
"^",
"=",
Expand Down
12 changes: 6 additions & 6 deletions packages/adblocker/src/codebooks/network-hostname.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ export default [
".e",
".f",
".h",
".k",
".m",
".n",
".p",
Expand All @@ -74,6 +73,7 @@ export default [
"au",
"av",
"aw",
"ax",
"ay",
"az",
"be",
Expand Down Expand Up @@ -130,10 +130,13 @@ export default [
"gn",
"go",
"gr",
"gs",
"gu",
"he",
"hi",
"ho",
"ia",
"ib",
"ic",
"id",
"il",
Expand All @@ -144,20 +147,20 @@ export default [
"ir",
"is",
"it",
"ix",
"iz",
"ke",
"ki",
"ko",
"ks",
"la",
"ld",
"le",
"li",
"lo",
"lu",
"ly",
"ma",
"me",
"mi",
"mo",
"mp",
"my",
Expand All @@ -174,7 +177,6 @@ export default [
"ow",
"pe",
"ph",
"pi",
"pl",
"po",
"pr",
Expand All @@ -188,7 +190,6 @@ export default [
"se",
"sh",
"si",
"sk",
"sn",
"so",
"sp",
Expand Down Expand Up @@ -222,7 +223,6 @@ export default [
"vi",
"vo",
"we",
"wi",
"-",
".",
"0",
Expand Down
Loading

0 comments on commit ae2ea74

Please sign in to comment.