AdguardTeam/AdGuardHome
1
1
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2024-09-11 10:45:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Pull request 1903: upd-all

Browse Source 
Squashed commit of the following:

commit 61838cb3e08dcfd16c9fa521a8243207ec2091aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Jul 3 13:30:37 2023 +0300

    all: upd i18n, svcs, tools, trackers
This commit is contained in:
Ainar Garipov 2023-07-03 13:40:30 +03:00
parent 91f3e29c08
commit 282f11a7c2
7 changed files with 601 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -137,6 +137,9 @@ In this release, the schema version has changed from 20 to 23.
### Deprecated
- `HEALTHCHECK` and `ENTRYPOINT` sections in `Dockerfile` ([#5939]). They cause
a lot of issues, especially with tools like `docker-compose` and `podman`, and
will be removed in a future release.
- Flags `-h`, `--host`, `-p`, `--port` have been deprecated. The `-h` flag
will work as an alias for `--help`, instead of the deprecated `--host` in the
future releases.
@ -162,6 +165,7 @@ In this release, the schema version has changed from 20 to 23.
[#5902]: https://github.com/AdguardTeam/AdGuardHome/issues/5902
[#5910]: https://github.com/AdguardTeam/AdGuardHome/issues/5910
[#5913]: https://github.com/AdguardTeam/AdGuardHome/issues/5913
[#5939]: https://github.com/AdguardTeam/AdGuardHome/issues/5939
<!--
NOTE: Add new changes ABOVE THIS COMMENT.

2
client/src/__locales/vi.json
View File

@ -1,5 +1,5 @@
{
"client_settings": "Cài đặt máy khách",
"client_settings": "Cài đặt thiết bị",
"example_upstream_reserved": "ngược dòng <0>cho các miền cụ thể</0>;",
"example_upstream_comment": "một lời bình luận.",
"upstream_parallel": "Sử dụng truy vấn song song để tăng tốc độ giải quyết bằng cách truy vấn đồng thời tất cả các máy chủ ngược tuyến",

1
client/src/__locales/zh-hk.json
View File

@ -513,6 +513,7 @@
"statistics_clear_confirm": "您確定要清除統計資料嗎？",
"statistics_retention_confirm": "您確定要更改統計資料保存時間嗎？如果您縮短期限部分資料可能將會遺失",
"statistics_cleared": "已清除統計資料",
"statistics_enable": "啟用統計數據",
"interval_hours": "{{count}} 小時",
"interval_hours_plural": "{{count}} 小時",
"filters_configuration": "過濾器設定",

466
client/src/helpers/trackers/trackers.json
View File

@ -1,5 +1,5 @@
{
"timeUpdated": "2023-06-26T13:46:24.414Z",
"timeUpdated": "2023-07-01T00:11:37.465Z",
"categories": {
"0": "audio_video_player",
"1": "comments",
@ -3348,6 +3348,13 @@
"url": "https://www.microsoft.com/",
"companyId": "microsoft"
},
"binge": {
"name": "Binge",
"categoryId": 0,
"url": "https://binge.com.au/",
"companyId": "foxtel",
"source": "AdGuard"
},
"binlayer": {
"name": "BinLayer",
"categoryId": 4,
@ -7164,6 +7171,13 @@
"url": "http://flagcounter.com/",
"companyId": "flag_counter"
},
"flash": {
"name": "Flash",
"categoryId": 0,
"url": "https://flashnews.com.au/",
"companyId": "foxtel",
"source": "AdGuard"
},
"flashtalking": {
"name": "Flashtalking",
"categoryId": 4,
@ -7369,6 +7383,13 @@
"url": "https://publishers.foxaudiencenetwork.com/",
"companyId": "fox_audience_network"
},
"fox_sports": {
"name": "Fox Sports",
"categoryId": 0,
"url": "https://foxsports.com.au/",
"companyId": "foxtel",
"source": "AdGuard"
},
"foxnews_static": {
"name": "Fox News CDN",
"categoryId": 9,
@ -7381,6 +7402,13 @@
"url": "https://www.foxpush.com/",
"companyId": "foxpush"
},
"foxtel": {
"name": "Foxtel",
"categoryId": 0,
"url": "https://foxtel.com.au/",
"companyId": "foxtel",
"source": "AdGuard"
},
"foxydeal_com": {
"name": "foxydeal.com",
"categoryId": 12,
@ -7983,12 +8011,40 @@
"url": "http://www.google.com",
"companyId": "google"
},
"google_auth": {
"name": "Google Auth",
"categoryId": 2,
"url": "https://myaccount.google.com/",
"companyId": "google",
"source": "AdGuard"
},
"google_beacons": {
"name": "Google Beacons",
"categoryId": 6,
"url": "https://google.xyz",
"companyId": "google"
},
"google_chat": {
"name": "Google Chat",
"categoryId": 7,
"url": "https://mail.google.com/chat/",
"companyId": "google",
"source": "AdGuard"
},
"google_cloud_platform": {
"name": "Google Cloud Platform",
"categoryId": 10,
"url": "https://cloud.google.com/",
"companyId": "google",
"source": "AdGuard"
},
"google_cloud_storage": {
"name": "Google Cloud Storage",
"categoryId": 10,
"url": "https://cloud.google.com/storage/",
"companyId": "google",
"source": "AdGuard"
},
"google_custom_search": {
"name": "Google Custom Search Ads",
"categoryId": 4,
@ -8001,6 +8057,27 @@
"url": "https://programmablesearchengine.google.com/about/",
"companyId": "google"
},
"google_dns": {
"name": "Google DNS",
"categoryId": 10,
"url": "hhttps://dns.google/",
"companyId": "google",
"source": "AdGuard"
},
"google_domains": {
"name": "Google Domains",
"categoryId": 10,
"url": "https://domains.google/",
"companyId": "google",
"source": "AdGuard"
},
"google_edge": {
"name": "Google Edge CDN",
"categoryId": 9,
"url": "https://peering.google.com/",
"companyId": "google",
"source": "AdGuard"
},
"google_email": {
"name": "Google Email",
"categoryId": 13,
@ -8013,12 +8090,47 @@
"url": "https://fonts.google.com/",
"companyId": "google"
},
"google_hosted": {
"name": "Google Hosted",
"categoryId": 10,
"url": "https://workspace.google.com/",
"companyId": "google",
"source": "AdGuard"
},
"google_ima": {
"name": "Google IMA",
"categoryId": 4,
"url": "http://www.google.com",
"companyId": "google"
},
"google_location": {
"name": "Google Location",
"categoryId": 8,
"url": "https://patents.google.com/patent/WO2007025143A1/",
"companyId": "google",
"source": "AdGuard"
},
"google_maps": {
"name": "Google Maps",
"categoryId": 2,
"url": "https://www.google.com/maps/",
"companyId": "google",
"source": "AdGuard"
},
"google_marketing": {
"name": "Google Marketing",
"categoryId": 6,
"url": "https://marketingplatform.google.com/",
"companyId": "google",
"source": "AdGuard"
},
"google_meet": {
"name": "Google Meet",
"categoryId": 2,
"url": "https://meet.google.com/",
"companyId": "google",
"source": "AdGuard"
},
"google_photos": {
"name": "Google Photos",
"categoryId": 9,
@ -8031,6 +8143,13 @@
"url": "http://www.google.com",
"companyId": "google"
},
"google_play": {
"name": "Google Play",
"categoryId": 8,
"url": "https://play.google.com/",
"companyId": "google",
"source": "AdGuard"
},
"google_plus": {
"name": "Google+ Platform",
"categoryId": 7,
@ -8110,6 +8229,13 @@
"url": "http://www.google.com",
"companyId": "google"
},
"google_voice": {
"name": "Google Voice",
"categoryId": 2,
"url": "https://voice.google.com/",
"companyId": "google",
"source": "AdGuard"
},
"google_website_optimizer": {
"name": "Google Website Optimizer",
"categoryId": 6,
@ -8122,6 +8248,13 @@
"url": "http://www.google.com",
"companyId": "google"
},
"google_workspace": {
"name": "Google Workspace",
"categoryId": 2,
"url": "https://workspace.google.com/",
"companyId": "google",
"source": "AdGuard"
},
"googleapis.com": {
"name": "Google APIs",
"categoryId": 9,
@ -9766,6 +9899,13 @@
"url": "http://kavanga.ru/",
"companyId": "kavanga"
},
"kayo_sports": {
"name": "Kayo Sports",
"categoryId": 0,
"url": "https://kayosports.com.au/",
"companyId": "foxtel",
"source": "AdGuard"
},
"keen_io": {
"name": "Keen IO",
"categoryId": 6,
@ -13093,6 +13233,13 @@
"url": "http://perfectmarket.com/",
"companyId": "perfect_market"
},
"perfops": {
"name": "PerfOps",
"categoryId": 6,
"url": "https://perfops.net/",
"companyId": "perfops",
"source": "AdGuard"
},
"perform_group": {
"name": "Perform Group",
"categoryId": 5,
@ -16484,6 +16631,13 @@
"url": "http://www.streak.com/",
"companyId": "streak"
},
"streamotion": {
"name": "Streamotion",
"categoryId": 0,
"url": "https://streamotion.com.au/",
"companyId": "foxtel",
"source": "AdGuard"
},
"streamrail.com": {
"name": "StreamRail",
"categoryId": 4,
@ -20598,6 +20752,7 @@
"bing.com": "bing_ads",
"bing.net": "bing_ads",
"virtualearth.net": "bing_maps",
"binge.com.au": "binge",
"view.binlayer.com": "binlayer",
"widgets.binotel.com": "binotel",
"esendra.fi": "bisnode",
@ -21212,6 +21367,7 @@
"2mdn.net": "doubleclick",
"doubleclick.net": "doubleclick",
"invitemedia.com": "doubleclick",
"doubleclick.com": "doubleclick",
"doublepimp.com": "doublepimp",
"doublepimpssl.com": "doublepimp",
"redcourtside.com": "doublepimp",
@ -21435,12 +21591,28 @@
"findizer.fr": "findizer.fr",
"findologic.com": "findologic.com",
"app-measurement.com": "firebase",
"fcm.googleapis.com": "firebase",
"firebaseappcheck.googleapis.com": "firebase",
"firebaseapp.com": "firebase",
"firebase.com": "firebase",
"firebasedynamiclinks.googleapis.com": "firebase",
"firebasedynamiclinks-ipv4.googleapis.com": "firebase",
"firebasedynamiclinks-ipv6.googleapis.com": "firebase",
"firebase.googleapis.com": "firebase",
"firebase.google.com": "firebase",
"firebaseinappmessaging.googleapis.com": "firebase",
"firebaseinstallations.googleapis.com": "firebase",
"firebaselogging.googleapis.com": "firebase",
"firebaselogging-pa.googleapis.com": "firebase",
"firebaseperusertopics-pa.googleapis.com": "firebase",
"firebaseremoteconfig.googleapis.com": "firebase",
"firebaseio.com": "firebaseio.com",
"firstimpression.io": "first_impression",
"fitanalytics.com": "fit_analytics",
"fivetran.com": "fivetran",
"flagads.net": "flag_ads",
"flagcounter.com": "flag_counter",
"flashnews.com.au": "flash",
"flashtalking.com": "flashtalking",
"flattr.com": "flattr_button",
"flexlinks.com": "flexoffers",
@ -21486,9 +21658,11 @@
"platform.foursquare.com": "foursquare_widget",
"fout.jp": "fout.jp",
"fimserve.com": "fox_audience_network",
"foxsports.com.au": "fox_sports",
"fncstatic.com": "foxnews_static",
"cdn.foxpush.net": "foxpush",
"foxpush.com": "foxpush",
"foxtel.com.au": "foxtel",
"foxydeal.com": "foxydeal_com",
"yabidos.com": "fraudlogix",
"besucherstatistiken.com": "free_counter",
@ -21649,15 +21823,287 @@
"google.ru": "google",
"google.se": "google",
"google.tn": "google",
"1e100.net": "google",
"agnss.goog": "google",
"channel.status.request.url": "google",
"g.cn": "google",
"g.co": "google",
"google.ad": "google",
"google.ae": "google",
"google.al": "google",
"google.am": "google",
"googleapis.cn": "google",
"google.as": "google",
"google.az": "google",
"google.ba": "google",
"google.bf": "google",
"google.bg": "google",
"google.bi": "google",
"google.bj": "google",
"google.bs": "google",
"google.bt": "google",
"google.by": "google",
"google.cat": "google",
"google.cd": "google",
"google.cf": "google",
"google.cg": "google",
"google.ci": "google",
"google.cl": "google",
"google.cm": "google",
"google.cn": "google",
"google.co.ao": "google",
"google.co.bw": "google",
"google.co.ck": "google",
"google.co.cr": "google",
"googlecode.com": "google",
"google.co.il": "google",
"google.co.ke": "google",
"google.co.kr": "google",
"google.co.ls": "google",
"google.com.af": "google",
"google.com.ag": "google",
"google.com.ai": "google",
"google.com.bd": "google",
"google.com.bh": "google",
"google.com.bn": "google",
"google.com.bo": "google",
"google.com.bz": "google",
"google.com.co": "google",
"google.com.cu": "google",
"google.com.cy": "google",
"google.com.ec": "google",
"google.com.eg": "google",
"google.com.et": "google",
"google.com.fj": "google",
"google.com.gh": "google",
"google.com.gi": "google",
"google.com.gt": "google",
"google.com.hk": "google",
"google.com.jm": "google",
"google.com.kh": "google",
"google.com.kw": "google",
"google.com.lb": "google",
"google.com.my": "google",
"google.com.na": "google",
"google.com.nf": "google",
"google.com.ng": "google",
"google.com.ni": "google",
"google.com.np": "google",
"google.com.om": "google",
"google.com.pa": "google",
"google.com.pe": "google",
"google.com.pg": "google",
"google.com.ph": "google",
"google.com.pk": "google",
"google.com.pr": "google",
"google.com.py": "google",
"google.com.qa": "google",
"google.com.sa": "google",
"google.com.sb": "google",
"google.com.sg": "google",
"google.com.sl": "google",
"google.com.sv": "google",
"google.com.tj": "google",
"google.com.uy": "google",
"google.com.vc": "google",
"google.com.vn": "google",
"google.co.mz": "google",
"google.co.nz": "google",
"google.co.tz": "google",
"google.co.ug": "google",
"google.co.uz": "google",
"google.co.ve": "google",
"google.co.vi": "google",
"google.co.za": "google",
"google.co.zm": "google",
"google.co.zw": "google",
"google.cv": "google",
"google.dj": "google",
"google.dm": "google",
"googledownloads.cn": "google",
"google.ee": "google",
"google.fm": "google",
"google.ga": "google",
"google.ge": "google",
"google.gg": "google",
"google.gl": "google",
"google.gm": "google",
"google.gp": "google",
"google.gy": "google",
"google.hn": "google",
"google.hr": "google",
"google.ht": "google",
"google.im": "google",
"google.in": "google",
"google.iq": "google",
"google.is": "google",
"google.je": "google",
"google.jo": "google",
"google.kg": "google",
"google.ki": "google",
"google.kz": "google",
"google.la": "google",
"google.li": "google",
"google.lk": "google",
"google.lt": "google",
"google.lu": "google",
"google.lv": "google",
"google.md": "google",
"google.me": "google",
"google.mg": "google",
"google.mk": "google",
"google.ml": "google",
"google.mn": "google",
"google.ms": "google",
"google.mu": "google",
"google.mv": "google",
"google.mw": "google",
"google.ne": "google",
"google.net": "google",
"google.nr": "google",
"google.nu": "google",
"googleoptimize.com": "google",
"google.org": "google",
"google.pn": "google",
"google.ps": "google",
"google.rw": "google",
"google.sc": "google",
"google.sh": "google",
"google.si": "google",
"google.sk": "google",
"google.sm": "google",
"google.sn": "google",
"google.so": "google",
"google.sr": "google",
"google.st": "google",
"google.td": "google",
"google.tg": "google",
"google.tk": "google",
"google.tl": "google",
"google.tm": "google",
"google.to": "google",
"google.tt": "google",
"google.us": "google",
"google.vg": "google",
"google.vu": "google",
"googleweblight.in": "google",
"google.ws": "google",
"googlezip.net": "google",
"gstatic.cn": "google",
"news.google.com": "google",
"oo.gl": "google",
"withgoogle.com": "google",
"googleadservices.com": "google_adservices",
"google-analytics.com": "google_analytics",
"ssl-google-analytics.l.google.com": "google_analytics",
"www-googletagmanager.l.google.com": "google_analytics",
"appspot.com": "google_appspot",
"googlehosted.com": "google_appspot",
"accounts.google.com": "google_auth",
"myaccount.google.com": "google_auth",
"oauth2.googleapis.com": "google_auth",
"ogs.google.com": "google_auth",
"securetoken.googleapis.com": "google_auth",
"beacons-google.com": "google_beacons",
"alt1-mtalk.google.com": "google_chat",
"alt2-mtalk.google.com": "google_chat",
"alt3-mtalk.google.com": "google_chat",
"alt4-mtalk.google.com": "google_chat",
"alt5-mtalk.google.com": "google_chat",
"alt6-mtalk.google.com": "google_chat",
"alt7-mtalk.google.com": "google_chat",
"alt8-mtalk.google.com": "google_chat",
"chat.google.com": "google_chat",
"mobile-gtalk4.l.google.com": "google_chat",
"mobile-gtalk.l.google.com": "google_chat",
"mtalk4.google.com": "google_chat",
"mtalk.google.com": "google_chat",
"talk.google.com": "google_chat",
"talk.l.google.com": "google_chat",
"talkx.l.google.com": "google_chat",
"cloud.google.com": "google_cloud_platform",
"gcp.gvt2.com": "google_cloud_platform",
"storage.googleapis.com": "google_cloud_storage",
"adsensecustomsearchads.com": "google_custom_search",
"dns.google": "google_dns",
"dns.google.com": "google_dns",
"google-public-dns-a.google.com": "google_dns",
"google-public-dns-b.google.com": "google_dns",
"domains.google": "google_domains",
"googledomains.com": "google_domains",
"nic.google": "google_domains",
"registry.google": "google_domains",
"edge.google.com": "google_edge",
"mail-ads.google.com": "google_email",
"fonts.googleapis.com": "google_fonts",
"cloudfunctions.net": "google_hosted",
"ghs46.googlehosted.com": "google_hosted",
"ghs4.googlehosted.com": "google_hosted",
"ghs6.googlehosted.com": "google_hosted",
"ghs.googlehosted.com": "google_hosted",
"googlehosted.l.googleusercontent.com": "google_hosted",
"run.app": "google_hosted",
"supl.google.com": "google_location",
"earth.app.goo.gl": "google_maps",
"geo0.ggpht.com": "google_maps",
"geo1.ggpht.com": "google_maps",
"geo2.ggpht.com": "google_maps",
"geo3.ggpht.com": "google_maps",
"kh.google.com": "google_maps",
"maps.app.goo.gl": "google_maps",
"maps.google.ca": "google_maps",
"maps.google.ch": "google_maps",
"maps.google.co.jp": "google_maps",
"maps.google.com": "google_maps",
"maps.google.com.mx": "google_maps",
"maps.google.co.uk": "google_maps",
"maps.google.es": "google_maps",
"maps.google.se": "google_maps",
"maps.gstatic.com": "google_maps",
"adsense.google.com": "google_marketing",
"adservice.google.ca": "google_marketing",
"adservice.google.co.in": "google_marketing",
"adservice.google.co.kr": "google_marketing",
"adservice.google.com": "google_marketing",
"adservice.google.com.ar": "google_marketing",
"adservice.google.com.au": "google_marketing",
"adservice.google.com.br": "google_marketing",
"adservice.google.com.co": "google_marketing",
"adservice.google.com.gt": "google_marketing",
"adservice.google.com.mx": "google_marketing",
"adservice.google.com.pe": "google_marketing",
"adservice.google.com.ph": "google_marketing",
"adservice.google.com.pk": "google_marketing",
"adservice.google.com.tr": "google_marketing",
"adservice.google.com.tw": "google_marketing",
"adservice.google.com.vn": "google_marketing",
"adservice.google.co.uk": "google_marketing",
"adservice.google.co.za": "google_marketing",
"adservice.google.de": "google_marketing",
"adservice.google.dk": "google_marketing",
"adservice.google.es": "google_marketing",
"adservice.google.fr": "google_marketing",
"adservice.google.nl": "google_marketing",
"adservice.google.no": "google_marketing",
"adservice.google.pl": "google_marketing",
"adservice.google.ru": "google_marketing",
"adservice.google.vg": "google_marketing",
"dai.google.com": "google_marketing",
"doubleclickbygoogle.com": "google_marketing",
"googlesyndication-cn.com": "google_marketing",
"duo.google.com": "google_meet",
"hangouts.clients6.google.com": "google_meet",
"hangouts.googleapis.com": "google_meet",
"hangouts.google.com": "google_meet",
"meet.google.com": "google_meet",
"meetings.googleapis.com": "google_meet",
"stun1.l.google.com": "google_meet",
"stun.l.google.com": "google_meet",
"ggpht.com": "google_photos",
"play-fe.googleapis.com": "google_play",
"play.googleapis.com": "google_play",
"play.google.com": "google_play",
"play-lh.googleusercontent.com": "google_play",
"1e100cdn.net": "google_servers",
"gvt1.com": "google_servers",
"gvt2.com": "google_servers",
@ -21670,7 +22116,22 @@
"pki.goog": "google_trust_services",
"googlecommerce.com": "google_trusted_stores",
"googleusercontent.com": "google_users",
"telephony.goog": "google_voice",
"voice.google.com": "google_voice",
"gmodules.com": "google_widgets",
"calendar.google.com": "google_workspace",
"contacts.google.com": "google_workspace",
"currents.google.com": "google_workspace",
"docs.google.com": "google_workspace",
"drive.google.com": "google_workspace",
"forms.google.com": "google_workspace",
"gsuite.google.com": "google_workspace",
"jamboard.google.com": "google_workspace",
"keep.google.com": "google_workspace",
"plus.google.com": "google_workspace",
"sheets.google.com": "google_workspace",
"slides.google.com": "google_workspace",
"spreadsheets.google.com": "google_workspace",
"googleapis.com": "googleapis.com",
"gooal.herokuapp.com": "goooal",
"gooo.al": "goooal",
@ -22037,6 +22498,7 @@
"cen.katchup.fr": "katchup",
"kau.li": "kauli",
"kavanga.ru": "kavanga",
"kayosports.com.au": "kayo_sports",
"dc8na2hxrj29i.cloudfront.net": "keen_io",
"keen.io": "keen_io",
"widget.kelkoo.com": "kelkoo",
@ -22847,6 +23309,7 @@
"perfectaudience.com": "perfect_audience",
"prfct.co": "perfect_audience",
"perfectmarket.com": "perfect_market",
"perfops.io": "perfops",
"performgroup.com": "perform_group",
"analytics.performable.com": "performable",
"performancing.com": "performancing_metrics",
@ -23652,6 +24115,7 @@
"bizsolutions.strands.com": "strands_recommender",
"strava.com": "strava",
"mailfoogae.appspot.com": "streak",
"streamotion.com.au": "streamotion",
"streamrail.com": "streamrail.com",
"streamrail.net": "streamrail.com",
"stridespark.com": "stride",

130
internal/filtering/servicelist.go
View File

@ -27,6 +27,25 @@ var blockedServices = []blockedService{{
"||9cache.com^",
"||9gag.com^",
},
}, {
ID: "activision_blizzard",
Name: "Activision Blizzard",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"-237 0 1572 1572\"><path d=\"m549.1.2 548.4 1571.4H798l-74.2-200H374.5l-74.3 200H.7zM626 1085.1l-83-274.3-82.9 274.3z\"/></svg>"),
Rules: []string{
"||activision.com^",
"||activisionblizzard.com^",
"||demonware.net^",
},
}, {
ID: "aliexpress",
Name: "AliExpress",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 50 50\"><path d=\"M9 4C6.25 4 4 6.25 4 9v32c0 2.75 2.25 5 5 5h32c2.75 0 5-2.25 5-5V9c0-2.75-2.25-5-5-5H9zm0 2h32c1.668 0 3 1.332 3 3v3.38A3.973 3.973 0 0 0 41 11H9a3.973 3.973 0 0 0-3 1.38V9c0-1.668 1.332-3 3-3zm6 11a1 1 0 0 1 1 1c0 4.962 4.037 9 9 9s9-4.038 9-9a1 1 0 1 1 2 0c0 6.065-4.935 11-11 11s-11-4.935-11-11a1 1 0 0 1 1-1z\"/></svg>"),
Rules: []string{
"||ae-rus.net^",
"||ae-rus.ru^",
"||aliexpress.com^",
"||aliexpress.ru^",
},
}, {
ID: "amazon",
Name: "Amazon",
@ -293,6 +312,21 @@ var blockedServices = []blockedService{{
"||mincdn.com^",
"||yo9.com^",
},
}, {
ID: "blizzard_entertainment",
Name: "Blizzard Entertainment",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 -32 128 128\"><path fill-rule=\"evenodd\" d=\"M105 2h3v1h2l2 1 1 1h3l1 1h4l1 1 2 2v1l1 3v4l1 2v6l-1 2v2l-1 3v2l-1 2v14l-1 2v1l-1 3-1 1h-3l-1 1h-6a5 5 0 0 0 1-6l2-1h-1l-1-3v-3a350 350 0 0 1 0-8l-1-3v-1l-1-1V9h1V6l-1-1-4-3Zm9 13v10h1v25a8 8 0 0 0 2-4l1-1 1-3V30l1-1v-2l1-1v-5l-1-2-2-3-1-1h-3Z\" clip-rule=\"evenodd\"/><path fill-rule=\"evenodd\" d=\"M101 24v1l2 1h1v2h1l1 2v5l1 2s0-1 0 0l1 7 1 2v7l-1 5h-2l-2-2-4-1 1-3 1-2a22 22 0 0 0-1-10l-1-4h-1l1-4-1-1-2-3v2l-1 1v3l1 6v4l1 1-1 3v4l1 1-1 2v4l-1-1a13 13 0 0 0-4-5l-2-2 2-5V27l-1-1v-4l-1-1v-5h-1a33 33 0 0 1 0-4l4-4h-2l-4-4h-1V3h10l2 1 2 1h1c2 0 2 1 3 2l2 3 1 3v1l-1 2v1a11 11 0 0 1-1 4l-4 3ZM96 9v13l1 1a3 3 0 0 0 1-1c1 0 2-1 2-3v-1l1-1v-3l-2-3-2-2h-1ZM26 3l1 1h1l2 3v5l1 1v2l-1 1v9l1 1 1 1-1 7v9l-1 1 1 1-1 1v8h3l1-1h7v-1h16v6l1 2h-6l-1-1h-2l-1-1H31a4 4 0 0 0-3-1l-1 1h-1l-1 1h-5l1-1a10 10 0 0 0 3-2v-9l1-1-1-1V35l1-1V21l-1-1v-4l1-1v-3l1-2-1-3h-1l-2-2-1-1 1-1h4Z\" clip-rule=\"evenodd\"/><path fill-rule=\"evenodd\" d=\"M84 60v-3l-1-2v-4l-3-2v-1l1-2a11 11 0 0 0 2-6l-1-1-3-2h-2v3l1 1h1l-1 2h-4l-2 1-2 1-1-2v-1l1-1 1-1 1-2v-5l1-1v-6l1-1v-3l1-1v-3l1-2 1-1-1-1 1-1 1-3 1-1V7l1-1c1-1 0-4 2-3l1 3 1 1 1 2v1l1 5 1 3v2l1 1v2l1 1v8l1 3v9l-1 1-2 5v3l-1 2v4l-1 1h-1Zm-4-36-1 1v2l-1 2v4l4 1h2v-7l-1-3-2-1-1-1v2Z\" clip-rule=\"evenodd\"/><path fill-rule=\"evenodd\" d=\"M77 4v1l-2 3v2l-1 2v1l-1 1-1 4v7h-1v2a5 5 0 0 1-1 2v2l-2 2v7l-1 2v2l-2 4v3-1h3v-1l3-1 1-1 3-2h3l1 1-1 1a3 3 0 0 0 0 1l1 1v5l-1 1h-7v-1h-2l-2 1h-4l-2 1-1-2v-2l1-1v-1l1-1-1-1 1-1v-2l1-2-1-2v-8l1-2 2-5-1-1 1-2v-1l1-1v-4l1-1 2-4v-2l1-1h-3V8h-1l-1 1-2 3-1 4h-1l-1-1v-2l1-1V4h16ZM32 4h9l1 2-3 2 1 2-1 1v13l1 2-1 2v6l-1 1v2l1 1v5l-1 1 1 2 1 1 2 1v2h-7l-2 1-1-1 3-2v-8a4 4 0 0 1 0-2l1-1v-3l-1-14v-2l1-1h-1V7l-2-1h-1l-1-1 1-1Zm12 0h14v15c-2 1-2 4-3 6v2c-1 0-3 1-2 4h-1l-2 3-1 2v3l-1 2-2 5h2l1-1h2l1-1c1-1 1-3 3-3l1-2 2-2h1l1 3h-1v1l-1 1v7h-8l-1 1-2-1h-3l-1-1 1-1v-3l-1-2 1-1-1-1 1-3v-2l1-2 1-3a7 7 0 0 1 2-4l1-4 2-2 2-3v-3h1l2-3V8l-3-1h-2l-1 1a3 3 0 0 0-2 3l-1 1v4l-1 1-1 1v-1l-1-1V4ZM17 22l1 1h1v3s0-1 0 0l2 1v5l1 2-1 8v3a6 6 0 0 1 0 2l-1 2-1 2-1 3-3 2-2 2-3 1-1-1-1 1H1l-1-1 2-1 1-4V26l1-1-1-3V11l1-1-1-1H2V8L1 7 0 6V5l1-1h15l1 1c2 0 3 1 3 2l1 3v6l-4 6Zm-6-11v9h1l1-2 2-1v-6h-1l-1-1h-2v1Zm0 19-1 1 1 2-1 3v9a2 2 0 0 0 0 1v6l-1 1 3-1 1-2h1v-4l1-4v-5l-1-1 1-3-1-1v-2s0 1 0 0v-1l-1-1a20 20 0 0 1-2-2v4Z\" clip-rule=\"evenodd\"/></svg>"),
Rules: []string{
"||battle.net^",
"||battlenet.com.cn^",
"||blizzard.cn^",
"||blizzardgames.cn^",
"||blz-contentstack.com^",
"||blzstatic.cn^",
"||bnet.163.com^",
"||bnet.cn^",
"||lizzard.com^",
},
}, {
ID: "cloudflare",
Name: "CloudFlare",
@ -329,6 +363,14 @@ var blockedServices = []blockedService{{
"||warp.plus^",
"||workers.dev^",
},
}, {
ID: "clubhouse",
Name: "Clubhouse",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 50 50\"><path d=\"M29.8 4a1 1 0 0 0-.92.7 1 1 0 0 0 .36 1.1 31.2 31.2 0 0 1 6 6.02 1 1 0 1 0 1.6-1.2 33.2 33.2 0 0 0-6.4-6.4A1 1 0 0 0 29.8 4Zm-7.16 1.06c-.46 0-.87.3-.99.74a1 1 0 0 0 .5 1.15 31.13 31.13 0 0 1 11.13 10.6 1 1 0 1 0 1.7-1.07A33.12 33.12 0 0 0 23.11 5.2a.96.96 0 0 0-.48-.14ZM14.5 7.01a3.42 3.42 0 0 0-3.27 2.28l-.26-.27A3.49 3.49 0 0 0 8.5 8.01c-.9 0-1.8.34-2.48 1.01a3.51 3.51 0 0 0-.57 4.17c-.52.15-1.01.42-1.43.84a3.52 3.52 0 0 0 0 4.94l.27.27c-.46.16-.9.41-1.27.79a3.52 3.52 0 0 0 0 4.94l.88.88 16.47 16.47a9.01 9.01 0 0 0 12.72 0l4.23-4.22a9.94 9.94 0 0 0 2.3-3.59l2.63-7.08a8.03 8.03 0 0 1 1.84-2.87l1.74-1.73 1-1a4.02 4.02 0 0 0 0-5.66 4.02 4.02 0 0 0-5.66 0l-1 1-.7.71-4.2 4.2a2.98 2.98 0 0 1-4.24 0L17.9 8.96l-.94-.94a3.49 3.49 0 0 0-2.47-1.01Zm0 1.98c.38 0 .76.15 1.06.45l.94.94 13.1 13.1a5.02 5.02 0 0 0 7.08 0l4.2-4.18.7-.71 1-1c.8-.8 2.05-.8 2.83 0 .8.79.8 2.04 0 2.83l-2.73 2.73a10.03 10.03 0 0 0-2.3 3.58l-2.63 7.08a8.02 8.02 0 0 1-1.84 2.87l-4.23 4.23a6.99 6.99 0 0 1-9.9 0L4.44 23.56a1.5 1.5 0 0 1 0-2.12c.59-.59 1.45-.55 2.08.08l.1.09 8.2 8.37a1 1 0 0 0 .97.29 1 1 0 0 0 .46-1.68l-9.52-9.73-.01-.01-1.28-1.29a1.5 1.5 0 0 1 0-2.12c.6-.6 1.47-.58 2.08.03l9.18 9.17a1 1 0 0 0 1.69-.43 1 1 0 0 0-.28-.98L9 14.13l-.06-.07-1.5-1.5c-.6-.6-.6-1.53 0-2.12a1.5 1.5 0 0 1 2.12 0L20.8 21.67a1 1 0 0 0 1.68-.44 1 1 0 0 0-.27-.97l-8.7-8.7-.06-.06a1.4 1.4 0 0 1-.01-2.06c.3-.3.68-.45 1.06-.45ZM4.23 32a1 1 0 0 0-.82 1.51c3 5.18 7.36 9.46 12.59 12.37a1 1 0 0 0 1.51-.89 1 1 0 0 0-.54-.86A31.16 31.16 0 0 1 5.15 32.5a1.01 1.01 0 0 0-.92-.51Z\"/></svg>"),
Rules: []string{
"||clubhouse.com^",
"||clubhouseapi.com^",
},
}, {
ID: "crunchyroll",
Name: "Crunchyroll",
@ -736,6 +778,18 @@ var blockedServices = []blockedService{{
"||xxbay.com^",
"||yibei.org^",
},
}, {
ID: "electronic_arts",
Name: "Electronic Arts",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 1000 1000\"><path d=\"M500 1000C224.3 1000 0 775.7 0 500S224.3 0 500 0s500 224.3 500 500-224.3 500-500 500zm84.63-693.4H302.05l-42.87 68.9h282.25zm57.75.66L469.63 582.33H278.02l44.2-68.96h114.85l43.87-68.93h-265.5l-43.86 68.93h62.9L147.2 651.05h364.2L645.9 438.9l49.05 74.46h-44.23l-41.88 68.96H739.8l45.48 68.72h83.54z\"/></svg>"),
Rules: []string{
"||ea.com^",
"||eamobile.com^",
"||easports.com^",
"||nearpolar.com^",
"||swtor.com^",
"||tnt-ea.com^",
},
}, {
ID: "epic_games",
Name: "Epic Games",
@ -1412,6 +1466,28 @@ var blockedServices = []blockedService{{
"||lineshoppingseller.com^",
"||linetv.tw^",
},
}, {
ID: "linkedin",
Name: "LinkedIn",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 50 50\"><path d=\"M41,4H9C6.24,4,4,6.24,4,9v32c0,2.76,2.24,5,5,5h32c2.76,0,5-2.24,5-5V9C46,6.24,43.76,4,41,4z M17,20v19h-6V20H17z M11,14.47c0-1.4,1.2-2.47,3-2.47s2.93,1.07,3,2.47c0,1.4-1.12,2.53-3,2.53C12.2,17,11,15.87,11,14.47z M39,39h-6c0,0,0-9.26,0-10 c0-2-1-4-3.5-4.04h-0.08C27,24.96,26,27.02,26,29c0,0.91,0,10,0,10h-6V20h6v2.56c0,0,1.93-2.56,5.81-2.56 c3.97,0,7.19,2.73,7.19,8.26V39z\"/></svg>"),
Rules: []string{
"||bizographics.com^",
"||cs1404.wpc.epsiloncdn.net^",
"||cs767.wpc.epsiloncdn.net^",
"||l-0005.dc-msedge.net^",
"||l-0005.l-dc-msedge.net^",
"||l-0005.l-msedge.net^",
"||l-0015.l-msedge.net^",
"||licdn.cn^",
"||licdn.com^",
"||linkedin.at^",
"||linkedin.be^",
"||linkedin.cn^",
"||linkedin.com^",
"||linkedin.nl^",
"||linkedin.qtlcdn.com^",
"||lnkd.in^",
},
}, {
ID: "mail_ru",
Name: "Mail.ru",
@ -1454,7 +1530,6 @@ var blockedServices = []blockedService{{
"||masto.pt^",
"||mastodon.au^",
"||mastodon.bida.im^",
"||mastodon.com.tr^",
"||mastodon.eus^",
"||mastodon.green^",
"||mastodon.ie^",
@ -1470,6 +1545,7 @@ var blockedServices = []blockedService{{
"||mastodon.social^",
"||mastodon.uno^",
"||mastodon.world^",
"||mastodon.zaclys.com^",
"||mastodonapp.uk^",
"||mastodonners.nl^",
"||mastodont.cat^",
@ -1480,11 +1556,11 @@ var blockedServices = []blockedService{{
"||metalhead.club^",
"||mindly.social^",
"||mstdn.ca^",
"||mstdn.jp^",
"||mstdn.party^",
"||mstdn.plus^",
"||mstdn.social^",
"||muenchen.social^",
"||muenster.im^",
"||nerdculture.de^",
"||noc.social^",
"||norden.social^",
@ -1513,13 +1589,13 @@ var blockedServices = []blockedService{{
"||techhub.social^",
"||theblower.au^",
"||tkz.one^",
"||todon.eu^",
"||toot.aquilenet.fr^",
"||toot.community^",
"||toot.funami.tech^",
"||toot.io^",
"||toot.wales^",
"||troet.cafe^",
"||twingyeo.kr^",
"||union.place^",
"||universeodon.com^",
"||urbanists.social^",
@ -1566,6 +1642,44 @@ var blockedServices = []blockedService{{
"||nflxso.net^",
"||nflxvideo.net^",
},
}, {
ID: "nintendo",
Name: "Nintendo",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 50 50\"><path d=\"M6 7v36h12.6V21.75l13 20.78.27.47H44V7H31.4v1l.04 20.22L18.5 7.47 18.22 7Zm2 2h9.1l14.5 23.22 1.84 3v-3.5L33.4 9H42v32h-9L18.44 17.75l-1.85-2.94V41H8Z\"/></svg>"),
Rules: []string{
"||nintendo-europe.com^",
"||nintendo.be^",
"||nintendo.co.jp^",
"||nintendo.co.uk^",
"||nintendo.com.au^",
"||nintendo.com^",
"||nintendo.de^",
"||nintendo.es^",
"||nintendo.eu^",
"||nintendo.fr^",
"||nintendo.it^",
"||nintendo.jp^",
"||nintendo.net^",
"||nintendo.nl^",
"||nintendoswitch.cn^",
"||nintendowifi.net^",
},
}, {
ID: "nvidia",
Name: "Nvidia",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 48 48\"><path d=\"M20 8a2 2 0 0 0-2 2v2.55l.84-.05c10.76-.37 17.78 8.82 17.78 8.82s-8.05 9.8-16.44 9.8c-.73 0-1.47-.07-2.18-.19v-2.2c.73.23 1.52.35 2.3.35 5.88 0 11.35-7.6 11.35-7.6s-5.07-6.91-12.81-6.66l-.82.03v-2.3c-9.49.77-17.68 8.8-17.68 8.8S4.97 34.76 18 35.98v-2.44c.59.07 1.22.12 1.81.12 7.82 0 13.47-3.99 18.94-8.7.91.73 4.62 2.49 5.4 3.26-5.2 4.36-17.33 7.86-24.2 7.86-.66 0-1.32-.03-1.95-.1V38c0 1.1.9 2 2 2h25a2 2 0 0 0 2-2V10a2 2 0 0 0-2-2H20zm-2 6.86v2.82a11.8 11.8 0 0 1 1.57-.07c4.95 0 7.9 3.85 7.9 3.85l-4.03 3.39c-1.8-3.02-2.43-4.35-5.44-4.7v8.57c-4.06-1.38-5.4-6.14-5.4-6.14s2.37-2.83 5.38-2.46H18v-2.44a15.66 15.66 0 0 0-9.22 4.46s2 7.52 9.22 8.8v2.6c-9.56-1.17-12.82-11.7-12.82-11.7s4.27-6.3 12.82-6.97z\"/></svg>"),
Rules: []string{
"||geforce.com^",
"||geforcenow.com^",
"||nvidia.cn^",
"||nvidia.com.global.ogslb.com^",
"||nvidia.com^",
"||nvidia.eu^",
"||nvidia.partners^",
"||nvidiagrid.net^",
"||nvidianews.com^",
"||tegrazone.com^",
},
}, {
ID: "ok",
Name: "OK.ru",
@ -1964,6 +2078,16 @@ var blockedServices = []blockedService{{
"||twvid.com^",
"||vine.co^",
},
}, {
ID: "ubisoft",
Name: "Ubisoft",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 32 32\"><path d=\"M15.22 3C7.14 3 3.66 10.18 3.66 10.18l1.03.74s-1.3 2.45-1.26 5.6A12.5 12.5 0 0 0 16.08 29a12.5 12.5 0 0 0 12.49-12.46c0-9-6.98-13.54-13.35-13.54zm.07 2.2c6.3 0 11.2 5.07 11.2 10.98 0 6.27-4.71 10.62-10.2 10.62-4.04 0-7.69-3.08-7.69-7.3a5.8 5.8 0 0 1 2.75-5.03l.21.23a6.37 6.37 0 0 0-1.53 3.91c0 3.32 2.6 5.62 5.88 5.62 4.18 0 6.97-3.56 6.97-7.7 0-4.81-4.25-8.9-9.36-8.9a11.1 11.1 0 0 0-6.61 2.3l-.21-.2a10.07 10.07 0 0 1 8.59-4.54zM13.4 9.8c3.26 0 6.44 2.15 7.24 5.22l-.3.1a8.35 8.35 0 0 0-6.52-3.44c-5.08 0-7.75 4.62-7.36 8.47l-.3.12s-.56-1.24-.56-2.71a7.8 7.8 0 0 1 7.8-7.76zm2.15 5.33a2.77 2.77 0 0 1 2.78 2.74c0 1.23-.79 1.96-.79 1.96l.94.65s-.93 1.46-2.82 1.46a3.4 3.4 0 0 1-.1-6.8z\"/></svg>"),
Rules: []string{
"||ubi.com^",
"||ubisoft.com^",
"||ubisoft.org^",
"||ubisoftconnect.com^",
},
}, {
ID: "valorant",
Name: "Valorant",

2
internal/tools/go.mod
View File

@ -11,7 +11,7 @@ require (
github.com/securego/gosec/v2 v2.16.0
github.com/uudashr/gocognit v1.0.6
golang.org/x/tools v0.10.0
golang.org/x/vuln v0.1.0
golang.org/x/vuln v0.2.0
honnef.co/go/tools v0.4.3
mvdan.cc/gofumpt v0.5.0
mvdan.cc/unparam v0.0.0-20230610194454-9ea02bef9868

5
internal/tools/go.sum
View File

@ -1,6 +1,5 @@
github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
@ -99,8 +98,8 @@ golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E
golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4=
golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg=
golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
golang.org/x/vuln v0.1.0 h1:9GRdj6wAIkDrsMevuolY+SXERPjQPp2P1ysYA0jpZe0=
golang.org/x/vuln v0.1.0/go.mod h1:/YuzZYjGbwB8y19CisAppfyw3uTZnuCz3r+qgx/QRzU=
golang.org/x/vuln v0.2.0 h1:Dlz47lW0pvPHU7tnb10S8vbMn9GnV2B6eyT7Tem5XBI=
golang.org/x/vuln v0.2.0/go.mod h1:V0eyhHwaAaHrt42J9bgrN6rd12f6GU4T0Lu0ex2wDg4=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=