diff -r a077aac9df01 -r 98ef2913ec73 rust/hedgewars-server/src/server/handlers/lobby.rs --- a/rust/hedgewars-server/src/server/handlers/lobby.rs Sun Dec 16 00:09:20 2018 +0100 +++ b/rust/hedgewars-server/src/server/handlers/lobby.rs Sun Dec 16 00:12:29 2018 +0100 @@ -1,47 +1,53 @@ use mio; +use super::common::rnd_reply; use crate::{ + protocol::messages::{HWProtocolMessage, HWServerMessage::*}, server::{ + actions::{Action, Action::*}, core::HWServer, coretypes::ClientId, - actions::{Action, Action::*} }, - protocol::messages::{ - HWProtocolMessage, - HWServerMessage::* - }, - utils::is_name_illegal + utils::is_name_illegal, }; -use super::common::rnd_reply; use log::*; pub fn handle(server: &mut HWServer, client_id: ClientId, message: HWProtocolMessage) { use crate::protocol::messages::HWProtocolMessage::*; match message { CreateRoom(name, password) => { - let actions = - if is_name_illegal(&name) { - vec![Warn("Illegal room name! A room name must be between 1-40 characters long, must not have a trailing or leading space and must not have any of these characters: $()*+?[]^{|}".to_string())] - } else if server.has_room(&name) { - vec![Warn("A room with the same name already exists.".to_string())] - } else { - let flags_msg = ClientFlags( - "+hr".to_string(), - vec![server.clients[client_id].nick.clone()]); - vec![AddRoom(name, password), - flags_msg.send_self().action()] - }; + let actions = if is_name_illegal(&name) { + vec![Warn("Illegal room name! A room name must be between 1-40 characters long, must not have a trailing or leading space and must not have any of these characters: $()*+?[]^{|}".to_string())] + } else if server.has_room(&name) { + vec![Warn( + "A room with the same name already exists.".to_string(), + )] + } else { + let flags_msg = ClientFlags( + "+hr".to_string(), + vec![server.clients[client_id].nick.clone()], + ); + vec![AddRoom(name, password), flags_msg.send_self().action()] + }; server.react(client_id, actions); - }, + } Chat(msg) => { - let actions = vec![ChatMsg {nick: server.clients[client_id].nick.clone(), msg} - .send_all().in_room(server.lobby_id).but_self().action()]; + let actions = vec![ChatMsg { + nick: server.clients[client_id].nick.clone(), + msg, + } + .send_all() + .in_room(server.lobby_id) + .but_self() + .action()]; server.react(client_id, actions); - }, + } JoinRoom(name, _password) => { let room = server.rooms.iter().find(|(_, r)| r.name == name); let room_id = room.map(|(_, r)| r.id); - let nicks = server.clients.iter() + let nicks = server + .clients + .iter() .filter(|(_, c)| c.room_id == room_id) .map(|(_, c)| c.nick.clone()) .collect(); @@ -49,23 +55,26 @@ let actions = if let Some((_, r)) = room { if c.protocol_number != r.protocol_number { - vec![Warn("Room version incompatible to your Hedgewars version!".to_string())] + vec![Warn( + "Room version incompatible to your Hedgewars version!".to_string(), + )] } else if r.is_join_restricted() { - vec![Warn("Access denied. This room currently doesn't allow joining.".to_string())] + vec![Warn( + "Access denied. This room currently doesn't allow joining.".to_string(), + )] } else if r.players_number == u8::max_value() { vec![Warn("This room is already full".to_string())] } else { - vec![MoveToRoom(r.id), - RoomJoined(nicks).send_self().action()] + vec![MoveToRoom(r.id), RoomJoined(nicks).send_self().action()] } } else { vec![Warn("No such room.".to_string())] }; server.react(client_id, actions); - }, + } Rnd(v) => { server.react(client_id, vec![rnd_reply(&v).send_self().action()]); - }, + } List => warn!("Deprecated LIST message received"), _ => warn!("Incorrect command in lobby state"), }