From 08a5b00551cc0d8ab1f124e96b984706c599e0c4 Mon Sep 17 00:00:00 2001
From: Titouan Rigoudy <titouan.rigoudy@gmail.com>
Date: Thu, 14 Apr 2016 15:15:58 +0200
Subject: [PATCH] Add RoomNotFoundError, use it for RoomMap::join.

---
 src/client.rs |  4 +++-
 src/room.rs   | 37 ++++++++++++++++++++++++++++++-------
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/client.rs b/src/client.rs
index 62e15c3..d361187 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -340,7 +340,9 @@ impl Client {
         // Join the room and store the received information.
         self.rooms.join(
             &response.room_name, response.owner, response.operators,
-            &response.users);
+            &response.users).unwrap_or_else(
+                |err| error!("RoomJoinResponse: {}", err)
+        );
 
         // Then update the user structs based on the info we just got.
         for (name, user) in response.users.drain(..) {
diff --git a/src/room.rs b/src/room.rs
index 03fd047..411f57e 100644
--- a/src/room.rs
+++ b/src/room.rs
@@ -1,4 +1,6 @@
 use std::collections;
+use std::error;
+use std::fmt;
 use std::mem;
 
 use proto::server;
@@ -78,6 +80,24 @@ impl Room {
     }
 }
 
+/// The error returned when a room name was not found in the room map.
+#[derive(Debug)]
+pub struct RoomNotFoundError {
+    room_name: String,
+}
+
+impl fmt::Display for RoomNotFoundError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "room \"{}\" not found", self.room_name)
+    }
+}
+
+impl error::Error for RoomNotFoundError {
+    fn description(&self) -> &str {
+        "room not found"
+    }
+}
+
 /// Contains the mapping from room names to room data and provides a clean
 /// interface to interact with it.
 #[derive(Debug)]
@@ -174,17 +194,14 @@ impl RoomMap {
         owner: Option<String>,
         mut operators: Vec<String>,
         members: &Vec<(String, user::User)>)
+        -> Result<(), RoomNotFoundError>
     {
         // First look up the room struct.
         let room = match self.map.get_mut(room_name) {
             Some(room) => room,
-            None => {
-                error!(
-                    "RoomMap::join: unknown room \"{}\"",
-                    room_name
-                );
-                return;
-            }
+            None => return Err(
+                RoomNotFoundError{ room_name: room_name.to_string() }
+            ),
         };
 
         // Log what's happening.
@@ -201,12 +218,18 @@ impl RoomMap {
         room.membership = Membership::Member;
         room.user_count = members.len();
         room.owner      = owner;
+
+        room.operators.clear();
         for user_name in operators.drain(..) {
             room.operators.insert(user_name);
         }
+
+        room.members.clear();
         for &(ref user_name, _) in members.iter() {
             room.members.insert(user_name.clone());
         }
+
+        Ok(())
     }
 
     /// Saves the given message as the last one in the given room.