Update app.py

app.py

@@ -739,6 +739,17 @@ def create_chat_room():
         room_id = str(uuid.uuid4())
         admin_session = str(uuid.uuid4())
         
+        # NEW: Generate individual receiver tokens
+        receiver_tokens = []
+        for i in range(max_receivers):
+            receiver_tokens.append({
+                "token": str(uuid.uuid4()),
+                "receiver_number": i + 1,
+                "claimed": False,
+                "device_uuid": None,
+                "claimed_at": None
+            })
+        
         CHAT_ROOMS[room_id] = {
             "admin_session": admin_session,
             "created_at": time.time(),
@@ -749,16 +760,16 @@ def create_chat_room():
                 "allow_files": allow_files,
                 "burn_on_admin_exit": True
             },
+            "receiver_tokens": receiver_tokens,  # NEW!
             "active_sessions": {},
             "receiver_counter": 0
         }
         
-        
-        
-        # Return only IDs - let frontend create URLs
+        # Return IDs + receiver tokens
         return jsonify({
             "room_id": room_id,
             "admin_session": admin_session,
+            "receiver_tokens": [{"token": t["token"], "receiver_number": t["receiver_number"]} for t in receiver_tokens],
             "expires_at": CHAT_ROOMS[room_id]["expires_at"]
         })
         
@@ -770,6 +781,8 @@ def join_chat_room(room_id):
     try:
         password = request.args.get("password", "")
         admin_session = request.args.get("admin", "")
+        receiver_token = request.args.get("receiver", "")  # NEW!
+        device_uuid = request.args.get("device_uuid", "")  # NEW!
         
         if room_id not in CHAT_ROOMS:
             return jsonify({"error": "Chat room not found"}), 404
@@ -784,23 +797,54 @@ def join_chat_room(room_id):
         if room["settings"]["password"] and password != room["settings"]["password"]:
             return jsonify({"error": "Wrong password"}), 403
             
-        # FIXED: Proper role assignment
+        # Admin join
         if admin_session and admin_session == room["admin_session"]:
-            # Only admin if the session matches the room's admin session
             role = "admin"
             session_id = admin_session
             receiver_number = None
-        else:
-            # Everyone else is a receiver
-            active_receivers = sum(1 for s in room["active_sessions"].values() if s["role"] == "receiver")
-            if active_receivers >= room["settings"]["max_receivers"]:
-                return jsonify({"error": "Chat room is full"}), 403
-                
-            role = "receiver" 
-            session_id = str(uuid.uuid4())
-            room["receiver_counter"] += 1
-            receiver_number = room["receiver_counter"]
             
+            return jsonify({
+                "session_id": session_id,
+                "role": role,
+                "receiver_number": receiver_number,
+                "room_settings": room["settings"],
+                "expires_at": room["expires_at"]
+            })
+        
+        # Receiver join with token
+        if not receiver_token or not device_uuid:
+            return jsonify({"error": "Receiver token and device UUID required"}), 400
+        
+        # Find the token
+        token_data = None
+        for token in room["receiver_tokens"]:
+            if token["token"] == receiver_token:
+                token_data = token
+                break
+        
+        if not token_data:
+            return jsonify({"error": "Invalid receiver token"}), 403
+        
+        # Check if token already claimed by a different device
+        if token_data["claimed"]:
+            if token_data["device_uuid"] != device_uuid:
+                return jsonify({
+                    "error": "This link has already been used on another device",
+                    "claimed_at": time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(token_data["claimed_at"]))
+                }), 403
+            # Same device rejoining - allow
+            print(f"[Rejoin] Device {device_uuid[:8]}... rejoining with token {receiver_token[:8]}...")
+        else:
+            # First time claim
+            token_data["claimed"] = True
+            token_data["device_uuid"] = device_uuid
+            token_data["claimed_at"] = time.time()
+            print(f"[Claim] Device {device_uuid[:8]}... claimed token {receiver_token[:8]}...")
+        
+        role = "receiver"
+        session_id = str(uuid.uuid4())
+        receiver_number = token_data["receiver_number"]
+        
         return jsonify({
             "session_id": session_id,
             "role": role,
@@ -948,14 +992,14 @@ def handle_leave_chat(data):
         if session["role"] == "admin" and CHAT_ROOMS[room_id]["settings"]["burn_on_admin_exit"]:
             emit('room_closing', {'reason': 'Admin left the room'}, room=room_id)
             del CHAT_ROOMS[room_id]
-            if room_id in CHAT_MESSAGES:
-                del CHAT_MESSAGES[room_id]
         else:
+            # Notify everyone in the room (including self, so they see the message before leaving)
             emit('user_left', {
+                'session_id': session_id,  # NEW: Include session_id
                 'role': session["role"],
                 'receiver_number': session.get("receiver_number"),
                 'active_count': len(CHAT_ROOMS[room_id]["active_sessions"])
-            }, room=room_id)
+            }, room=room_id)  # Send to everyone including sender
         
         leave_room(room_id)