Update server.py

server.py

@@ -17,13 +17,15 @@ class User:
 def generate_party_code():
     return ''.join([str(random.randint(0, 9)) for _ in range(6)])
 
-async def broadcast_message(party_id, sender, message):
+async def broadcast_message(party_id, sender, message: str):
     if party_id in parties:
-        if message.startswith("TMPN:") and sender.status == "owner":
+        if message.startswith("[006]"):
+            formatted_message = f"[system]:{message}"
+        elif message.startswith("TMPN:") and sender.status == "owner":
             formatted_message = message
         else:
             status = 'Owner' if sender.status == 'owner' else 'User'
-            formatted_message = f"{sender.username}:[{status}]:{message}"
+            formatted_message = f"[chat]:[{status}]:[{sender.username}]:[{sender.device_id}]:{message}"
 
         for user_name in parties[party_id]['members']:
             user = users[user_name]
@@ -41,7 +43,7 @@ async def party_server(websocket: WebSocket):
     await websocket.send_text("[system]:[001]:ENTER DATA:")
     data = await websocket.receive_text()
     data = data.lower()
-    action = data.split("|")[0]
+    action = data.split("|")[0] # Get the action
 
     if not action.lower() in ["create", "join"]:
         await websocket.send_text("[system]:[004]:Invalid action")
@@ -119,7 +121,7 @@ async def party_server(websocket: WebSocket):
             users[username].device_id = device_id
             await websocket.send_text(f"[system]:[006]:You have joined the party with code {party_code}.")
             await websocket.send_text(f"[info]:[006]:{parties[party_code]['title']}|{parties[party_code]['link']}|{len(parties[party_code]['members'])}")
-            await broadcast_message(party_code, users[username], f'[system]:[006]:{username} has joined the party.')
+            await broadcast_message(party_code, users[username], f'[006]:{username} has joined the party.')
         else:
             await websocket.send_text("[system]:[004]:Invalid party code.")
             await websocket.close(code=1000, reason="Invalid party code")
@@ -127,7 +129,13 @@ async def party_server(websocket: WebSocket):
     try:
         while True:
             data = await websocket.receive_text()
-            if party_code:
+            if data.startswith("[006]:"):
+                await websocket.send_text("[system]:[004]:You can't send this message")
+            elif data.startswith("[004]:"):
+                await websocket.send_text("[system]:[004]:You can't send this message")
+            elif data.startswith("[001]:"):
+                await websocket.send_text("[system]:[004]:You can't send this message")
+            elif party_code:
                 await broadcast_message(party_code, users[username], data)
     except WebSocketDisconnect:
         if party_code and party_code in parties: