diff --git a/admin.css b/admin.css index b791ccd..3d650d2 100644 --- a/admin.css +++ b/admin.css @@ -105,6 +105,7 @@ &.cl_goognblm::before { background-position-y: -440px } &.cl_chatgpt::before { background-position-y: -460px } &.cl_meta::before { background-position-y: -480px } + &.cl_yahoolp::before { background-position-y: -500px } &.cl_other::before { background-image: url('img/more.svg') } /* Country flags */ diff --git a/config/known-bots.json b/config/known-bots.json index 0dcede8..23bc2b2 100644 --- a/config/known-bots.json +++ b/config/known-bots.json @@ -41,7 +41,7 @@ "url": "http://www.apple.com/go/applebot" }, {"id": "baidu", - "n": "Baidu", "geo": "CN", + "n": "Baidu Spiders", "geo": "CN", "r": ["Baiduspider", "Baiduspider-image", "Baiduspider-video", "Baiduspider-news", "Baiduspider-favo", "Baiduspider-cpro", "Baiduspider-ads", "Baiduspider-render"], "rx": ["Baiduspider"], "url": "http://www.baidu.com/search/spider.html" diff --git a/config/known-clients.json b/config/known-clients.json index a43fbeb..51b001f 100644 --- a/config/known-clients.json +++ b/config/known-clients.json @@ -63,7 +63,7 @@ "id": "oldedge", "rx": [ "\\sEdg\\/([7-9]\\d)\\.", "\\sEdge\\/([7-9]\\d)\\.", "EdgiOS\\/([7-9]\\d)\\." ] }, - {"n": "Old Chrome", + {"n": "Chrome Old", "id": "chromeold", "rx": [ "\\sChrome\\/(\\d\\d\\.\\d+)[\\.\\s;]" ] }, @@ -99,20 +99,24 @@ "id": "goognblm", "rx": ["Google-NotebookLM"] }, - {"n": "ChatGPT", + {"n": "ChatGPT User", "id": "chatgpt", "rx": ["ChatGPT-User\\/(\\d\\.\\d)"] }, - {"n": "Meta Apps", + {"n": "Meta Apps (User)", "id": "meta", "rx": ["facebookexternalhit\\/(\\d\\.\\d)", "meta-externalfetcher\\/(\\d\\.\\d)"] }, + {"n": "Yahoo! Link Preview", + "id": "yahoolp", + "rx": ["Yahoo Link Preview;"] + }, {"n": "Undici-based crawler", "id": "undici", "rx": ["undici"] }, - {"n": "Go HTTP crawler", + {"n": "GoHTTP-based crawler", "id": "gohttp", "rx": ["Go\\-http\\-client\\/(\\d+)", "quic\\-go\\-HTTP\\/(\\d+)"] } -] +] \ No newline at end of file diff --git a/config/known-ipranges.json b/config/known-ipranges.json index d087bc2..7538626 100644 --- a/config/known-ipranges.json +++ b/config/known-ipranges.json @@ -2,14 +2,12 @@ "groups": [ {"id": "alibaba", "name": "Alibaba"}, {"id": "amazon", "name": "Amazon DS"}, - {"id": "amazon-microsoft", "name": "Amazon or Microsoft"}, {"id": "brasilnet", "name": "BrasilNet"}, {"id": "charter", "name": "Charter Inc."}, {"id": "chinanet", "name": "Chinanet"}, {"id": "cnisp", "name": "China ISP"}, {"id": "cnmob", "name": "China Mobile"}, {"id": "google", "name": "Google LLC"}, - {"id": "google-amazon", "name": "Google or Amazon"}, {"id": "hetzner", "name": "Hetzner US"}, {"id": "huawei", "name": "Huawei"}, {"id": "misc_sa", "name": "Misc. SA ISPs"}, @@ -28,7 +26,9 @@ {"from": "14.192.0.0", "to": "14.255.255.254", "m": 10, "g": "vnpt"}, {"from": "14.224.0.0", "to": "24.255.255.254", "m": 11, "g": "vnpt"}, {"from": "27.106.0.0", "to": "27.106.127.254", "m": 17, "g": "huawei"}, - {"from": "34.0.0.0", "to": "34.255.255.254", "m": 8, "g": "google-amazon"}, + {"from": "34.0.0.0", "to": "34.127.255.254", "m": 9, "g": "google"}, + {"from": "34.128.0.0", "to": "34.191.255.254", "m": 10, "g": "google"}, + {"from": "34.192.0.0", "to": "34.255.255.254", "m": 10, "g": "amazon"}, {"from": "39.64.0.0", "to": "39.95.255.254", "g": "cnmob"}, {"from": "43.132.0.0", "to": "43.132.255.254", "m": 16, "g": "tencent"}, {"from": "43.133.0.0", "to": "43.133.255.254", "m": 16, "g": "tencent"}, @@ -36,9 +36,12 @@ {"from": "45.0.0.0", "to": "45.255.255.254", "m": 10, "g": "amazon"}, {"from": "46.250.160.0", "to": "46.250.191.254", "m": 19, "g": "huawei"}, {"from": "47.74.0.0", "to": "47.127.255.254", "m": 10, "g": "alibaba"}, + {"from": "47.128.0.0", "to": "47.131.255.254", "m": 14, "g": "amazon"}, {"from": "47.200.0.0", "to": "47.203.255.254", "m": 14, "g": "frontier"}, {"from": "49.0.192.0", "to": "49.0.255.254", "m": 18, "g": "huawei"}, - {"from": "52.0.0.0", "to": "52.255.255.254", "m": 8, "g": "amazon-microsoft"}, + {"from": "52.0.0.0", "to": "52.63.255.254", "m": 10, "g": "amazon"}, + {"from": "52.64.0.0", "to": "52.95.255.254", "m": 11, "g": "amazon"}, + {"from": "52.96.0.0", "to": "52.127.255.254", "m": 11, "g": "microsoft"}, {"from": "54.0.0.0", "to": "54.255.255.254", "m": 8, "g": "amazon"}, {"from": "66.249.64.0", "to": "66.249.95.254", "m": 19, "g": "google"}, {"from": "84.37.35.0", "to": "84.37.255.254", "g": "gtt"}, diff --git a/img/clients.png b/img/clients.png index 503f1b0..e1d6965 100644 Binary files a/img/clients.png and b/img/clients.png differ