From 7d626fef5f044fa455bd12db9d2c9bd727d4f06b Mon Sep 17 00:00:00 2001 From: v00g100skr Date: Tue, 7 Jan 2025 21:50:06 +0200 Subject: [PATCH] fixed None encode --- deploy/websocket_server/websocket_server.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/deploy/websocket_server/websocket_server.py b/deploy/websocket_server/websocket_server.py index 9a239e7e..a0220fa5 100644 --- a/deploy/websocket_server/websocket_server.py +++ b/deploy/websocket_server/websocket_server.py @@ -238,8 +238,8 @@ async def echo(websocket, path): return country = websocket.request_headers.get("cf-ipcountry", None) - region = websocket.request_headers.get("cf-region", None).encode("utf-8", "ignore").decode("utf-8") - city = websocket.request_headers.get("cf-ipcity", None).encode("utf-8", "ignore").decode("utf-8") + region = websocket.request_headers.get("cf-region", None) + city = websocket.request_headers.get("cf-ipcity", None) timezone = websocket.request_headers.get("cf-timezone", None) if not country or not region or not city or not timezone: @@ -255,6 +255,10 @@ async def echo(websocket, path): country = country or "not-found" timezone = timezone or "not-found" + country = country.encode("utf-8", "ignore").decode("utf-8") + region = region.encode("utf-8", "ignore").decode("utf-8") + city = city.encode("utf-8", "ignore").decode("utf-8") + # if response.country.iso_code != 'UA' and response.continent.code != 'EU': # shared_data.blocked_ips.append(client_ip) # logger.warning(f"{client_ip}_{client_port} !!! BLOCKED")