Update server.py

server.py

@@ -30,8 +30,37 @@ async def broadcast_message(party_id, sender, message: str):
         for user_name in parties[party_id]['members']:
             user = users[user_name]
             if user != sender:
+                # if user.websocket:
                 await user.websocket.send_text(formatted_message)
 
+@app.get("/")
+async def root_data():
+    return {
+        "status" : True,
+        "message" : "Working"
+    }
+
+@app.get("/newroom")
+async def create_new_room(status: str, link: str, name: str, username: str, device_id: str, password: str=None):
+    party_code = generate_party_code()
+    parties[party_code] = {
+                'owner': username,
+                'members': [],
+                'password' : password,
+                'title' : name,
+                'link' : link,
+                'type' : 'Private'
+            }
+
+    users[username] = User(username.lower(), None, "owner")
+    users[username].device_id = device_id
+
+    return {
+        "status" : True,
+        "party" : party_code,
+        "message" : "Created success"
+    }
+
 @app.websocket("/ws")
 async def party_server(websocket: WebSocket):
     await websocket.accept()
@@ -43,17 +72,19 @@ 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] # Get the action
+    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")
@@ -68,7 +99,8 @@ async def party_server(websocket: WebSocket):
     username = data.split("|")[-2]
     device_id = data.split("|")[-1]
 
-    users[username] = User(username, websocket, "user")
+    if not username in users:
+        users[username] = User(username, websocket, "user")
 
     if action == "create":
         link = data.split("|")[2]
@@ -82,24 +114,27 @@ async def party_server(websocket: WebSocket):
             party_code = str(party_code)
             parties[party_code] = {
                     'owner': username,
-                    'members': {username},
+                    'members': [username],
                     'password' : password,
                     'title' : name,
                     'link' : link,
                     'type' : 'Private'
                 }
+
         else:
             party_code = generate_party_code()
             parties[party_code] = {
                     'owner': username,
-                    'members': {username},
+                    'members': [username],
                     'password' : None,
                     'title' : name,
                     'link' : link,
                     'type' : 'Public'
                 }
+
         users[username].status = "owner"
         users[username].device_id = device_id
+        users[username].websocket = websocket
         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.')
 
@@ -116,12 +151,22 @@ async def party_server(websocket: WebSocket):
                     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"
+            # if device_id == parties[party_code]['owner']
+            if device_id == users[parties[party_code]['owner']].device_id:
+                parties[party_code]['owner'] = username
+                users[username].status = "owner"
+
+            else:
+                users[username].status = "user"
+
+            parties[party_code]['members'].append(username)
             users[username].device_id = device_id
+            users[username].websocket = websocket
+
             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'[006]:{username} has joined the party.')
+            print(f"Sending brodcast message to {party_code}, {username}")
         else:
             await websocket.send_text("[system]:[004]:Invalid party code.")
             await websocket.close(code=1000, reason="Invalid party code")