From 68ccd2abf9cbf5119f38e00b049cbf507612014d Mon Sep 17 00:00:00 2001 From: Sascha Leib Date: Thu, 30 Oct 2025 19:15:41 +0100 Subject: [PATCH] Small updates --- admin.css | 1 + admin.js | 12 ++++++++++-- config/known-ipranges.json | 2 ++ img/captcha.png | Bin 3779 -> 4104 bytes 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/admin.css b/admin.css index 5eb87dc..c50d2ee 100644 --- a/admin.css +++ b/admin.css @@ -123,6 +123,7 @@ &.cap_H::before { background-position-y: -80px } &.cap_X::before { background-position-y: -100px } &.cap_YH::before { background-position-y: -120px } + &.cap_YNH::before { background-position-y: -140px } /* Country flags */ /* Note: flag images and CSS adapted from: https://github.com/lafeber/world-flags-sprite/ */ diff --git a/admin.js b/admin.js index a75a3c2..608225c 100644 --- a/admin.js +++ b/admin.js @@ -730,7 +730,11 @@ BotMon.live = { } else if (v._type == BM_USERTYPE.LIKELY_BOT) { /* probable bots only */ // add bot views to IP range information: - me.addToIpRanges(v); + if (v.ip) { + me.addToIpRanges(v); + } else { + console.log(v); + } } else { /* registered users and probable humans */ @@ -1864,8 +1868,12 @@ BotMon.live = { } logtxt.split('\n').forEach((line) => { - if (line.trim() === '') return; // skip empty lines + + const line2 = line.replaceAll(new RegExp('[\x00-\x1F]','g'), "\u{FFFD}").trim(); + if (line2 === '') return; // skip empty lines + const cols = line.split('\t'); + if (cols.length == 1) return // assign the columns to an object: const data = {}; diff --git a/config/known-ipranges.json b/config/known-ipranges.json index ff4b503..11449a3 100644 --- a/config/known-ipranges.json +++ b/config/known-ipranges.json @@ -9,6 +9,7 @@ {"id": "cloudflare", "name": "Cloudflare Network"}, {"id": "cnisp", "name": "China ISP Range"}, {"id": "cnmob", "name": "China Mobile"}, + {"id": "domtehniki", "name": "Dom Tehniki / WS Telecom"}, {"id": "google", "name": "Google LLC Network"}, {"id": "hetzner", "name": "Hetzner US"}, {"id": "huawei", "name": "Huawei Network"}, @@ -72,6 +73,7 @@ {"from": "138.121.0.0", "to": "138.121.225.254", "m": 16, "g": "misc_sa"}, {"from": "142.147.128.0", "to": "1142.147.255.254", "m": 17, "g": "w2obj"}, {"from": "146.174.128.0", "to": "146.174.191.254", "m": 18, "g": "huawei"}, + {"from": "149.126.192.0", "to": "149.126.223.255", "m": 19, "g": "domtehniki"}, {"from": "149.232.128.0", "to": "149.232.159.254", "m": 19, "g": "huawei"}, {"from": "150.40.128.0", "to": "150.40.255.254", "m": 17, "g": "huawei"}, {"from": "159.138.0.0", "to": "159.138.225.254", "m": 16, "g": "huawei"}, diff --git a/img/captcha.png b/img/captcha.png index c6a8dadb7f980d91a023fe80137c2d1a8fd22053..4ba51c6ac8fd70bff903c5b108a51d01288ae240 100644 GIT binary patch delta 3840 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 nBefI{Qxjn$ZOtorfJ)`R2G8@S-v3