From 673e26e51083490d81f9f9b89b7383cd209d428a Mon Sep 17 00:00:00 2001 From: Bastian Gruber Date: Sat, 29 Apr 2023 14:15:06 +0200 Subject: [PATCH] Bugfix --- problem_03/src/server.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/problem_03/src/server.rs b/problem_03/src/server.rs index 0262996..be4ee35 100644 --- a/problem_03/src/server.rs +++ b/problem_03/src/server.rs @@ -21,7 +21,7 @@ type Message = String; type Id = i32; #[derive(Clone, Debug, Default)] -struct BroadcastMessage(Username, Message); +struct BroadcastMessage(Id, Message); #[derive(Clone, Debug, Default)] struct Users(Arc>>); @@ -63,11 +63,11 @@ async fn main() -> Result<()> { name = username.clone(); db.0.lock().unwrap().insert(id, username.clone()); let message = compose_message(id, db.clone()); - info!("Adding username: {username} to db"); + info!("Adding username/id: {username}/{id} to db"); let _ = framed.send(message).await; - info!("Send message to client"); + info!("Send room message to {username}"); let b = BroadcastMessage( - username.clone(), + id, format!("* {} has entered the room", username), ); let _ = tx.send(b); @@ -92,7 +92,7 @@ async fn main() -> Result<()> { // broadcast message to all clients except the one who sent it info!("Receiving new chat message: {n}"); let b = - BroadcastMessage(name.clone(), format!("[{}]: {}", name, n)); + BroadcastMessage(id, format!("[{}]: {}", name, n)); let _ = tx.send(b); } Some(Err(e)) => { @@ -104,7 +104,7 @@ async fn main() -> Result<()> { // send leave message info!("No next frame"); let b = - BroadcastMessage(name.clone(), format!("* {} has left the room", name)); + BroadcastMessage(id, format!("* {} has left the room", name)); db.0.lock().unwrap().remove(&id); let _ = tx.send(b); break; @@ -114,7 +114,7 @@ async fn main() -> Result<()> { message = rx.recv() => { let broadcast = message.clone().unwrap(); info!("Broadcast received: {:?}", message.clone().unwrap()); - if broadcast.0 != name { + if broadcast.0 != id { info!("Broadcast sent to {}: {:?}", name, message.clone().unwrap()); let _ = framed.send(message.unwrap().1).await; }