fixed None encode

J-A-A-M · Jan 7, 2025 · 7d626fe · 7d626fe
1 parent 49c6d6e
commit 7d626fe
Showing 1 changed file with 6 additions and 2 deletions.
diff --git 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")