From a7b08969a5698a6346beb26b8ee0197469fac62b Mon Sep 17 00:00:00 2001 From: Joshua Higgins Date: Sun, 15 Mar 2026 05:00:10 +0000 Subject: [PATCH] renames --- src/server.rs | 12 ++++++------ src/tournaments/round_robin.rs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/server.rs b/src/server.rs index dbed43d..db7df8a 100644 --- a/src/server.rs +++ b/src/server.rs @@ -432,7 +432,7 @@ impl Server { let _ = send(&tx, "GAME:LOSS"); let _ = send(&opponent.connection, "GAME:WINS"); - self.broadcast_message_all_observers(&format!( + self.broadcast(&format!( "GAME:{}:WIN:{}", current_match_id, opponent.username )) @@ -885,7 +885,7 @@ impl Server { timeout_thread.abort(); } - self.broadcast_message_all_observers(&format!("GAME:{}:WIN:{}", match_id, winner_username)) + self.broadcast(&format!("GAME:{}:WIN:{}", match_id, winner_username)) .await; let clients_guard = self.clients.read().await; @@ -1001,7 +1001,7 @@ impl Server { // Clear any pending reservations when a tournament starts self.reservations.write().await.clear(); - self.broadcast_message_all_observers(&format!("TOURNAMENT:START:{}", tournament_type)) + self.broadcast(&format!("TOURNAMENT:START:{}", tournament_type)) .await; Ok(()) } @@ -1020,7 +1020,7 @@ impl Server { tourney.write().await.cancel(&self).await; *tournament_guard = None; - self.broadcast_message_all_observers("TOURNAMENT:CANCEL").await; + self.broadcast("TOURNAMENT:CANCEL").await; Ok(()) } @@ -1228,7 +1228,7 @@ impl Server { timeout_thread.abort(); } - self.broadcast_message_all_observers(&format!("GAME:{}:TERMINATED", match_id)).await; + self.broadcast(&format!("GAME:{}:TERMINATED", match_id)).await; let clients_guard = self.clients.read().await; if the_match.player1 != SERVER_PLAYER_ADDR.to_string().parse().unwrap() { @@ -1263,7 +1263,7 @@ impl Server { } } - pub async fn broadcast_message_all_observers(&self, msg: &str) { + pub async fn broadcast(&self, msg: &str) { let observers_guard = self.observers.read().await; for (_, tx) in observers_guard.iter() { let _ = send(tx, msg); diff --git a/src/tournaments/round_robin.rs b/src/tournaments/round_robin.rs index 18c814f..c76d99e 100644 --- a/src/tournaments/round_robin.rs +++ b/src/tournaments/round_robin.rs @@ -167,7 +167,7 @@ impl Tournament for RoundRobin { } message.pop(); - server.broadcast_message_all_observers(&message).await; + server.broadcast(&message).await; if self.is_completed() { // Send scores