Update server.py

server.py

@@ -12,6 +12,7 @@ class User:
         self.username = username
         self.websocket = websocket
         self.status = status
+        self.device_id = None
 
 def generate_party_code():
     return ''.join([str(random.randint(0, 9)) for _ in range(6)])
@@ -34,38 +35,93 @@ async def party_server(websocket: WebSocket):
     await websocket.accept()
     username = None
     party_code = None
+    password = None
     user_status = None
 
-    await websocket.send_text("[system]:Enter your name to start.")
+    await websocket.send_text("[system]:[001]:ENTER DATA:")
     data = await websocket.receive_text()
+    action = data.split("|")[0]
+
+    if not action.lower() in ["create", "join"]:
+        await websocket.send_text("[system]:[004]:Invalid action")
+        await websocket.close(1000, reason="Invalid action")
+        return
+    if action.lower() == "create":
+        if data.count("|") != 5:
+            await websocket.send_text("[system]:[004]:Invalid input data")
+            await websocket.close(1000, "Invalid input data")
+            return
+    else:
+        if data.count("|") != 3:
+            await websocket.send_text("[system]:[004]:Invalid input data")
+            await websocket.close(1000, "Invalid input data")
+            return
+
     if data.lower() == "system":
-        await websocket.send_text("[system]:You can't set system as your name")
+        await websocket.send_text("[system]:[004]:You can't set system as your name")
+        await websocket.close(1000, "You can't set system as your name")
         return
-    username = data.lower()
 
-    users[username] = User(username, websocket, "user")
+    username = data.split("|")[-2]
+    device_id = data.split("|")[-1]
 
-    await websocket.send_text("[system]:Would you like to create or join a party? Type 'create' or 'join'.")
-    action = await websocket.receive_text()
+    users[username] = User(username, websocket, "user")
 
     if action == "create":
-        party_code = generate_party_code()
-        parties[party_code] = {'owner': username, 'members': {username}}
+        link = data.split("|")[2]
+        name = data.split("|")[3]
+        act = data.split("|")[1]
+        if "[" in act:
+            act = act.split("[")[0].strip().lower()
+        if act == "private":
+            password = data.split("|")[1].split("[")[1].split("]")[0]
+            party_code = generate_party_code()
+            party_code = str(party_code)
+            parties[party_code] = {
+                    'owner': username,
+                    'members': {username},
+                    'password' : password,
+                    'title' : name,
+                    'link' : link,
+                    'type' : 'Private'
+                }
+        else:
+            party_code = generate_party_code()
+            parties[party_code] = {
+                    'owner': username,
+                    'members': {username},
+                    'password' : None,
+                    'title' : name,
+                    'link' : link,
+                    'type' : 'Public'
+                }
         users[username].status = "owner"
-        await websocket.send_text(f"[system]:Party created! Your party code is {party_code}.")
-        await broadcast_message(party_code, users[username], f'[system]:{username} has created the party.')
+        users[username].device_id = device_id
+        await websocket.send_text(f"[system]:[006]:Party created! Your party code is :{party_code}.")
+        await broadcast_message(party_code, users[username], f'[system]::{username} has created the party.')
 
     elif action == "join":
-        await websocket.send_text("[system]:Enter the party code to join.")
-        party_code = await websocket.receive_text()
-
+        party_code = data.split("|")[1]
+        party_code = str(party_code)
+        if "[" in party_code:
+            password = party_code.split("[")[1].split("]")[0] # Get and verify the password
+            party_code = party_code.split("[")[0].strip()
         if party_code in parties:
+            if parties.get(party_code).get('password') != None:
+                # Its a private party
+                if parties.get(party_code).get('password') != password:
+                    await websocket.send_text(f"[system]:[004]: Invalid password")
+                    await websocket.close(1000, "Invalid password")
+                    return
             parties[party_code]['members'].add(username)
             users[username].status = "user"
-            await websocket.send_text(f"[system]:You have joined the party with code {party_code}.")
-            await broadcast_message(party_code, users[username], f'[system]:{username} has joined the party.')
+            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.')
         else:
-            await websocket.send_text("[system]:Invalid party code.")
+            await websocket.send_text("[system]:[004]:Invalid party code.")
+            await websocket.close(code=1000, reason="Invalid party code")
 
     try:
         while True:
@@ -79,11 +135,11 @@ async def party_server(websocket: WebSocket):
                 await broadcast_message(party_code, users[username], f'[system]:{username} (Owner) has left the party. All members are being kicked out.')
                 for member in list(parties[party_code]['members']):
                     member_user = users[member]
-                    await member_user.websocket.send_text("[system]:The owner has left, and the party is deleted.")
+                    await member_user.websocket.send_text("[system]:[004]:The owner has left, and the party is deleted.")
                     parties[party_code]['members'].remove(member)
                 del parties[party_code]
             else:
-                await broadcast_message(party_code, users[username], f'[system]:{username} has left the party.')
+                await broadcast_message(party_code, users[username], f'[system]:[004]:{username} has left the party.')
         del users[username]
 
 if __name__ == "__main__":