From cd3043ab03565b8d1e261306d0d2d1691a2eddab Mon Sep 17 00:00:00 2001 From: meltland Date: Sat, 12 Apr 2025 14:00:13 -0400 Subject: typing i hope --- main.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/main.py b/main.py index f4e1be3..e840229 100644 --- a/main.py +++ b/main.py @@ -111,7 +111,7 @@ class util: if i not in gets: return "malformedJson" if type(gets[i]) in [str, dict, list]: - if len(gets[i]) not in expects[i]: + if len(gets[i]) not in expects[i]["range"] or type(gets[i]) not in expects[i]["types"]: return "lengthInvalid" return True @@ -212,7 +212,7 @@ async def handler(websocket): await websocket.send(util.error("malformedJson", listener)) continue if r["command"] == "register": - fc = util.field_check({"username": range(1,21), "password": range(8,256), "invite_code": range(16,17)}, r) + fc = util.field_check({"username": {"range": range(1,21), "types": [str]}, "password": {"range": range(8,256), "types": [str]}, "invite_code": {"range": range(16,17), "types": [str]}}, r) if fc != True: await websocket.send(util.error(fc, listener)) continue @@ -263,7 +263,7 @@ async def handler(websocket): invite_codes.remove(r["invite_code"]) await websocket.send(json.dumps({"error": False, "token": data["secure"]["token"], "listener": listener})) elif r["command"] == "login_pswd": - fc = util.field_check({"username": range(1,21), "password": range(8,256)}, r) + fc = util.field_check({"username": {"range": range(1,21), "types": [str]}, "password": {"range": range(8,256), "types": [str]}}, r) if fc != True: await websocket.send(util.error(fc, listener)) continue @@ -292,7 +292,7 @@ async def handler(websocket): await websocket.send(util.error(valid, listener)) continue elif r["command"] == "login_token": - fc = util.field_check({"token": range(32,128)}, r) + fc = util.field_check({"token": {"range": range(32,128), "types": [str]}}, r) if fc != True: await websocket.send(util.error(fc, listener)) continue @@ -316,7 +316,7 @@ async def handler(websocket): await websocket.send(util.error(valid, listener)) continue elif r["command"] == "get_user": - fc = util.field_check({"username": range(1,21)}, r) + fc = util.field_check({"username": {"range": range(1,21), "types": [str]}}, r) if fc != True: await websocket.send(util.error(fc, listener)) continue @@ -331,7 +331,7 @@ async def handler(websocket): await websocket.send(json.dumps({"error": False, "user": data, "listener": listener})) continue elif r["command"] == "get_post": - fc = util.field_check({"id": range(8,128)}, r) + fc = util.field_check({"id": {"range": range(8,128), "types": [str]}}, r) if fc != True: await websocket.send(util.error(fc, listener)) continue @@ -345,7 +345,7 @@ async def handler(websocket): await websocket.send(json.dumps({"error": False, "post": data, "listener": listener})) continue elif r["command"] == "set_property": - fc = util.field_check({"property": range(1,64), "value": range(0,2048)}, r) + fc = util.field_check({"property": {"range": range(1,64), "types": [str]}, "value": {"range": range(0,2048), "types": [str]}}, r) if fc != True: await websocket.send(util.error(fc, listener)) continue @@ -410,7 +410,7 @@ async def handler(websocket): await websocket.send(json.dumps({"error": False, "listener": listener})) continue elif r["command"] == "force_kick": - fc = util.field_check({"username": range(1,21)}, r) + fc = util.field_check({"username": {"range": range(1,21), "types": [str]}}, r) if fc != True: await websocket.send(util.error(fc, listener)) continue @@ -431,7 +431,7 @@ async def handler(websocket): await websocket.send(json.dumps({"error": False, "listener": listener})) continue elif r["command"] == "ban": - fc = util.field_check({"username": range(1,21), "banned_until": range(0,0), "ban_reason": range(0,2001)}, r) + fc = util.field_check({"username": {"range": range(1,21), "types": [str]}, "banned_until": {"range": range(0,0), "types": [int]}, "ban_reason": {"range": range(0,2001), "types": [str]}}, r) if fc != True: await websocket.send(util.error(fc, listener)) continue @@ -463,7 +463,7 @@ async def handler(websocket): data = db.inbox.get_recent() await websocket.send(json.dumps({"error": False, "inbox": data, "listener": listener})) elif r["command"] == "post_inbox": - fc = util.field_check({"content": range(0,3001), "attachments": range(0,6)}, r) + fc = util.field_check({"content": {"range": range(0,3001), "types": [str]}, "attachments": {"range": range(0,6), "types": [list]}}, r) if fc != True: await websocket.send(util.error(fc, listener)) continue @@ -494,7 +494,7 @@ async def handler(websocket): await websocket.send(json.dumps({"error": False, "listener": listener})) continue elif r["command"] == "post": - fc = util.field_check({"content": range(0,3001), "replies": range(0,6), "attachments": range(0,6)}, r) + fc = util.field_check({"content": {"range": range(0,3001), "types": [str]}, "replies": {"range": range(0,6), "types": [list]}, "attachments": {"range": range(0,6), "types": [list]}}, r) if fc != True: await websocket.send(util.error(fc, listener)) continue @@ -542,7 +542,7 @@ async def handler(websocket): await websocket.send(json.dumps({"error": False, "listener": listener})) continue elif r["command"] == "delete_post": - fc = util.field_check({"id": range(8,128)}, r) + fc = util.field_check({"id": {"range": range(8,128), "types": [str]}}, r) if fc != True: await websocket.send(util.error(fc, listener)) continue @@ -570,7 +570,7 @@ async def handler(websocket): await websocket.send(json.dumps({"error": False, "listener": listener})) continue elif r["command"] == "edit_post": - fc = util.field_check({"id": range(8,128), "content": range(0,3001)}, r) + fc = util.field_check({"id": {"range": range(8,128), "types": [str]}, "content": {"range": range(0,3001), "types": [str]}}, r) if fc != True: await websocket.send(util.error(fc, listener)) continue @@ -597,7 +597,7 @@ async def handler(websocket): await websocket.send(json.dumps({"error": False, "listener": listener})) continue elif r["command"] == "delete_account": - fc = util.field_check({"password": range(8,256)}, r) + fc = util.field_check({"password": {"range": range(8,256), "types": [str]}}, r) if fc != True: await websocket.send(util.error(fc, listener)) continue -- cgit 1.4.1-2-gfad0