Pull request 1748: upd-all

Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit 7014e76 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Feb 21 17:57:35 2023 +0300 all: upd i18n, filters, trackers, services, tools
heyxkhoa · Feb 21, 2023 · 76a513c · 76a513c
1 parent ff9b24a
commit 76a513c
Show file tree

Hide file tree

Showing 10 changed files with 209 additions and 41 deletions.
diff --git a/client/src/__locales/tr.json b/client/src/__locales/tr.json
@@ -449,7 +449,7 @@
     "access_disallowed_title": "İzin verilmeyen istemciler",
     "access_disallowed_desc": "CIDR'lerin, IP adreslerinin veya <a>İstemci Kimliklerin</a> listesi. Bu listede girişler varsa, AdGuard Home bu istemcilerden gelen istekleri keser. İzin verilen istemcilerde girişler varsa, bu alan yok sayılır.",
     "access_blocked_title": "İzin verilmeyen alan adları",
-    "access_blocked_desc": "Bu işlem filtrelerle ilgili değildir. AdGuard Home, bu alan adlarından gelen DNS sorgularını yanıtsız bırakır ve bu sorgular sorgu günlüğünde görünmez. Tam alan adlarını, joker karakterleri veya URL filtre kurallarını belirtebilirsiniz, ör. \"example.org\", \"*.example.org\" veya \"||example.org^\".",
+    "access_blocked_desc": "Bu işlem filtrelerle ilgili değildir. AdGuard Home, bu alan adlarından gelen DNS sorgularını yanıtsız bırakır ve bu sorgular sorgu günlüğünde görünmez. Tam alan adlarını, joker karakterleri veya URL filtre kurallarını belirtebilirsiniz, örn. \"example.org\", \"*.example.org\" veya \"||example.org^\".",
     "access_settings_saved": "Erişim ayarları başarıyla kaydedildi!",
     "updates_checked": "AdGuard Home'un yeni bir sürümü mevcut",
     "updates_version_equal": "AdGuard Home yazılımı güncel durumda",

diff --git a/client/src/__locales/zh-cn.json b/client/src/__locales/zh-cn.json
@@ -172,7 +172,7 @@
     "list_url_table_header": "清单网址",
     "rules_count_table_header": "规则数",
     "last_time_updated_table_header": "上次更新时间",
-    "actions_table_header": "活跃状态",
+    "actions_table_header": "操作",
     "request_table_header": "请求",
     "edit_table_action": "编辑",
     "delete_table_action": "删除",

diff --git a/client/src/helpers/filters/filters.js b/client/src/helpers/filters/filters.js
@@ -101,7 +101,7 @@ export default {
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_13.txt"
         },
         "POL_polish_filters_for_pi_hole": {
-            "name": "POL: Polish filters for Pi hole",
+            "name": "POL: Polish filters for Pi-hole",
             "categoryId": "regional",
             "homepage": "https://www.certyficate.it/",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_14.txt"

diff --git a/client/src/helpers/trackers/trackers.json b/client/src/helpers/trackers/trackers.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-02-09T12:31:34.007Z",
+    "timeUpdated": "2023-02-21T12:46:33.324Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",
@@ -6772,55 +6772,64 @@
             "name": "Facebook",
             "categoryId": 4,
             "url": "https://www.facebook.com",
-            "companyId": "facebook"
+            "companyId": "meta",
+            "source": "AdGuard"
         },
         "facebook_beacon": {
             "name": "Facebook Beacon",
             "categoryId": 7,
             "url": "http://www.facebook.com/beacon/faq.php",
-            "companyId": "facebook"
+            "companyId": "meta",
+            "source": "AdGuard"
         },
         "facebook_cdn": {
             "name": "Facebook CDN",
             "categoryId": 9,
             "url": "https://www.facebook.com",
-            "companyId": "facebook"
+            "companyId": "meta",
+            "source": "AdGuard"
         },
         "facebook_connect": {
             "name": "Facebook Connect",
             "categoryId": 6,
             "url": "https://developers.facebook.com/connect.php",
-            "companyId": "facebook"
+            "companyId": "meta",
+            "source": "AdGuard"
         },
         "facebook_conversion_tracking": {
             "name": "Facebook Conversion Tracking",
             "categoryId": 4,
             "url": "http://www.facebook.com/",
-            "companyId": "facebook"
+            "companyId": "meta",
+            "source": "AdGuard"
         },
         "facebook_custom_audience": {
             "name": "Facebook Custom Audience",
             "categoryId": 4,
             "url": "https://www.facebook.com",
-            "companyId": "facebook"
+            "companyId": "meta",
+            "source": "AdGuard"
         },
         "facebook_graph": {
             "name": "Facebook Social Graph",
             "categoryId": 7,
             "url": "https://developers.facebook.com/docs/reference/api/",
-            "companyId": "facebook"
+            "companyId": "meta",
+            "source": "AdGuard"
         },
         "facebook_impressions": {
             "name": "Facebook Impressions",
             "categoryId": 4,
             "url": "https://www.facebook.com/",
-            "companyId": "facebook"
+            "companyId": "meta",
+            "source": "AdGuard"
         },
         "facebook_social_plugins": {
             "name": "Facebook Social Plugins",
             "categoryId": 7,
             "url": "https://developers.facebook.com/plugins",
-            "companyId": "facebook"
+            "companyId": "meta",
+            "source": "AdGuard"
         },
         "facetz.dca": {
             "name": "Facetz.DCA",
@@ -8909,7 +8918,8 @@
             "name": "Instagram",
             "categoryId": 8,
             "url": "https://www.facebook.com/",
-            "companyId": "facebook"
+            "companyId": "meta",
+            "source": "AdGuard"
         },
         "instant_check_mate": {
             "name": "Instant Check Mate",
@@ -19240,7 +19250,7 @@
             "name": "Facebook Audience Network",
             "categoryId": 4,
             "url": "https://www.facebook.com/business/products/audience-network",
-            "companyId": "facebook",
+            "companyId": "meta",
             "source": "AdGuard"
         },
         "crashlytics": {
@@ -19264,6 +19274,13 @@
             "companyId": null,
             "source": "AdGuard"
         },
+        "gmail": {
+            "name": "Gmail",
+            "categoryId": 13,
+            "url": "https://mail.google.com/",
+            "companyId": "google",
+            "source": "AdGuard"
+        },
         "google_trust_services": {
             "name": "Google Trust Services",
             "categoryId": 5,
@@ -19292,6 +19309,20 @@
             "companyId": "branch_metrics_inc",
             "source": "AdGuard"
         },
+        "telstra": {
+            "name": "Telstra",
+            "categoryId": 8,
+            "url": "https://www.telstra.com.au/",
+            "companyId": "telstra",
+            "source": "AdGuard"
+        },
+        "medialab": {
+            "name": "MediaLab.AI Inc.",
+            "categoryId": 8,
+            "url": "https://medialab.la/",
+            "companyId": "medialab",
+            "source": "AdGuard"
+        },
         "qualcomm": {
             "name": "Qualcomm",
             "categoryId": 8,
@@ -19306,13 +19337,34 @@
             "companyId": "solaredge",
             "source": "AdGuard"
         },
+        "sectigo": {
+            "name": "Sectigo Limited",
+            "categoryId": 5,
+            "url": "https://www.solaredge.com/",
+            "companyId": "sectigo",
+            "source": "AdGuard"
+        },
         "element": {
             "name": "Element",
             "categoryId": 7,
             "url": "https://element.io/",
             "companyId": "element",
             "source": "AdGuard"
         },
+        "oztam": {
+            "name": "OzTAM",
+            "categoryId": 8,
+            "url": "https://oztam.com.au/",
+            "companyId": "oztam",
+            "source": "AdGuard"
+        },
+        "oppo": {
+            "name": "OPPO",
+            "categoryId": 101,
+            "url": "https://www.oppo.com/",
+            "companyId": "oppo",
+            "source": "AdGuard"
+        },
         "outlook": {
             "name": "Microsoft Outlook",
             "categoryId": 13,
@@ -19355,6 +19407,13 @@
             "companyId": "lets_encrypt",
             "source": "AdGuard"
         },
+        "kik": {
+            "name": "Kik",
+            "categoryId": 7,
+            "url": "https://kik.com/",
+            "companyId": "kik",
+            "source": "AdGuard"
+        },
         "plex": {
             "name": "Plex",
             "categoryId": 0,
@@ -19368,6 +19427,34 @@
             "url": "https://matrix.org/",
             "companyId": "matrix",
             "source": "AdGuard"
+        },
+        "ntppool": {
+            "name": "Network Time Protocol",
+            "categoryId": 5,
+            "url": "https://ntp.org/",
+            "companyId": "ntppool",
+            "source": "AdGuard"
+        },
+        "whatsapp": {
+            "name": "WhatsApp",
+            "categoryId": 8,
+            "url": "https://www.whatsapp.com/",
+            "companyId": "meta",
+            "source": "AdGuard"
+        },
+        "vscode": {
+            "name": "Visual Studio Code",
+            "categoryId": 8,
+            "url": "https://code.visualstudio.com/",
+            "companyId": "microsoft",
+            "source": "AdGuard"
+        },
+        "msedge": {
+            "name": "Microsoft Edge",
+            "categoryId": 8,
+            "url": "https://www.microsoft.com/en-us/edge",
+            "companyId": "microsoft",
+            "source": "AdGuard"
         }
     },
     "trackerDomains": {
@@ -23698,10 +23785,24 @@
         "zwaar.net": "zwaar",
         "zwaar.org": "zwaar",
         "extend.tv": "zypmedia",
+        "whatsapp.net": "whatsapp",
+        "whatsapp.com": "whatsapp",
+        "telstra.com.au": "telstra",
+        "telstra.com": "telstra",
         "slack.com": "slack",
         "slackb.com": "slack",
         "slack-edge.com": "slack",
         "slack-imgs.com": "slack",
+        "addlive.io": "snap",
+        "feelinsonice.com": "snap",
+        "sc-cdn.net": "snap",
+        "sc-corp.net": "snap",
+        "sc-gw.com": "snap",
+        "sc-jpl.com": "snap",
+        "sc-prod.net": "snap",
+        "snap-dev.net": "snap",
+        "snapads.com": "snap",
+        "snapkit.com": "snap",
         "adguard.app": "adguard",
         "adguard.io": "adguard",
         "adguard.org": "adguard",
@@ -23710,41 +23811,80 @@
         "adguard-vpn.com": "adguard",
         "adguardvpn.com": "adguard",
         "adguard-vpn.online": "adguard",
+        "oppomobile.com": "oppo",
+        "heytapmobi.com": "oppo",
+        "heytapmobile.com": "oppo",
+        "heytapdl.com": "oppo",
+        "allawnos.com": "oppo",
+        "allawntech.com": "oppo",
         "nflximg.com": "netflix",
         "element.io": "element",
         "riot.im": "element",
+        "gvt1.com": "google_servers",
+        "gvt2.com": "google_servers",
+        "gvt3.com": "google_servers",
         "akadns.net": "akamai_technologies",
         "akamaiedge.net": "akamai_technologies",
+        "akaquill.net": "akamai_technologies",
+        "me.com": "apple",
         "apple.news": "apple",
         "apple-dns.net": "apple",
         "aaplimg.com": "apple",
         "icloud.com": "apple",
+        "itunes.com": "apple",
         "icloud-content.com": "apple",
+        "kik.com": "kik",
+        "apikik.com": "kik",
+        "kik-live.com": "kik",
         "mzstatic.com": "apple",
+        "cdn-apple.com": "apple",
+        "apple-mapkit.com": "apple",
+        "icons.axm-usercontent-apple.com": "apple",
+        "apple-cloudkit.com": "apple",
+        "apzones.com": "apple",
+        "apple-livephotoskit.com": "apple",
+        "safebrowsing.apple": "apple",
+        "safebrowsing.g.applimg.com": "apple",
         "matrix.org": "matrix",
-        "l-msedge.net": "microsoft",
+        "medialab.la": "medialab",
+        "media-lab.ai": "medialab",
+        "phicdn.net": "digicert_trust_seal",
+        "e-msedge.net": "msedge",
+        "l-msedge.net": "msedge",
+        "exp-tas.com": "vscode",
+        "vscode-unpkg.net": "vscode",
+        "v0cdn.net": "vscode",
+        "vscode-cdn.net": "vscode",
         "iadsdk.apple.com": "apple_ads",
         "showrss.info": "showrss",
+        "sectigo.com": "sectigo",
         "solaredge.com": "solaredge",
         "crashlytics.com": "crashlytics",
+        "cloudflare-dns.com": "cloudflare",
         "flurry.com": "flurry",
         "hockeyapp.net": "hockeyapp",
         "app-measurement.com": "firebase",
         "appmetrica.yandex.com": "yandex_appmetrica",
         "letsencrypt.org": "lets_encrypt",
         "lencr.org": "lets_encrypt",
+        "oztam.com.au": "oztam",
         "mobileapptracking.com": "branch",
+        "ntp.org": "ntppool",
+        "ntppool.org": "ntppool",
         "plex.tv": "plex",
         "plex.direct": "plex",
         "edgecastcdn.net": "markmonitor",
         "appcenter.ms": "appcenter",
         "unityads.unity3d.com": "unity_ads",
+        "usertrust.com": "trustlogo",
         "azure.com": "azure",
         "trafficmanager.net": "azure",
         "hotmail.com": "outlook",
+        "outlook.com": "outlook",
         "bttn.io": "button",
         "pki.goog": "google_trust_services",
         "xtracloud.net": "qualcomm",
-        "qualcomm.com": "qualcomm"
+        "qualcomm.com": "qualcomm",
+        "gmail.com": "gmail"
     }
 }
diff --git a/go.mod b/go.mod
@@ -51,16 +51,16 @@ require (
 	github.com/josharian/native v1.1.0 // indirect
 	github.com/mdlayher/packet v1.1.1 // indirect
 	github.com/mdlayher/socket v0.4.0 // indirect
-	github.com/onsi/ginkgo/v2 v2.8.1 // indirect
+	github.com/onsi/ginkgo/v2 v2.8.3 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pierrec/lz4/v4 v4.1.17 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
-	github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
-	github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
-	github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
+	github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
+	github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
+	github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
 	golang.org/x/mod v0.8.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
 	golang.org/x/text v0.7.0 // indirect