From bc0de9955c375cf27d52c9934403964205afc182 Mon Sep 17 00:00:00 2001 From: salmonik Date: Thu, 29 Oct 2026 22:16:15 +0100 Subject: formatting --- src/server/core.rs | 45 +++++++++++++++---------------------------- src/server/games/blackjack.rs | 4 +--- src/server/games/roulette.rs | 10 ++++------ src/server/games/slots.rs | 4 +--- src/server/setup.rs | 20 ++++--------------- 5 files changed, 25 insertions(+), 58 deletions(-) (limited to 'src/server') diff --git a/src/server/core.rs b/src/server/core.rs index e0f0ff2..4b68ccb 100644 --- a/src/server/core.rs +++ b/src/server/core.rs @@ -49,11 +49,7 @@ impl ServerCore { Self::with_registry(conn, GameRegistry::with_defaults(), DEFAULT_COST) } - pub fn with_registry( - conn: Connection, - registry: GameRegistry, - bcrypt_cost: u32, - ) -> Self { + pub fn with_registry(conn: Connection, registry: GameRegistry, bcrypt_cost: u32) -> Self { Self { conn, sessions: SessionManager::new(), @@ -115,8 +111,7 @@ impl ServerCore { } "GAME_INFO" => { if parts.len() != 2 { - "ERROR Invalid GAME_INFO format. Usage: GAME_INFO " - .to_string() + "ERROR Invalid GAME_INFO format. Usage: GAME_INFO ".to_string() } else { match self.registry.get_game(parts[1]) { Some(game) => format!( @@ -143,16 +138,14 @@ impl ServerCore { } "CRASH_CASHOUT" => { if parts.len() != 2 { - "ERROR Invalid CRASH_CASHOUT format. Usage: CRASH_CASHOUT " - .to_string() + "ERROR Invalid CRASH_CASHOUT format. Usage: CRASH_CASHOUT ".to_string() } else { self.handle_crash_end(state, parts[1], false) } } "CRASH_FORFEIT" => { if parts.len() != 2 { - "ERROR Invalid CRASH_FORFEIT format. Usage: CRASH_FORFEIT " - .to_string() + "ERROR Invalid CRASH_FORFEIT format. Usage: CRASH_FORFEIT ".to_string() } else { self.handle_crash_end(state, parts[1], true) } @@ -351,12 +344,8 @@ impl ServerCore { if hand.player.len() != 2 { return "ERROR Double is only allowed on the first two cards".to_string(); } - if database::extend_reservation( - &mut self.conn, - session_id, - hand.base_bet as i64, - ) - .is_err() + if database::extend_reservation(&mut self.conn, session_id, hand.base_bet as i64) + .is_err() { return "ERROR Insufficient balance".to_string(); } @@ -515,7 +504,12 @@ impl ServerCore { /// Cash out or forfeit. The multiplier comes from the server clock at the /// moment the request is handled; the client never supplies one. - fn handle_crash_end(&mut self, state: &ConnectionState, session_id: &str, forfeit: bool) -> String { + fn handle_crash_end( + &mut self, + state: &ConnectionState, + session_id: &str, + forfeit: bool, + ) -> String { let Some(user) = state.user.as_deref() else { return "ERROR Not logged in".to_string(); }; @@ -698,11 +692,7 @@ impl ServerCore { .get("number") .cloned() .unwrap_or_default(); - let color = result - .result_data - .get("color") - .cloned() - .unwrap_or_default(); + let color = result.result_data.get("color").cloned().unwrap_or_default(); let bets = result .result_data .get("bets") @@ -712,11 +702,7 @@ impl ServerCore { "ROULETTE_RESULT {session_id} {winnings} {bet_amount} {new_balance} {number} {color} {bets}" ) } else { - let reels = result - .result_data - .get("reels") - .cloned() - .unwrap_or_default(); + let reels = result.result_data.get("reels").cloned().unwrap_or_default(); let win_type = result .result_data .get("win_type") @@ -753,8 +739,7 @@ impl ServerCore { if let Ok(mut hand) = BlackjackHand::from_json(raw) { if !hand.is_done() { hand.forfeit(); - let balance = - database::get_balance(&self.conn, user).unwrap_or(0); + let balance = database::get_balance(&self.conn, user).unwrap_or(0); let final_state = hand.state(&session.session_id, balance); let details = serde_json::to_string(&final_state) .unwrap_or_else(|_| "{}".to_string()); diff --git a/src/server/games/blackjack.rs b/src/server/games/blackjack.rs index df5a6ac..cea817a 100644 --- a/src/server/games/blackjack.rs +++ b/src/server/games/blackjack.rs @@ -1,7 +1,5 @@ use super::traits::{Game, GameError, GamePhase, GameResult, GameState}; -use crate::blackjack::{ - card_value, fresh_shoe, hand_total, is_blackjack, BlackjackState, -}; +use crate::blackjack::{card_value, fresh_shoe, hand_total, is_blackjack, BlackjackState}; use rand::seq::SliceRandom; use rand::thread_rng; use serde::{Deserialize, Serialize}; diff --git a/src/server/games/roulette.rs b/src/server/games/roulette.rs index 7beb8c9..0a58323 100644 --- a/src/server/games/roulette.rs +++ b/src/server/games/roulette.rs @@ -65,17 +65,15 @@ impl Game for RouletteGame { match action { "spin" => { - if state.phase != GamePhase::WaitingToStart - && state.phase != GamePhase::Playing - { + if state.phase != GamePhase::WaitingToStart && state.phase != GamePhase::Playing { return Err(GameError::InvalidAction( "Cannot spin in current phase".to_string(), )); } - let payload = params - .first() - .ok_or(GameError::InvalidAction("Missing roulette bets".to_string()))?; + let payload = params.first().ok_or(GameError::InvalidAction( + "Missing roulette bets".to_string(), + ))?; let bets: Bets = serde_json::from_str(payload) .map_err(|error| GameError::InvalidAction(format!("Invalid bets: {error}")))?; diff --git a/src/server/games/slots.rs b/src/server/games/slots.rs index 298cd4c..caced24 100644 --- a/src/server/games/slots.rs +++ b/src/server/games/slots.rs @@ -175,9 +175,7 @@ impl Game for SlotsGame { match action { "spin" => { - if state.phase != GamePhase::WaitingToStart - && state.phase != GamePhase::Playing - { + if state.phase != GamePhase::WaitingToStart && state.phase != GamePhase::Playing { return Err(GameError::InvalidAction( "Cannot spin in current phase".to_string(), )); diff --git a/src/server/setup.rs b/src/server/setup.rs index 96982c5..023e6ed 100644 --- a/src/server/setup.rs +++ b/src/server/setup.rs @@ -47,19 +47,8 @@ pub fn init_identity(dir: &Path, common_name: &str) -> Result Result