From 5986b2f43cb8a2d9dab90ae04a8e4ec11e965fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Sat, 1 Mar 2025 09:46:27 +0100 Subject: [PATCH] Fix (user could join a room twice) + Simon's request Simon's request --- ChatApp/src/ChatApp.java | 8 +++----- ChatApp/src/server/Server.java | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ChatApp/src/ChatApp.java b/ChatApp/src/ChatApp.java index cdfdd75..26ba79e 100644 --- a/ChatApp/src/ChatApp.java +++ b/ChatApp/src/ChatApp.java @@ -9,15 +9,13 @@ public class ChatApp { Server server = new Server(6665); Client client = new Client(new InetSocketAddress("localhost", 6665)); - client.SendCreateRoom("Room1"); - client.RequestRoomList(); - client.SendChatMessage("Hello"); + client.SendCreateRoom("101"); Scanner scanner = new Scanner(System.in); while (true) { String message = scanner.nextLine(); - System.out.print("\033[1A"); // Déplacer le curseur une ligne vers le haut - System.out.print("\r\033[2K"); // Effacer la ligne entière + System.out.print("\033[1A"); + System.out.print("\r\033[2K"); System.out.flush(); client.visitMessage(message); } diff --git a/ChatApp/src/server/Server.java b/ChatApp/src/server/Server.java index 811af1c..ad9997b 100644 --- a/ChatApp/src/server/Server.java +++ b/ChatApp/src/server/Server.java @@ -63,7 +63,7 @@ public class Server implements PacketHandler { } public void joinRoom(String roomName, ServerConnexion connexion) throws SocketException { - if(roomNames.containsKey(roomName)) { + if(roomNames.containsKey(roomName) && !roomNames.get(roomName).contains(connexion)) { roomNames.get(roomName).add(connexion); return; }