This commit is a little too large. Sorry. :S

1 files changed, 54 insertions, 21 deletions

diff --git a/src/client.rs b/src/client.rs
index e573596..d830e1e 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -11,6 +11,9 @@ use std::borrow::Cow;
 
 use message::Message;
 use command::Command;
+use command::Command::*;
+use reply::Reply;
+use event::Event;
 use ::{ DEBUG, Result, IrscError };
 
 #[cfg(feature = "ssl")]
@@ -64,35 +67,38 @@ impl Client {
 
     fn handle_event(&mut self, msg: &Message) {
         let _ = match Command::from_message(msg) {
-            Some(Command::PING(s1, s2)) => self.send(Command::PONG(s1, s2)),
-            _ => Ok(())
+            Some(PING(s1, s2)) => self.send(PONG(s1, s2)),
+            _ => Result(Ok(()))
         };
     }
 
-    pub fn connect(&mut self, host: String, port: u16) -> Result<()> {
+    pub fn connect(&mut self, host: &str, port: u16) -> Result<()> {
         let s = &mut self.stream;
-        match *s { Some(_) => return Err(IrscError::AlreadyConnected), _ => () };
-        *s = match TcpStream::connect((host.as_ref(), port)) {
+        if s.is_some() { return Result(Err(IrscError::AlreadyConnected)) }
+        *s = match TcpStream::connect((host, port)) {
             Ok(tcp) => Some(StreamKind::Plain(tcp)),
-            Err(e) => return Err(IrscError::Io(e))
+            Err(e) => return Result(Err(IrscError::Io(e)))
         };
 
-        Ok(())
+        Result(Ok(()))
     }
 
     #[cfg(feature = "ssl")]
-    pub fn connect_ssl(&mut self, host: String, port: u16, ssl: Ssl) -> Result<()> {
+    pub fn connect_ssl(&mut self, host: &str, port: u16, ssl: Ssl) -> Result<()> {
         let s = &mut self.stream;
-        match *s { Some(_) => return Err(IrscError::AlreadyConnected), _ => () };
-        let tcp_stream = match TcpStream::connect((host.as_ref(), port)) {
+        if s.is_some() { return Result(Err(IrscError::AlreadyConnected)) };
+        let tcp_stream = match TcpStream::connect((host, port)) {
             Ok(tcp) => Some(tcp),
-            Err(e) => return Err(IrscError::Io(e))
+            Err(e) => return Result(Err(IrscError::Io(e)))
         };
 
         match tcp_stream.map(|tcp| SslStream::new_from(ssl, tcp)) {
-            Some(Ok(ssl_stream)) => { *s = Some(StreamKind::Ssl(ssl_stream)); Ok(()) },
-            Some(Err(ssl_error)) => Err(IrscError::Ssl(ssl_error)),
-            None => Err(IrscError::NotConnected)
+            Some(Ok(ssl_stream)) => {
+                *s = Some(StreamKind::Ssl(ssl_stream));
+                Result(Ok(()))
+            },
+            Some(Err(ssl_error)) => Result(Err(IrscError::Ssl(ssl_error))),
+            None => Result(Err(IrscError::NotConnected))
         }
     }
 
@@ -103,11 +109,11 @@ impl Client {
             panic!("Message too long, kittens will die if this runs in release mode. Msg: {}", s)
         }
 
-        self.stream.as_mut()
+        Result(self.stream.as_mut()
             .ok_or(IrscError::NotConnected)
             .and_then(|mut stream| stream.write_all(s.as_bytes())
                                          .and_then(|_| stream.flush())
-                                         .map_err(IrscError::Io))
+                                         .map_err(IrscError::Io)))
     }
 
     pub fn send_message(&mut self, msg: Message) -> Result<()> {
@@ -118,13 +124,13 @@ impl Client {
         self.send_message(cmd.to_message())
     }
 
-    pub fn listen<F>(&mut self, events: F) -> Result<()>
-    where F: Fn(&mut Client, &Message) {
+    pub fn listen<F>(&mut self, events: Option<F>) -> Result<()>
+    where F: Fn(&mut Client, &Message, Option<Event>) {
         let reader = BufReader::new(match self.stream {
             Some(StreamKind::Plain(ref s)) => StreamKind::Plain((*s).try_clone().unwrap()),
             #[cfg(feature = "ssl")]
             Some(StreamKind::Ssl(ref s)) => StreamKind::Ssl((*s).try_clone().unwrap()),
-            None => return Err(IrscError::NotConnected)
+            None => return Result(Err(IrscError::NotConnected))
         });
 
         for line in reader.lines() {
@@ -132,9 +138,36 @@ impl Client {
 
             if let Ok(msg) = line {
                 self.handle_event(&msg);
-                events(self, &msg);
+
+                // If a callback is desired, try to parse the message
+                // into a Command or a Reply, and call back.
+                if let Some(ref on_event) = events {
+                    let event = match Command::from_message(&msg) {
+                        Some(m) => Some(Event::Command(m)),
+                        None => match Reply::from_message(&msg) {
+                            Some(r) => Some(Event::Reply(r)),
+                            None => None
+                        }
+                    };
+
+                    on_event(self, &msg, event);
+                }
             }
         }
-        Ok(())
+        Result(Ok(()))
+    }
+
+    pub fn join(&mut self, channel: &str, password: Option<&str>) -> Result<()> {
+        self.send_message(JOIN(vec![channel.into()], password.iter().map(|&p| p.into()).collect()).to_message())
+    }
+
+    pub fn msg(&mut self, to: &str, message: &str) -> Result<()> {
+        self.send_message(PRIVMSG(to.into(), message.into()).to_message())
+    }
+
+    pub fn register(&mut self, nick: &str, user: &str, desc: &str) -> Result<()> {
+        Result(self.send_message(NICK(nick.into()).to_message()).inner()
+            .and_then(|_| self.send_message(USER(user.into(), Cow::Borrowed("0"), Cow::Borrowed("*"), desc.into()).to_message()).inner()))
+
     }
 }