From 0faa3233001761e8cd5819d03e907b4e1f818c07 Mon Sep 17 00:00:00 2001 From: Titouan Rigoudy Date: Tue, 12 Apr 2016 16:18:45 +0200 Subject: [PATCH] Rename SayRoom to RoomMessage. --- TODO.md | 1 - src/client.rs | 21 +++++++++++---------- src/control/request.rs | 6 +++--- src/control/response.rs | 4 ++-- src/proto/server/constants.rs | 2 +- src/proto/server/request.rs | 16 ++++++++-------- src/proto/server/response.rs | 20 ++++++++++---------- src/room.rs | 2 +- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/TODO.md b/TODO.md index 103a0f0..638ddb4 100644 --- a/TODO.md +++ b/TODO.md @@ -3,4 +3,3 @@ Things to do: - Print out surplus bytes in hex to make analyzing them easier - Handle client connections - - Rename SayRoomResponse to RoomMessageResponse diff --git a/src/client.rs b/src/client.rs index 5309128..b91d7cb 100644 --- a/src/client.rs +++ b/src/client.rs @@ -136,8 +136,8 @@ impl Client { control::Request::RoomListRequest => self.handle_room_list_request(), - control::Request::SayRoomRequest(request) => - self.handle_say_room_request(request), + control::Request::RoomMessageRequest(request) => + self.handle_room_message_request(request), /* _ =>{ @@ -219,10 +219,10 @@ impl Client { self.server_send(ServerRequest::RoomListRequest); } - fn handle_say_room_request( - &mut self, request: control::SayRoomRequest) + fn handle_room_message_request( + &mut self, request: control::RoomMessageRequest) { - self.server_send(ServerRequest::SayRoomRequest(SayRoomRequest { + self.server_send(ServerRequest::RoomMessageRequest(RoomMessageRequest { room_name: request.room_name, message: request.message, })); @@ -246,8 +246,8 @@ impl Client { ServerResponse::RoomListResponse(response) => self.handle_room_list_response(response), - ServerResponse::SayRoomResponse(response) => - self.handle_say_room_response(response), + ServerResponse::RoomMessageResponse(response) => + self.handle_room_message_response(response), ServerResponse::UserJoinedRoomResponse(response) => self.handle_user_joined_room_response(response), @@ -326,18 +326,19 @@ impl Client { control::Response::RoomListResponse(control_response)); } - fn handle_say_room_response(&mut self, response: SayRoomResponse) { + fn handle_room_message_response(&mut self, response: RoomMessageResponse) { self.rooms.add_message(&response.room_name, room::Message { user_name: response.user_name.clone(), message: response.message.clone(), }); - let control_response = control::SayRoomResponse { + let control_response = control::RoomMessageResponse { room_name: response.room_name, user_name: response.user_name, message: response.message, }; - self.control_send(control::Response::SayRoomResponse(control_response)); + self.control_send( + control::Response::RoomMessageResponse(control_response)); } fn handle_user_joined_room_response( diff --git a/src/control/request.rs b/src/control/request.rs index 98232e6..b39e8e8 100644 --- a/src/control/request.rs +++ b/src/control/request.rs @@ -16,13 +16,13 @@ pub enum Request { /// The controller wants to know the list of visible chat rooms. RoomListRequest, /// The controller wants to send a message to a chat room. - SayRoomRequest(SayRoomRequest), + RoomMessageRequest(RoomMessageRequest), } /// This structure contains the chat room message request from the controller. #[derive(Debug, RustcDecodable, RustcEncodable)] -pub struct SayRoomRequest { - /// The name of the chat room in which to say the message. +pub struct RoomMessageRequest { + /// The name of the chat room in which to send the message. pub room_name: String, /// The message to be said. pub message: String, diff --git a/src/control/response.rs b/src/control/response.rs index d13d623..d4b1359 100644 --- a/src/control/response.rs +++ b/src/control/response.rs @@ -7,7 +7,7 @@ pub enum Response { JoinRoomResponse(JoinRoomResponse), LoginStatusResponse(LoginStatusResponse), RoomListResponse(RoomListResponse), - SayRoomResponse(SayRoomResponse), + RoomMessageResponse(RoomMessageResponse), } #[derive(Debug, RustcEncodable, RustcDecodable)] @@ -54,7 +54,7 @@ pub struct RoomListResponse { /// This structure contains a message said in a chat room the user is a member /// of. #[derive(Debug, RustcDecodable, RustcEncodable)] -pub struct SayRoomResponse { +pub struct RoomMessageResponse { /// The name of the room in which the message was said. pub room_name: String, /// The name of the user who said the message. diff --git a/src/proto/server/constants.rs b/src/proto/server/constants.rs index 6ae27e2..6c95dcb 100644 --- a/src/proto/server/constants.rs +++ b/src/proto/server/constants.rs @@ -1,7 +1,7 @@ pub const CODE_LOGIN: u32 = 1; pub const CODE_SET_LISTEN_PORT: u32 = 2; pub const CODE_PEER_ADDRESS: u32 = 3; -pub const CODE_SAY_ROOM: u32 = 13; +pub const CODE_ROOM_MESSAGE: u32 = 13; pub const CODE_JOIN_ROOM: u32 = 14; pub const CODE_USER_JOINED_ROOM: u32 = 16; pub const CODE_CONNECT_TO_PEER: u32 = 18; diff --git a/src/proto/server/request.rs b/src/proto/server/request.rs index bed5d84..3f9cab8 100644 --- a/src/proto/server/request.rs +++ b/src/proto/server/request.rs @@ -20,7 +20,7 @@ pub enum ServerRequest { LoginRequest(LoginRequest), PeerAddressRequest(PeerAddressRequest), RoomListRequest, - SayRoomRequest(SayRoomRequest), + RoomMessageRequest(RoomMessageRequest), SetListenPortRequest(SetListenPortRequest), } @@ -39,8 +39,8 @@ impl ServerRequest { ServerRequest::RoomListRequest => return Ok(Packet::new(CODE_ROOM_LIST)), - ServerRequest::SayRoomRequest(ref request) => - (Packet::new(CODE_SAY_ROOM), request), + ServerRequest::RoomMessageRequest(ref request) => + (Packet::new(CODE_ROOM_MESSAGE), request), ServerRequest::SetListenPortRequest(ref request) => (Packet::new(CODE_SET_LISTEN_PORT), request), @@ -139,17 +139,17 @@ impl WriteToPacket for PeerAddressRequest { } } -/*==========* - * SAY ROOM * - *==========*/ +/*==============* + * ROOM MESSAGE * + *==============*/ #[derive(Debug)] -pub struct SayRoomRequest { +pub struct RoomMessageRequest { pub room_name: String, pub message: String, } -impl WriteToPacket for SayRoomRequest { +impl WriteToPacket for RoomMessageRequest { fn write_to_packet(&self, packet: &mut Packet) -> io::Result<()> { try!(packet.write_str(&self.room_name)); try!(packet.write_str(&self.message)); diff --git a/src/proto/server/response.rs b/src/proto/server/response.rs index e6725b4..edd4537 100644 --- a/src/proto/server/response.rs +++ b/src/proto/server/response.rs @@ -26,7 +26,7 @@ pub enum ServerResponse { PeerAddressResponse(PeerAddressResponse), PrivilegedUsersResponse(PrivilegedUsersResponse), RoomListResponse(RoomListResponse), - SayRoomResponse(SayRoomResponse), + RoomMessageResponse(RoomMessageResponse), UserJoinedRoomResponse(UserJoinedRoomResponse), WishlistIntervalResponse(WishlistIntervalResponse), @@ -71,9 +71,9 @@ impl FromPacket for ServerResponse { try!(RoomListResponse::from_packet(packet)) ), - CODE_SAY_ROOM => - ServerResponse::SayRoomResponse( - try!(SayRoomResponse::from_packet(packet)) + CODE_ROOM_MESSAGE => + ServerResponse::RoomMessageResponse( + try!(RoomMessageResponse::from_packet(packet)) ), CODE_USER_JOINED_ROOM => @@ -453,23 +453,23 @@ impl RoomListResponse { } } -/*==========* - * SAY ROOM * - *==========*/ +/*==============* + * ROOM MESSAGE * + *==============*/ #[derive(Debug)] -pub struct SayRoomResponse { +pub struct RoomMessageResponse { pub room_name: String, pub user_name: String, pub message: String, } -impl FromPacket for SayRoomResponse { +impl FromPacket for RoomMessageResponse { fn from_packet(packet: &mut Packet) -> result::Result { let room_name = try!(packet.read_str()); let user_name = try!(packet.read_str()); let message = try!(packet.read_str()); - Ok(SayRoomResponse { + Ok(RoomMessageResponse { room_name: room_name, user_name: user_name, message: message, diff --git a/src/room.rs b/src/room.rs index b161ed1..3058fcd 100644 --- a/src/room.rs +++ b/src/room.rs @@ -215,7 +215,7 @@ impl RoomMap { match self.get_mut(room_name) { None => { error!( - "SayRoomResponse: unknown room \"{}\"", room_name + "RoomMap::add_message: unknown room \"{}\"", room_name ); return; },