From df4d91e5a4b5cca1757d4cfac8849e7cd6b5524d Mon Sep 17 00:00:00 2001
From: Jokler <jokler.contact@gmail.com>
Date: Mon, 11 Dec 2017 03:41:27 +0100
Subject: Derive defaults where possible

---
 src/plugins/currency.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/plugins/currency.rs')

diff --git a/src/plugins/currency.rs b/src/plugins/currency.rs
index d6cf928..634faa2 100644
--- a/src/plugins/currency.rs
+++ b/src/plugins/currency.rs
@@ -14,7 +14,7 @@ use self::serde_json::Value;
 
 use plugin::*;
 
-#[derive(PluginName, Debug)]
+#[derive(PluginName, Default, Debug)]
 pub struct Currency;
 
 struct ConvertionRequest<'a> {
-- 
cgit v1.2.3-70-g09d2


From 2ba26a37d27a637b7c0e02970419342a6f83462b Mon Sep 17 00:00:00 2001
From: Jokler <jokler.contact@gmail.com>
Date: Sat, 10 Feb 2018 14:13:07 +0100
Subject: Add evaluate function to plugins

This allows plugins to be used in combination with each other.
---
 src/plugin.rs           |  2 ++
 src/plugins/currency.rs | 58 +++++++++++++++++++++++++++++--------------------
 src/plugins/emoji.rs    | 21 +++++++++++++-----
 src/plugins/help.rs     | 10 ++++-----
 src/plugins/keepnick.rs |  4 ++++
 src/plugins/url.rs      | 29 +++++++++++++++----------
 6 files changed, 79 insertions(+), 45 deletions(-)

(limited to 'src/plugins/currency.rs')

diff --git a/src/plugin.rs b/src/plugin.rs
index d14c129..63d3530 100644
--- a/src/plugin.rs
+++ b/src/plugin.rs
@@ -13,6 +13,8 @@ pub trait Plugin: PluginName + Send + Sync + fmt::Debug {
     fn execute(&self, server: &IrcServer, message: &Message) -> Result<(), IrcError>;
     /// Handles any command directed at this plugin.
     fn command(&self, server: &IrcServer, command: PluginCommand) -> Result<(), IrcError>;
+    /// Should work like command but return a String instead of sending messages to IRC.
+    fn evaluate(&self, server: &IrcServer, command: PluginCommand) -> Result<String, String>;
 }
 
 /// `PluginName` is required by `Plugin`.  
diff --git a/src/plugins/currency.rs b/src/plugins/currency.rs
index 634faa2..4d44d9a 100644
--- a/src/plugins/currency.rs
+++ b/src/plugins/currency.rs
@@ -68,24 +68,26 @@ impl Currency {
         Currency {}
     }
 
-    fn eval_command<'a>(&self, tokens: &'a [String]) -> Result<ConvertionRequest<'a>, ParseFloatError> {
+    fn eval_command<'a>(&self,
+                        tokens: &'a [String])
+                        -> Result<ConvertionRequest<'a>, ParseFloatError> {
         Ok(ConvertionRequest {
-            value: tokens[0].parse()?,
-            source: &tokens[1],
-            target: &tokens[2],
-        })
+               value: tokens[0].parse()?,
+               source: &tokens[1],
+               target: &tokens[2],
+           })
     }
 
-    fn convert(&self, server: &IrcServer, command: PluginCommand) -> Result<(), IrcError> {
+    fn convert(&self, server: &IrcServer, command: &mut PluginCommand) -> Result<String, String> {
 
         if command.tokens.len() < 3 {
-            return self.invalid_command(server, &command);
+            return Err(self.invalid_command(server));
         }
 
         let request = match self.eval_command(&command.tokens) {
             Ok(request) => request,
             Err(_) => {
-                return self.invalid_command(server, &command);
+                return Err(self.invalid_command(server));
             }
         };
 
@@ -97,31 +99,27 @@ impl Currency {
                                        response / 1.00000000,
                                        request.target.to_lowercase());
 
-                server.send_privmsg(&command.target, &response)
+                Ok(response)
             }
-            None => server.send_notice(&command.source, "Error while converting given currency"),
+            None => Err(String::from("An error occured during the conversion of the given currency")),
         }
     }
 
-    fn help(&self, server: &IrcServer, command: &mut PluginCommand) -> Result<(), IrcError> {
-        let help = format!("usage: {} currency value from_currency to_currency\r\n\
+    fn help(&self, server: &IrcServer) -> String {
+        format!("usage: {} currency value from_currency to_currency\r\n\
                             example: 1.5 eur usd\r\n\
                             available currencies: AUD, BGN, BRL, CAD, \
                             CHF, CNY, CZK, DKK, GBP, HKD, HRK, HUF, \
                             IDR, ILS, INR, JPY, KRW, MXN, MYR, NOK, \
                             NZD, PHP, PLN, RON, RUB, SEK, SGD, THB, \
                             TRY, USD, ZAR",
-                           server.current_nickname());
-
-        server.send_notice(&command.source, &help)
+                           server.current_nickname())
     }
 
-    fn invalid_command(&self, server: &IrcServer, command: &PluginCommand) -> Result<(), IrcError> {
-        let help = format!("Incorrect Command. \
+    fn invalid_command(&self, server: &IrcServer) -> String {
+        format!("Incorrect Command. \
                            Send \"{} currency help\" for help.",
-                           server.current_nickname());
-
-        server.send_notice(&command.source, &help)
+                   server.current_nickname())
     }
 }
 
@@ -137,12 +135,26 @@ impl Plugin for Currency {
     fn command(&self, server: &IrcServer, mut command: PluginCommand) -> Result<(), IrcError> {
 
         if command.tokens.is_empty() {
-            return self.invalid_command(server, &command);
+            return server.send_notice(&command.source, &self.invalid_command(server));
+        }
+
+        match command.tokens[0].as_ref() {
+            "help" => server.send_notice(&command.source, &self.help(server)),
+            _ => match self.convert(server, &mut command) {
+                Ok(msg) => server.send_privmsg(&command.target, &msg),
+                Err(msg) => server.send_notice(&command.source, &msg),
+            }
+        }
+    }
+
+    fn evaluate(&self, server: &IrcServer, mut command: PluginCommand) -> Result<String, String>{
+        if command.tokens.is_empty() {
+            return Err(self.invalid_command(server));
         }
 
         match command.tokens[0].as_ref() {
-            "help" => self.help(server, &mut command),
-            _ => self.convert(server, command),
+            "help" => Ok(self.help(server)),
+            _ => self.convert(server, &mut command),
         }
     }
 }
diff --git a/src/plugins/emoji.rs b/src/plugins/emoji.rs
index 59e2fdd..512a62e 100644
--- a/src/plugins/emoji.rs
+++ b/src/plugins/emoji.rs
@@ -36,13 +36,12 @@ impl Emoji {
         Emoji {}
     }
 
-    fn emoji(&self, server: &IrcServer, content: &str, target: &str) -> Result<(), IrcError> {
-        let names = self.return_emojis(content)
+    fn emoji(&self, content: &str) -> String {
+        self.return_emojis(content)
             .iter()
             .map(|e| e.to_string())
-            .collect::<Vec<String>>();
-
-        server.send_privmsg(target, &names.join(", "))
+            .collect::<Vec<String>>()
+            .join(", ")
     }
 
     fn return_emojis(&self, string: &str) -> Vec<EmojiHandle> {
@@ -108,7 +107,8 @@ impl Plugin for Emoji {
     fn execute(&self, server: &IrcServer, message: &Message) -> Result<(), IrcError> {
         match message.command {
             Command::PRIVMSG(_, ref content) => {
-                self.emoji(server, content, message.response_target().unwrap())
+                server.send_privmsg(message.response_target().unwrap(),
+                                    &self.emoji(content))
             }
             _ => Ok(()),
         }
@@ -118,6 +118,15 @@ impl Plugin for Emoji {
         server.send_notice(&command.source,
                            "This Plugin does not implement any commands.")
     }
+
+    fn evaluate(&self, _: &IrcServer, command: PluginCommand) -> Result<String, String> {
+        let emojis = self.emoji(&command.tokens[0]);
+        if emojis.is_empty() {
+            Ok(emojis)
+        } else {
+            Err(String::from("No emojis were found."))
+        }
+    }
 }
 
 #[cfg(test)]
diff --git a/src/plugins/help.rs b/src/plugins/help.rs
index 7b987d4..cea325f 100644
--- a/src/plugins/help.rs
+++ b/src/plugins/help.rs
@@ -10,10 +10,6 @@ impl Help {
     pub fn new() -> Help {
         Help {}
     }
-
-    fn help(&self, server: &IrcServer, command: PluginCommand) -> Result<(), IrcError> {
-        server.send_notice(&command.source, "Help has not been added yet.")
-    }
 }
 
 impl Plugin for Help {
@@ -26,7 +22,11 @@ impl Plugin for Help {
     }
 
     fn command(&self, server: &IrcServer, command: PluginCommand) -> Result<(), IrcError> {
-        self.help(server, command)
+        server.send_notice(&command.source, "Help has not been added yet.")
+    }
+
+    fn evaluate(&self, _: &IrcServer, _: PluginCommand) -> Result<String, String> {
+        Err(String::from("Help has not been added yet."))
     }
 }
 
diff --git a/src/plugins/keepnick.rs b/src/plugins/keepnick.rs
index 1d4627d..2970857 100644
--- a/src/plugins/keepnick.rs
+++ b/src/plugins/keepnick.rs
@@ -54,6 +54,10 @@ impl Plugin for KeepNick {
         server.send_notice(&command.source,
                            "This Plugin does not implement any commands.")
     }
+
+    fn evaluate(&self, _: &IrcServer, _: PluginCommand) -> Result<String, String> {
+        Err(String::from("This Plugin does not implement any commands."))
+    }
 }
 
 #[cfg(test)]
diff --git a/src/plugins/url.rs b/src/plugins/url.rs
index f6e06f3..ab36833 100644
--- a/src/plugins/url.rs
+++ b/src/plugins/url.rs
@@ -95,11 +95,11 @@ impl Url {
         }
     }
 
-    fn url(&self, server: &IrcServer, message: &str, target: &str) -> Result<(), IrcError> {
-        let url = match self.grep_url(message) {
+    fn url(&self, text: &str) -> Result<String, &str> {
+        let url = match self.grep_url(text) {
             Some(url) => url,
             None => {
-                return Ok(());
+                return Err("No Url was found.")
             }
         };
 
@@ -109,18 +109,18 @@ impl Url {
 
                 let doc = Document::from(body.as_ref());
                 if let Some(title) = doc.find(Name("title")).next() {
-                    let text = title.children().next().unwrap();
-                    let message = text.as_text().unwrap().trim().replace("\n", "|");
-                    debug!("Title: {:?}", text);
-                    debug!("Message: {:?}", message);
+                    let title = title.children().next().unwrap();
+                    let title_text = title.as_text().unwrap().trim().replace("\n", "|");
+                    debug!("Title: {:?}", title);
+                    debug!("Text: {:?}", title_text);
 
-                    server.send_privmsg(target, &message)
+                    Ok(title_text)
 
                 } else {
-                    Ok(())
+                    Err("No title was found.")
                 }
             }
-            None => Ok(()),
+            None => Err("Failed to download document.")
         }
     }
 }
@@ -136,7 +136,10 @@ impl Plugin for Url {
     fn execute(&self, server: &IrcServer, message: &Message) -> Result<(), IrcError> {
         match message.command {
             Command::PRIVMSG(_, ref content) => {
-                self.url(server, content, message.response_target().unwrap())
+                match self.url(content) {
+                    Ok(title) => server.send_privmsg(&message.response_target().unwrap(), &title),
+                    Err(_) => Ok(()),
+                }
             }
             _ => Ok(()),
         }
@@ -146,6 +149,10 @@ impl Plugin for Url {
         server.send_notice(&command.source,
                            "This Plugin does not implement any commands.")
     }
+
+    fn evaluate(&self, _: &IrcServer, command: PluginCommand) -> Result<String, String> {
+        self.url(&command.tokens[0]).map_err(|e| String::from(e))
+    }
 }
 
 #[cfg(test)]
-- 
cgit v1.2.3-70-g09d2


From 2c10ee57bbefde948b401c36fc50209bc34a99ad Mon Sep 17 00:00:00 2001
From: Jokler <jokler.contact@gmail.com>
Date: Sat, 10 Feb 2018 15:25:01 +0100
Subject: Upgrade dependencies

---
 Cargo.lock              | 188 ++++++++++++++++++++++++++++++------------------
 Cargo.toml              |  20 +++---
 bin/main.rs             |  48 ++++++-------
 src/lib.rs              |  74 ++++++++-----------
 src/plugin.rs           |  10 +--
 src/plugins/currency.rs |  16 ++---
 src/plugins/emoji.rs    |  10 +--
 src/plugins/help.rs     |  10 +--
 src/plugins/keepnick.rs |  12 ++--
 src/plugins/url.rs      |  10 +--
 10 files changed, 217 insertions(+), 181 deletions(-)

(limited to 'src/plugins/currency.rs')

diff --git a/Cargo.lock b/Cargo.lock
index 61717a6..ab10e52 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -113,23 +113,23 @@ name = "chrono"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "clippy"
-version = "0.0.182"
+version = "0.0.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cargo_metadata 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy_lints 0.0.182 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy_lints 0.0.186 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "clippy_lints"
-version = "0.0.182"
+version = "0.0.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "if_chain 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -248,11 +248,22 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "error-chain"
-version = "0.10.0"
+name = "failure"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "backtrace 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "failure_derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "synstructure 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -272,20 +283,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "frippy"
 version = "0.3.1"
 dependencies = [
- "clippy 0.0.182 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.186 (registry+https://github.com/rust-lang/crates.io-index)",
  "frippy_derive 0.1.0",
- "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "irc 0.12.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "irc 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "select 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode_names 0.1.7 (git+https://github.com/Jokler/unicode_names?branch=update-to-latest-unicode)",
 ]
 
@@ -363,7 +372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "hyper"
-version = "0.11.15"
+version = "0.11.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -371,14 +380,15 @@ dependencies = [
  "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "httparse 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "relay 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicase 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -390,10 +400,10 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.11.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.11.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -424,22 +434,21 @@ dependencies = [
 
 [[package]]
 name = "irc"
-version = "0.12.8"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-mockstream 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-timer 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -571,7 +580,7 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.6.12"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -609,7 +618,7 @@ dependencies = [
  "schannel 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempdir 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -626,34 +635,42 @@ dependencies = [
 
 [[package]]
 name = "num"
-version = "0.1.41"
+version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "num-integer"
-version = "0.1.35"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-traits 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.34"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.1.42"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -715,7 +732,7 @@ version = "0.7.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -758,11 +775,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "rand"
-version = "0.3.20"
+version = "0.3.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -772,7 +800,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "regex"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -789,12 +817,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "relay"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "remove_dir_all"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "reqwest"
 version = "0.8.4"
@@ -802,7 +839,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.11.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.11.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libflate 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -812,7 +849,7 @@ dependencies = [
  "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_urlencoded 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -920,7 +957,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1003,6 +1040,15 @@ dependencies = [
  "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "take"
 version = "0.1.0"
@@ -1010,10 +1056,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "tempdir"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "remove_dir_all 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1054,20 +1101,20 @@ dependencies = [
  "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-io"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1076,7 +1123,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1087,12 +1134,12 @@ dependencies = [
  "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1121,7 +1168,7 @@ dependencies = [
  "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1212,7 +1259,7 @@ name = "uuid"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1286,8 +1333,8 @@ dependencies = [
 "checksum cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "deaf9ec656256bb25b404c51ef50097207b9cbb29c933d31f92cae5a8a0ffee0"
 "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
 "checksum chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c20ebe0b2b08b0aeddba49c609fe7957ba2e33449882cb186a180bc60682fa9"
-"checksum clippy 0.0.182 (registry+https://github.com/rust-lang/crates.io-index)" = "fa5d02da768264b4faa1494aad322c4537f3f9855349ef704077064a246248e3"
-"checksum clippy_lints 0.0.182 (registry+https://github.com/rust-lang/crates.io-index)" = "e60c2e0439117abddf18407165aeb46b0e9a59d3a441b323ac176d2894f2adde"
+"checksum clippy 0.0.186 (registry+https://github.com/rust-lang/crates.io-index)" = "fa7b79c57f831e752f3667ae6115d02ed2d9e97a986ff76e5f04d613a8c0842a"
+"checksum clippy_lints 0.0.186 (registry+https://github.com/rust-lang/crates.io-index)" = "a3864104a4e6092e644b985dd7543e5f24e99aa7262f5ee400bcb17cfeec1bf5"
 "checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67"
 "checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d"
 "checksum crc 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd5d02c0aac6bd68393ed69e00bbc2457f3e89075c6349db7189618dc4ddc1d7"
@@ -1301,7 +1348,8 @@ dependencies = [
 "checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
 "checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
 "checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
-"checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
+"checksum failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "934799b6c1de475a012a02dab0ace1ace43789ee4b99bcfbf1a2e3e8ced5de82"
+"checksum failure_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c7cdda555bb90c9bb67a3b670a0f42de8e73f5981524123ad8578aafec8ddb8b"
 "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 "checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
@@ -1313,12 +1361,12 @@ dependencies = [
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
 "checksum html5ever 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a49d5001dd1bddf042ea41ed4e0a671d50b1bf187e66b349d7ec613bdce4ad90"
 "checksum httparse 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2f407128745b78abc95c0ffbe4e5d37427fdc0d45470710cfef8c44522a2e37"
-"checksum hyper 0.11.15 (registry+https://github.com/rust-lang/crates.io-index)" = "4d6105c5eeb03068b10ff34475a0d166964f98e7b9777cc34b342a225af9b87c"
+"checksum hyper 0.11.18 (registry+https://github.com/rust-lang/crates.io-index)" = "c4f9b276c87e3fc1902a8bdfcce264c3f7c8a1c35e5e0c946062739f55026664"
 "checksum hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c81fa95203e2a6087242c38691a0210f23e9f3f8f944350bd676522132e2985"
 "checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d"
 "checksum if_chain 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "61bb90bdd39e3af69b0172dfc6130f6cd6332bf040fbb9bdd4401d37adbd48b8"
 "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
-"checksum irc 0.12.8 (registry+https://github.com/rust-lang/crates.io-index)" = "2bf1f0b1ab53de0a7c48591d681ba5e39db83884fc4c1f37e2617fc7c7373cc5"
+"checksum irc 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cf38b935ba382932a429f918888568d1f94c24e2d6d2289b96b817085624a39d"
 "checksum itertools 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d3f2be4da1690a039e9ae5fd575f706a63ad5a2120f161b1d653c9da3930dd21"
 "checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
@@ -1336,14 +1384,15 @@ dependencies = [
 "checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d"
 "checksum mime 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e2e00e17be181010a91dbfefb01660b17311059dc8c7f48b9017677721e732bd"
 "checksum mime_guess 2.0.0-alpha.3 (registry+https://github.com/rust-lang/crates.io-index)" = "013572795763289e14710c7b279461295f2673b2b338200c235082cd7ca9e495"
-"checksum mio 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "75f72a93f046f1517e3cfddc0a096eb756a2ba727d36edc8227dee769a50a9b0"
+"checksum mio 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "7da01a5e23070d92d99b1ecd1cd0af36447c6fd44b0fe283c2db199fa136724f"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
 "checksum native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f74dbadc8b43df7864539cedb7bc91345e532fdd913cfdc23ad94f4d2d40fbc0"
 "checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09"
-"checksum num 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "cc4083e14b542ea3eb9b5f33ff48bd373a92d78687e74f4cc0a30caeb754f0ca"
-"checksum num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "d1452e8b06e448a07f0e6ebb0bb1d92b8890eea63288c0b627331d53514d0fba"
-"checksum num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "7485fcc84f85b4ecd0ea527b14189281cf27d60e583ae65ebc9c088b13dffe01"
-"checksum num-traits 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "9936036cc70fe4a8b2d338ab665900323290efb03983c86cbe235ae800ad8017"
+"checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
+"checksum num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f8d26da319fb45674985c78f1d1caf99aa4941f785d384a2ae36d0740bc3e2fe"
+"checksum num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "4b226df12c5a59b63569dd57fafb926d91b385dfce33d8074a412411b689d593"
+"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
+"checksum num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e7de20f146db9d920c45ee8ed8f71681fd9ade71909b48c3acbd766aa504cf10"
 "checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30"
 "checksum openssl 0.9.23 (registry+https://github.com/rust-lang/crates.io-index)" = "169a4b9160baf9b9b1ab975418c673686638995ba921683a7f1e01470dcb8854"
 "checksum openssl-sys 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "14ba54ac7d5a4eabd1d5f2c1fdeb7e7c14debfa669d94b983d01b465e767ba9e"
@@ -1357,11 +1406,13 @@ dependencies = [
 "checksum pulldown-cmark 0.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "378e941dbd392c101f2cb88097fa4d7167bc421d4b88de3ff7dbee503bc3233b"
 "checksum quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "07589615d719a60c8dd8a4622e7946465dfef20d1a428f969e3443e7386d5f45"
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
-"checksum rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)" = "512870020642bb8c221bf68baa1b2573da814f6ccfe5c9699b1c303047abe9b1"
+"checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1"
+"checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5"
 "checksum redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd"
-"checksum regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "744554e01ccbd98fff8c457c3b092cd67af62a555a43bfe97ae8a0451f7799fa"
+"checksum regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "5be5347bde0c48cfd8c3fdc0766cdfe9d8a755ef84d620d6794c778c91de8b2b"
 "checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e"
-"checksum relay 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f301bafeb60867c85170031bdb2fcf24c8041f33aee09e7b116a58d4e9f781c5"
+"checksum relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a"
+"checksum remove_dir_all 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b5d2f806b0fcdabd98acd380dc8daef485e22bcb7cddc811d1337967f2528cf5"
 "checksum reqwest 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "449c45f593ce9af9417c91e22f274fb8cea013bcf3d37ec1b5fb534b623bc708"
 "checksum rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "aee45432acc62f7b9a108cc054142dac51f979e69e71ddce7d6fc7adf29e817e"
 "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
@@ -1387,13 +1438,14 @@ dependencies = [
 "checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc"
 "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
 "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
+"checksum synstructure 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3a761d12e6d8dcb4dcf952a7a89b475e3a9d69e4a69307e01a470977642914bd"
 "checksum take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b157868d8ac1f56b64604539990685fa7611d8fa9e5476cf0c02cf34d32917c5"
-"checksum tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6"
+"checksum tempdir 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f73eebdb68c14bcb24aef74ea96079830e7fa7b31a6106e42ea7ee887c1e134e"
 "checksum tendril 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1b72f8e2f5b73b65c315b1a70c730f24b9d7a25f39e98de8acbe2bb795caea"
 "checksum thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963"
 "checksum time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "a15375f1df02096fb3317256ce2cee6a1f42fc84ea5ad5fc8c421cfe40c73098"
 "checksum tokio-core 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "52b4e32d8edbf29501aabb3570f027c6ceb00ccef6538f4bddba0200503e74e8"
-"checksum tokio-io 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "514aae203178929dbf03318ad7c683126672d4d96eccb77b29603d33c9e25743"
+"checksum tokio-io 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b9532748772222bf70297ec0e2ad0f17213b4a7dd0e6afb68e0a0768f69f4e4f"
 "checksum tokio-mockstream 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41bfc436ef8b7f60c19adf3df086330ae9992385e4d8c53b17a323cad288e155"
 "checksum tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fbb47ae81353c63c487030659494b295f6cb6576242f907f203473b191b0389"
 "checksum tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162"
diff --git a/Cargo.toml b/Cargo.toml
index 3218e65..bbaa28d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,18 +19,16 @@ path = "bin/main.rs"
 doc = false
 
 [dependencies]
-irc             = "0.12.5"
-tokio-core      = "0.1.10"
-futures         = "0.1.16"
-log             = "0.3.8"
-time            = "0.1"
-reqwest         = "0.8.0"
+irc             = "0.13.2"
+log             = "0.4.1"
+time            = "0.1.39"
+reqwest         = "0.8.4"
 select          = "0.4.2"
-regex           = "0.2.2"
-lazy_static     = "0.2.9"
-serde           = "1.0.15"
-serde_json      = "1.0.3"
-glob            = "0.2"
+regex           = "0.2.6"
+lazy_static     = "1.0.0"
+serde           = "1.0.27"
+serde_json      = "1.0.9"
+glob            = "0.2.11"
 
 frippy_derive = { path = "frippy_derive" }
 unicode_names = { git = 'https://github.com/Jokler/unicode_names', branch = 'update-to-latest-unicode' }
diff --git a/bin/main.rs b/bin/main.rs
index ac25a93..21e27dc 100644
--- a/bin/main.rs
+++ b/bin/main.rs
@@ -1,16 +1,14 @@
 extern crate frippy;
 extern crate time;
-extern crate tokio_core;
+extern crate irc;
 extern crate glob;
-extern crate futures;
 
 #[macro_use]
 extern crate log;
 
-use log::{LogRecord, LogLevel, LogLevelFilter, LogMetadata};
+use log::{Record, Level, LevelFilter, Metadata};
 
-use tokio_core::reactor::Core;
-use futures::future;
+use irc::client::reactor::IrcReactor;
 use glob::glob;
 
 use frippy::plugins;
@@ -19,13 +17,13 @@ use frippy::Config;
 struct Logger;
 
 impl log::Log for Logger {
-    fn enabled(&self, metadata: &LogMetadata) -> bool {
+    fn enabled(&self, metadata: &Metadata) -> bool {
         metadata.target().contains("frippy")
     }
 
-    fn log(&self, record: &LogRecord) {
+    fn log(&self, record: &Record) {
         if self.enabled(record.metadata()) {
-            if record.metadata().level() >= LogLevel::Debug {
+            if record.metadata().level() >= Level::Debug {
                 println!("[{}]({}) {} -> {}",
                          time::now().rfc822(),
                          record.level(),
@@ -39,21 +37,21 @@ impl log::Log for Logger {
             }
         }
     }
+
+    fn flush(&self) {}
 }
 
+static LOGGER: Logger = Logger;
+
 fn main() {
 
-    let log_level = if cfg!(debug_assertions) {
-        LogLevelFilter::Debug
-    } else {
-        LogLevelFilter::Info
-    };
+    log::set_max_level(if cfg!(debug_assertions) {
+                           LevelFilter::Debug
+                       } else {
+                           LevelFilter::Info
+                       });
 
-    log::set_logger(|max_log_level| {
-                        max_log_level.set(log_level);
-                        Box::new(Logger)
-                    })
-            .unwrap();
+    log::set_logger(&LOGGER).unwrap();
 
     // Load all toml files in the configs directory
     let mut configs = Vec::new();
@@ -77,8 +75,7 @@ fn main() {
     }
 
     // Create an event loop to run the connections on.
-    let mut reactor = Core::new().unwrap();
-    let mut futures = Vec::new();
+    let mut reactor = IrcReactor::new().unwrap();
 
     // Open a connection and add work for each config
     for config in configs {
@@ -86,7 +83,10 @@ fn main() {
         let mut disabled_plugins = None;
         if let &Some(ref options) = &config.options {
             if let Some(disabled) = options.get("disabled_plugins") {
-                disabled_plugins = Some(disabled.split(",").map(|p| p.trim()).collect::<Vec<_>>());
+                disabled_plugins = Some(disabled
+                                            .split(",")
+                                            .map(|p| p.trim())
+                                            .collect::<Vec<_>>());
             }
         }
 
@@ -105,9 +105,9 @@ fn main() {
             }
         }
 
-        futures.push(bot.connect(&mut reactor, &config));
+        bot.connect(&mut reactor, &config).expect("Failed to connect");
     }
 
-    // Run the bots until they throw an error
-    reactor.run(future::join_all(futures)).unwrap();
+    // Run the bots until they throw an error - an error could be loss of connection
+    reactor.run().unwrap();
 }
diff --git a/src/lib.rs b/src/lib.rs
index d769075..3e47c8c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,24 +6,22 @@
 //!
 //! ## Examples
 //! ```no_run
-//! # extern crate tokio_core;
-//! # extern crate futures;
+//! # extern crate irc;
 //! # extern crate frippy;
 //! # fn main() {
 //! use frippy::{plugins, Config, Bot};
-//! use tokio_core::reactor::Core;
-//! use futures::future;
+//! use irc::client::reactor::IrcReactor;
 //!
 //! let config = Config::load("config.toml").unwrap();
-//! let mut reactor = Core::new().unwrap();
+//! let mut reactor = IrcReactor::new().unwrap();
 //! let mut bot = Bot::new();
 //!
 //! bot.add_plugin(plugins::Help::new());
 //! bot.add_plugin(plugins::Emoji::new());
 //! bot.add_plugin(plugins::Currency::new());
 //!
-//! bot.connect(&mut reactor, &config);
-//! reactor.run(future::empty::<(), ()>()).unwrap();
+//! bot.connect(&mut reactor, &config).unwrap();
+//! reactor.run().unwrap();
 //! # }
 //! ```
 //!
@@ -39,8 +37,6 @@ extern crate lazy_static;
 extern crate frippy_derive;
 
 extern crate irc;
-extern crate futures;
-extern crate tokio_core;
 
 pub mod plugin;
 pub mod plugins;
@@ -50,9 +46,8 @@ use std::collections::HashMap;
 use std::thread::spawn;
 use std::sync::Arc;
 
-use tokio_core::reactor::Core;
 pub use irc::client::prelude::*;
-pub use irc::error::Error as IrcError;
+pub use irc::error::IrcError;
 
 use plugin::*;
 
@@ -108,66 +103,57 @@ impl Bot {
         self.plugins.remove(name)
     }
 
-    /// This connects the `Bot` to IRC and returns a `Future`
-    /// which represents the bots work.
-    /// This `Future` will run forever unless it returns an error.
+    /// This connects the `Bot` to IRC and creates a task on the `IrcReactor`
+    /// which returns an Ok if the connection was cleanly closed and an Err
+    /// if the connection was lostwhich returns an Ok if the connection was cleanly closed and an Err
+    /// if the connection was lost.
     ///
-    /// You need to run the `Future`, so that the `Bot`
+    /// You need to run the `IrcReactor`, so that the `Bot`
     /// can actually do its work.
     ///
     /// # Examples
     /// ```no_run
-    /// # extern crate tokio_core;
-    /// # extern crate futures;
+    /// # extern crate irc;
     /// # extern crate frippy;
     /// # fn main() {
     /// use frippy::{Config, Bot};
-    /// use tokio_core::reactor::Core;
-    /// use futures::future;
+    /// use irc::client::reactor::IrcReactor;
     ///
     /// let config = Config::load("config.toml").unwrap();
-    /// let mut reactor = Core::new().unwrap();
+    /// let mut reactor = IrcReactor::new().unwrap();
     /// let mut bot = Bot::new();
     ///
-    /// let future = bot.connect(&mut reactor, &config);
-    /// reactor.run(future).unwrap();
+    /// bot.connect(&mut reactor, &config).unwrap();
+    /// reactor.run().unwrap();
     /// # }
     /// ```
-    pub fn connect(&self, reactor: &mut Core, config: &Config) -> Option<Box<futures::Future<Item = (), Error = ()>>> {
+    pub fn connect(&self, reactor: &mut IrcReactor, config: &Config) -> Result<(), String> {
         info!("Plugins loaded: {}", self.plugins);
 
-        let server =
-            match IrcServer::new_future(reactor.handle(), config).and_then(|f| {reactor.run(f)}) {
-                Ok(v) => v,
-                Err(e) => {
-                    error!("Failed to connect: {}", e);
-                    return None;
-                }
-            };
+        let client = match reactor.prepare_client_and_connect(config) {
+            Ok(v) => v,
+            Err(e) => return Err(format!("Failed to connect: {}", e)),
+        };
 
         info!("Connected to server");
 
-        match server.identify() {
+        match client.identify() {
             Ok(_) => info!("Identified"),
-            Err(e) => {
-                error!("Failed to identify: {}", e);
-                return None;
-            }
+            Err(e) => return Err(format!("Failed to identify: {}", e)),
         };
 
         // TODO Verify if we actually need to clone plugins twice
         let plugins = self.plugins.clone();
 
-        let future = server
-            .stream()
-            .for_each(move |message| process_msg(&server, plugins.clone(), message))
-            .map_err(|e| error!("Failed to process message: {}", e));
+        reactor.register_client_with_handler(client, move |client, message| {
+            process_msg(&client, plugins.clone(), message)
+        });
 
-        Some(Box::new(future))
+        Ok(())
     }
 }
 
-fn process_msg(server: &IrcServer,
+fn process_msg(server: &IrcClient,
                mut plugins: ThreadedPlugins,
                message: Message)
                -> Result<(), IrcError> {
@@ -215,7 +201,7 @@ impl ThreadedPlugins {
         self.plugins.remove(&name.to_lowercase()).map(|_| ())
     }
 
-    pub fn execute_plugins(&mut self, server: &IrcServer, message: Message) {
+    pub fn execute_plugins(&mut self, server: &IrcClient, message: Message) {
         let message = Arc::new(message);
 
         for (name, plugin) in self.plugins.clone() {
@@ -242,7 +228,7 @@ impl ThreadedPlugins {
     }
 
     pub fn handle_command(&mut self,
-                          server: &IrcServer,
+                          server: &IrcClient,
                           mut command: PluginCommand)
                           -> Result<(), IrcError> {
 
diff --git a/src/plugin.rs b/src/plugin.rs
index 63d3530..8785708 100644
--- a/src/plugin.rs
+++ b/src/plugin.rs
@@ -2,19 +2,19 @@
 use std::fmt;
 
 use irc::client::prelude::*;
-use irc::error::Error as IrcError;
+use irc::error::IrcError;
 
 /// `Plugin` has to be implemented for any struct that should be usable
 /// as a plugin in frippy.
 pub trait Plugin: PluginName + Send + Sync + fmt::Debug {
     /// This should return true if the `Plugin` wants to do work on the message.
-    fn is_allowed(&self, server: &IrcServer, message: &Message) -> bool;
+    fn is_allowed(&self, server: &IrcClient, message: &Message) -> bool;
     /// Handles messages which are not commands but still necessary.
-    fn execute(&self, server: &IrcServer, message: &Message) -> Result<(), IrcError>;
+    fn execute(&self, server: &IrcClient, message: &Message) -> Result<(), IrcError>;
     /// Handles any command directed at this plugin.
-    fn command(&self, server: &IrcServer, command: PluginCommand) -> Result<(), IrcError>;
+    fn command(&self, server: &IrcClient, command: PluginCommand) -> Result<(), IrcError>;
     /// Should work like command but return a String instead of sending messages to IRC.
-    fn evaluate(&self, server: &IrcServer, command: PluginCommand) -> Result<String, String>;
+    fn evaluate(&self, server: &IrcClient, command: PluginCommand) -> Result<String, String>;
 }
 
 /// `PluginName` is required by `Plugin`.  
diff --git a/src/plugins/currency.rs b/src/plugins/currency.rs
index 4d44d9a..32a2506 100644
--- a/src/plugins/currency.rs
+++ b/src/plugins/currency.rs
@@ -6,7 +6,7 @@ use std::io::Read;
 use std::num::ParseFloatError;
 
 use irc::client::prelude::*;
-use irc::error::Error as IrcError;
+use irc::error::IrcError;
 
 use self::reqwest::Client;
 use self::reqwest::header::Connection;
@@ -78,7 +78,7 @@ impl Currency {
            })
     }
 
-    fn convert(&self, server: &IrcServer, command: &mut PluginCommand) -> Result<String, String> {
+    fn convert(&self, server: &IrcClient, command: &mut PluginCommand) -> Result<String, String> {
 
         if command.tokens.len() < 3 {
             return Err(self.invalid_command(server));
@@ -105,7 +105,7 @@ impl Currency {
         }
     }
 
-    fn help(&self, server: &IrcServer) -> String {
+    fn help(&self, server: &IrcClient) -> String {
         format!("usage: {} currency value from_currency to_currency\r\n\
                             example: 1.5 eur usd\r\n\
                             available currencies: AUD, BGN, BRL, CAD, \
@@ -116,7 +116,7 @@ impl Currency {
                            server.current_nickname())
     }
 
-    fn invalid_command(&self, server: &IrcServer) -> String {
+    fn invalid_command(&self, server: &IrcClient) -> String {
         format!("Incorrect Command. \
                            Send \"{} currency help\" for help.",
                    server.current_nickname())
@@ -124,15 +124,15 @@ impl Currency {
 }
 
 impl Plugin for Currency {
-    fn is_allowed(&self, _: &IrcServer, _: &Message) -> bool {
+    fn is_allowed(&self, _: &IrcClient, _: &Message) -> bool {
         false
     }
 
-    fn execute(&self, _: &IrcServer, _: &Message) -> Result<(), IrcError> {
+    fn execute(&self, _: &IrcClient, _: &Message) -> Result<(), IrcError> {
         panic!("Currency does not implement the execute function!")
     }
 
-    fn command(&self, server: &IrcServer, mut command: PluginCommand) -> Result<(), IrcError> {
+    fn command(&self, server: &IrcClient, mut command: PluginCommand) -> Result<(), IrcError> {
 
         if command.tokens.is_empty() {
             return server.send_notice(&command.source, &self.invalid_command(server));
@@ -147,7 +147,7 @@ impl Plugin for Currency {
         }
     }
 
-    fn evaluate(&self, server: &IrcServer, mut command: PluginCommand) -> Result<String, String>{
+    fn evaluate(&self, server: &IrcClient, mut command: PluginCommand) -> Result<String, String>{
         if command.tokens.is_empty() {
             return Err(self.invalid_command(server));
         }
diff --git a/src/plugins/emoji.rs b/src/plugins/emoji.rs
index 512a62e..c19593d 100644
--- a/src/plugins/emoji.rs
+++ b/src/plugins/emoji.rs
@@ -3,7 +3,7 @@ extern crate unicode_names;
 use std::fmt;
 
 use irc::client::prelude::*;
-use irc::error::Error as IrcError;
+use irc::error::IrcError;
 
 use plugin::*;
 
@@ -97,14 +97,14 @@ impl Emoji {
 }
 
 impl Plugin for Emoji {
-    fn is_allowed(&self, _: &IrcServer, message: &Message) -> bool {
+    fn is_allowed(&self, _: &IrcClient, message: &Message) -> bool {
         match message.command {
             Command::PRIVMSG(_, _) => true,
             _ => false,
         }
     }
 
-    fn execute(&self, server: &IrcServer, message: &Message) -> Result<(), IrcError> {
+    fn execute(&self, server: &IrcClient, message: &Message) -> Result<(), IrcError> {
         match message.command {
             Command::PRIVMSG(_, ref content) => {
                 server.send_privmsg(message.response_target().unwrap(),
@@ -114,12 +114,12 @@ impl Plugin for Emoji {
         }
     }
 
-    fn command(&self, server: &IrcServer, command: PluginCommand) -> Result<(), IrcError> {
+    fn command(&self, server: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
         server.send_notice(&command.source,
                            "This Plugin does not implement any commands.")
     }
 
-    fn evaluate(&self, _: &IrcServer, command: PluginCommand) -> Result<String, String> {
+    fn evaluate(&self, _: &IrcClient, command: PluginCommand) -> Result<String, String> {
         let emojis = self.emoji(&command.tokens[0]);
         if emojis.is_empty() {
             Ok(emojis)
diff --git a/src/plugins/help.rs b/src/plugins/help.rs
index cea325f..1bb15e1 100644
--- a/src/plugins/help.rs
+++ b/src/plugins/help.rs
@@ -1,5 +1,5 @@
 use irc::client::prelude::*;
-use irc::error::Error as IrcError;
+use irc::error::IrcError;
 
 use plugin::*;
 
@@ -13,19 +13,19 @@ impl Help {
 }
 
 impl Plugin for Help {
-    fn is_allowed(&self, _: &IrcServer, _: &Message) -> bool {
+    fn is_allowed(&self, _: &IrcClient, _: &Message) -> bool {
         false
     }
 
-    fn execute(&self, _: &IrcServer, _: &Message) -> Result<(), IrcError> {
+    fn execute(&self, _: &IrcClient, _: &Message) -> Result<(), IrcError> {
         panic!("Help does not implement the execute function!")
     }
 
-    fn command(&self, server: &IrcServer, command: PluginCommand) -> Result<(), IrcError> {
+    fn command(&self, server: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
         server.send_notice(&command.source, "Help has not been added yet.")
     }
 
-    fn evaluate(&self, _: &IrcServer, _: PluginCommand) -> Result<String, String> {
+    fn evaluate(&self, _: &IrcClient, _: PluginCommand) -> Result<String, String> {
         Err(String::from("Help has not been added yet."))
     }
 }
diff --git a/src/plugins/keepnick.rs b/src/plugins/keepnick.rs
index 2970857..4a40e8f 100644
--- a/src/plugins/keepnick.rs
+++ b/src/plugins/keepnick.rs
@@ -1,5 +1,5 @@
 use irc::client::prelude::*;
-use irc::error::Error as IrcError;
+use irc::error::IrcError;
 
 use plugin::*;
 
@@ -11,7 +11,7 @@ impl KeepNick {
         KeepNick {}
     }
 
-    fn check_nick(&self, server: &IrcServer, leaver: &str) -> Result<(), IrcError> {
+    fn check_nick(&self, server: &IrcClient, leaver: &str) -> Result<(), IrcError> {
         let cfg_nick = match server.config().nickname {
             Some(ref nick) => nick.clone(),
             None => return Ok(()),
@@ -34,14 +34,14 @@ impl KeepNick {
 }
 
 impl Plugin for KeepNick {
-    fn is_allowed(&self, _: &IrcServer, message: &Message) -> bool {
+    fn is_allowed(&self, _: &IrcClient, message: &Message) -> bool {
         match message.command {
             Command::QUIT(_) => true,
             _ => false,
         }
     }
 
-    fn execute(&self, server: &IrcServer, message: &Message) -> Result<(), IrcError> {
+    fn execute(&self, server: &IrcClient, message: &Message) -> Result<(), IrcError> {
         match message.command {
             Command::QUIT(ref nick) => {
                 self.check_nick(server, &nick.clone().unwrap_or_else(|| String::new()))
@@ -50,12 +50,12 @@ impl Plugin for KeepNick {
         }
     }
 
-    fn command(&self, server: &IrcServer, command: PluginCommand) -> Result<(), IrcError> {
+    fn command(&self, server: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
         server.send_notice(&command.source,
                            "This Plugin does not implement any commands.")
     }
 
-    fn evaluate(&self, _: &IrcServer, _: PluginCommand) -> Result<String, String> {
+    fn evaluate(&self, _: &IrcClient, _: PluginCommand) -> Result<String, String> {
         Err(String::from("This Plugin does not implement any commands."))
     }
 }
diff --git a/src/plugins/url.rs b/src/plugins/url.rs
index ab36833..b980d3e 100644
--- a/src/plugins/url.rs
+++ b/src/plugins/url.rs
@@ -3,7 +3,7 @@ extern crate reqwest;
 extern crate select;
 
 use irc::client::prelude::*;
-use irc::error::Error as IrcError;
+use irc::error::IrcError;
 
 use self::regex::Regex;
 
@@ -126,14 +126,14 @@ impl Url {
 }
 
 impl Plugin for Url {
-    fn is_allowed(&self, _: &IrcServer, message: &Message) -> bool {
+    fn is_allowed(&self, _: &IrcClient, message: &Message) -> bool {
         match message.command {
             Command::PRIVMSG(_, ref msg) => RE.is_match(msg),
             _ => false,
         }
     }
 
-    fn execute(&self, server: &IrcServer, message: &Message) -> Result<(), IrcError> {
+    fn execute(&self, server: &IrcClient, message: &Message) -> Result<(), IrcError> {
         match message.command {
             Command::PRIVMSG(_, ref content) => {
                 match self.url(content) {
@@ -145,12 +145,12 @@ impl Plugin for Url {
         }
     }
 
-    fn command(&self, server: &IrcServer, command: PluginCommand) -> Result<(), IrcError> {
+    fn command(&self, server: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
         server.send_notice(&command.source,
                            "This Plugin does not implement any commands.")
     }
 
-    fn evaluate(&self, _: &IrcServer, command: PluginCommand) -> Result<String, String> {
+    fn evaluate(&self, _: &IrcClient, command: PluginCommand) -> Result<String, String> {
         self.url(&command.tokens[0]).map_err(|e| String::from(e))
     }
 }
-- 
cgit v1.2.3-70-g09d2


From da5c2c8e4893bfb095a8e2122b943c4dca61c41d Mon Sep 17 00:00:00 2001
From: Jokler <jokler.contact@gmail.com>
Date: Mon, 12 Feb 2018 19:16:59 +0100
Subject: Replace is_allowed with a single-threaded execute function

The old execute got renamed to exeute_threaded.
---
 src/lib.rs              | 40 ++++++++++++++++++++++------------------
 src/main.rs             | 12 ++++++++----
 src/plugin.rs           | 10 ++++++++--
 src/plugins/currency.rs | 43 +++++++++++++++++++++----------------------
 src/plugins/emoji.rs    | 26 +++++++++++++-------------
 src/plugins/help.rs     | 12 ++++++------
 src/plugins/keepnick.rs | 42 +++++++++++++++++++++---------------------
 src/plugins/url.rs      | 22 +++++++++++++---------
 8 files changed, 112 insertions(+), 95 deletions(-)

(limited to 'src/plugins/currency.rs')

diff --git a/src/lib.rs b/src/lib.rs
index 3e47c8c..8a3a0d1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -146,7 +146,7 @@ impl Bot {
         let plugins = self.plugins.clone();
 
         reactor.register_client_with_handler(client, move |client, message| {
-            process_msg(&client, plugins.clone(), message)
+            process_msg(client, plugins.clone(), message)
         });
 
         Ok(())
@@ -206,23 +206,27 @@ impl ThreadedPlugins {
 
         for (name, plugin) in self.plugins.clone() {
             // Send the message to the plugin if the plugin needs it
-            if plugin.is_allowed(server, &message) {
-
-                debug!("Executing {} with {}",
-                       name,
-                       message.to_string().replace("\r\n", ""));
-
-                // Clone everything before the move - the server uses an Arc internally too
-                let plugin = Arc::clone(&plugin);
-                let message = Arc::clone(&message);
-                let server = server.clone();
-
-                // Execute the plugin in another thread
-                spawn(move || {
-                          if let Err(e) = plugin.execute(&server, &message) {
-                              error!("Error in {} - {}", name, e);
-                          };
-                      });
+            match plugin.execute(server, &message) {
+                ExecutionStatus::Done => (),
+                ExecutionStatus::Err(e) => error!("Error in {} - {}", name, e),
+                ExecutionStatus::RequiresThread => {
+
+                    debug!("Spawning thread to execute {} with {}",
+                           name,
+                           message.to_string().replace("\r\n", ""));
+
+                    // Clone everything before the move - the server uses an Arc internally too
+                    let plugin = Arc::clone(&plugin);
+                    let message = Arc::clone(&message);
+                    let server = server.clone();
+
+                    // Execute the plugin in another thread
+                    spawn(move || {
+                        if let Err(e) = plugin.execute_threaded(&server, &message) {
+                            error!("Error in {} - {}", name, e);
+                        };
+                    });
+                }
             }
         }
     }
diff --git a/src/main.rs b/src/main.rs
index 21e27dc..7df8b3b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,6 @@
+#![cfg_attr(feature="clippy", feature(plugin))]
+#![cfg_attr(feature="clippy", plugin(clippy))]
+
 extern crate frippy;
 extern crate time;
 extern crate irc;
@@ -81,10 +84,10 @@ fn main() {
     for config in configs {
 
         let mut disabled_plugins = None;
-        if let &Some(ref options) = &config.options {
+        if let Some(ref options) = config.options {
             if let Some(disabled) = options.get("disabled_plugins") {
                 disabled_plugins = Some(disabled
-                                            .split(",")
+                                            .split(',')
                                             .map(|p| p.trim())
                                             .collect::<Vec<_>>());
             }
@@ -96,11 +99,12 @@ fn main() {
         bot.add_plugin(plugins::Emoji::new());
         bot.add_plugin(plugins::Currency::new());
         bot.add_plugin(plugins::KeepNick::new());
+        bot.add_plugin(plugins::Tell::new());
 
         if let Some(disabled_plugins) = disabled_plugins {
             for name in disabled_plugins {
-                if let None = bot.remove_plugin(name) {
-                    error!("{:?} was not found - could not disable", name);
+                if bot.remove_plugin(name).is_none() {
+                    error!("\"{}\" was not found - could not disable", name);
                 }
             }
         }
diff --git a/src/plugin.rs b/src/plugin.rs
index 8785708..88fe3ce 100644
--- a/src/plugin.rs
+++ b/src/plugin.rs
@@ -4,13 +4,19 @@ use std::fmt;
 use irc::client::prelude::*;
 use irc::error::IrcError;
 
+pub enum ExecutionStatus {
+    Done,
+    Err(IrcError),
+    RequiresThread,
+}
+
 /// `Plugin` has to be implemented for any struct that should be usable
 /// as a plugin in frippy.
 pub trait Plugin: PluginName + Send + Sync + fmt::Debug {
     /// This should return true if the `Plugin` wants to do work on the message.
-    fn is_allowed(&self, server: &IrcClient, message: &Message) -> bool;
+    fn execute(&self, server: &IrcClient, message: &Message) -> ExecutionStatus;
     /// Handles messages which are not commands but still necessary.
-    fn execute(&self, server: &IrcClient, message: &Message) -> Result<(), IrcError>;
+    fn execute_threaded(&self, server: &IrcClient, message: &Message) -> Result<(), IrcError>;
     /// Handles any command directed at this plugin.
     fn command(&self, server: &IrcClient, command: PluginCommand) -> Result<(), IrcError>;
     /// Should work like command but return a String instead of sending messages to IRC.
diff --git a/src/plugins/currency.rs b/src/plugins/currency.rs
index 32a2506..21330a1 100644
--- a/src/plugins/currency.rs
+++ b/src/plugins/currency.rs
@@ -78,16 +78,15 @@ impl Currency {
            })
     }
 
-    fn convert(&self, server: &IrcClient, command: &mut PluginCommand) -> Result<String, String> {
-
+    fn convert(&self, client: &IrcClient, command: &mut PluginCommand) -> Result<String, String> {
         if command.tokens.len() < 3 {
-            return Err(self.invalid_command(server));
+            return Err(self.invalid_command(client));
         }
 
         let request = match self.eval_command(&command.tokens) {
             Ok(request) => request,
             Err(_) => {
-                return Err(self.invalid_command(server));
+                return Err(self.invalid_command(client));
             }
         };
 
@@ -105,56 +104,56 @@ impl Currency {
         }
     }
 
-    fn help(&self, server: &IrcClient) -> String {
+    fn help(&self, client: &IrcClient) -> String {
         format!("usage: {} currency value from_currency to_currency\r\n\
-                            example: 1.5 eur usd\r\n\
+                            example: {0} currency 1.5 eur usd\r\n\
                             available currencies: AUD, BGN, BRL, CAD, \
                             CHF, CNY, CZK, DKK, GBP, HKD, HRK, HUF, \
                             IDR, ILS, INR, JPY, KRW, MXN, MYR, NOK, \
                             NZD, PHP, PLN, RON, RUB, SEK, SGD, THB, \
                             TRY, USD, ZAR",
-                           server.current_nickname())
+                           client.current_nickname())
     }
 
-    fn invalid_command(&self, server: &IrcClient) -> String {
+    fn invalid_command(&self, client: &IrcClient) -> String {
         format!("Incorrect Command. \
                            Send \"{} currency help\" for help.",
-                   server.current_nickname())
+                   client.current_nickname())
     }
 }
 
 impl Plugin for Currency {
-    fn is_allowed(&self, _: &IrcClient, _: &Message) -> bool {
-        false
+    fn execute(&self, _: &IrcClient, _: &Message) -> ExecutionStatus {
+        ExecutionStatus::Done
     }
 
-    fn execute(&self, _: &IrcClient, _: &Message) -> Result<(), IrcError> {
+    fn execute_threaded(&self, _: &IrcClient, _: &Message) -> Result<(), IrcError> {
         panic!("Currency does not implement the execute function!")
     }
 
-    fn command(&self, server: &IrcClient, mut command: PluginCommand) -> Result<(), IrcError> {
+    fn command(&self, client: &IrcClient, mut command: PluginCommand) -> Result<(), IrcError> {
 
         if command.tokens.is_empty() {
-            return server.send_notice(&command.source, &self.invalid_command(server));
+            return client.send_notice(&command.source, &self.invalid_command(client));
         }
 
         match command.tokens[0].as_ref() {
-            "help" => server.send_notice(&command.source, &self.help(server)),
-            _ => match self.convert(server, &mut command) {
-                Ok(msg) => server.send_privmsg(&command.target, &msg),
-                Err(msg) => server.send_notice(&command.source, &msg),
+            "help" => client.send_notice(&command.source, &self.help(client)),
+            _ => match self.convert(client, &mut command) {
+                Ok(msg) => client.send_privmsg(&command.target, &msg),
+                Err(msg) => client.send_notice(&command.source, &msg),
             }
         }
     }
 
-    fn evaluate(&self, server: &IrcClient, mut command: PluginCommand) -> Result<String, String>{
+    fn evaluate(&self, client: &IrcClient, mut command: PluginCommand) -> Result<String, String>{
         if command.tokens.is_empty() {
-            return Err(self.invalid_command(server));
+            return Err(self.invalid_command(client));
         }
 
         match command.tokens[0].as_ref() {
-            "help" => Ok(self.help(server)),
-            _ => self.convert(server, &mut command),
+            "help" => Ok(self.help(client)),
+            _ => self.convert(client, &mut command),
         }
     }
 }
diff --git a/src/plugins/emoji.rs b/src/plugins/emoji.rs
index c19593d..02a31f8 100644
--- a/src/plugins/emoji.rs
+++ b/src/plugins/emoji.rs
@@ -97,25 +97,25 @@ impl Emoji {
 }
 
 impl Plugin for Emoji {
-    fn is_allowed(&self, _: &IrcClient, message: &Message) -> bool {
-        match message.command {
-            Command::PRIVMSG(_, _) => true,
-            _ => false,
-        }
-    }
-
-    fn execute(&self, server: &IrcClient, message: &Message) -> Result<(), IrcError> {
+    fn execute(&self, client: &IrcClient, message: &Message) -> ExecutionStatus {
         match message.command {
             Command::PRIVMSG(_, ref content) => {
-                server.send_privmsg(message.response_target().unwrap(),
-                                    &self.emoji(content))
+                match client.send_privmsg(message.response_target().unwrap(),
+                                          &self.emoji(content)) {
+                    Ok(_) => ExecutionStatus::Done,
+                    Err(e) => ExecutionStatus::Err(e),
+                }
             }
-            _ => Ok(()),
+            _ => ExecutionStatus::Done,
         }
     }
 
-    fn command(&self, server: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
-        server.send_notice(&command.source,
+    fn execute_threaded(&self, _: &IrcClient, _: &Message) -> Result<(), IrcError> {
+        panic!("Emoji should not use threading")
+    }
+
+    fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
+        client.send_notice(&command.source,
                            "This Plugin does not implement any commands.")
     }
 
diff --git a/src/plugins/help.rs b/src/plugins/help.rs
index 1bb15e1..4dd93d7 100644
--- a/src/plugins/help.rs
+++ b/src/plugins/help.rs
@@ -13,16 +13,16 @@ impl Help {
 }
 
 impl Plugin for Help {
-    fn is_allowed(&self, _: &IrcClient, _: &Message) -> bool {
-        false
+    fn execute(&self, _: &IrcClient, _: &Message) -> ExecutionStatus {
+        ExecutionStatus::Done
     }
 
-    fn execute(&self, _: &IrcClient, _: &Message) -> Result<(), IrcError> {
-        panic!("Help does not implement the execute function!")
+    fn execute_threaded(&self, _: &IrcClient, _: &Message) -> Result<(), IrcError> {
+        panic!("Help should not use threading")
     }
 
-    fn command(&self, server: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
-        server.send_notice(&command.source, "Help has not been added yet.")
+    fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
+        client.send_notice(&command.source, "Help has not been added yet.")
     }
 
     fn evaluate(&self, _: &IrcClient, _: PluginCommand) -> Result<String, String> {
diff --git a/src/plugins/keepnick.rs b/src/plugins/keepnick.rs
index 4a40e8f..e973769 100644
--- a/src/plugins/keepnick.rs
+++ b/src/plugins/keepnick.rs
@@ -11,47 +11,47 @@ impl KeepNick {
         KeepNick {}
     }
 
-    fn check_nick(&self, server: &IrcClient, leaver: &str) -> Result<(), IrcError> {
-        let cfg_nick = match server.config().nickname {
+    fn check_nick(&self, client: &IrcClient, leaver: &str) -> ExecutionStatus {
+        let cfg_nick = match client.config().nickname {
             Some(ref nick) => nick.clone(),
-            None => return Ok(()),
+            None => return ExecutionStatus::Done,
         };
 
         if leaver != cfg_nick {
-            return Ok(());
+            return ExecutionStatus::Done;
         }
 
-        let server_nick = server.current_nickname();
+        let client_nick = client.current_nickname();
 
-        if server_nick != cfg_nick {
-            info!("Trying to switch nick from {} to {}", server_nick, cfg_nick);
-            server.send(Command::NICK(cfg_nick))
+        if client_nick != cfg_nick {
+            info!("Trying to switch nick from {} to {}", client_nick, cfg_nick);
+            match client.send(Command::NICK(cfg_nick)) {
+                Ok(_) => ExecutionStatus::Done,
+                Err(e) => ExecutionStatus::Err(e),
+            }
 
         } else {
-            Ok(())
+            ExecutionStatus::Done
         }
     }
 }
 
 impl Plugin for KeepNick {
-    fn is_allowed(&self, _: &IrcClient, message: &Message) -> bool {
-        match message.command {
-            Command::QUIT(_) => true,
-            _ => false,
-        }
-    }
-
-    fn execute(&self, server: &IrcClient, message: &Message) -> Result<(), IrcError> {
+    fn execute(&self, client: &IrcClient, message: &Message) -> ExecutionStatus {
         match message.command {
             Command::QUIT(ref nick) => {
-                self.check_nick(server, &nick.clone().unwrap_or_else(|| String::new()))
+                self.check_nick(client, &nick.clone().unwrap_or_else(String::new))
             }
-            _ => Ok(()),
+            _ => ExecutionStatus::Done,
         }
     }
 
-    fn command(&self, server: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
-        server.send_notice(&command.source,
+    fn execute_threaded(&self, _: &IrcClient, _: &Message) -> Result<(), IrcError> {
+        panic!("Tell should not use threading")
+    }
+
+    fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
+        client.send_notice(&command.source,
                            "This Plugin does not implement any commands.")
     }
 
diff --git a/src/plugins/url.rs b/src/plugins/url.rs
index b980d3e..9ce5a6a 100644
--- a/src/plugins/url.rs
+++ b/src/plugins/url.rs
@@ -90,7 +90,7 @@ impl Url {
             }
             Err(e) => {
                 debug!("Bad response from {:?}: ({})", url, e);
-                return None;
+                None
             }
         }
     }
@@ -126,18 +126,22 @@ impl Url {
 }
 
 impl Plugin for Url {
-    fn is_allowed(&self, _: &IrcClient, message: &Message) -> bool {
+    fn execute(&self, _: &IrcClient, message: &Message) -> ExecutionStatus {
         match message.command {
-            Command::PRIVMSG(_, ref msg) => RE.is_match(msg),
-            _ => false,
+            Command::PRIVMSG(_, ref msg) => if RE.is_match(msg) {
+                ExecutionStatus::RequiresThread
+            } else {
+                ExecutionStatus::Done
+            },
+            _ => ExecutionStatus::Done,
         }
     }
 
-    fn execute(&self, server: &IrcClient, message: &Message) -> Result<(), IrcError> {
+    fn execute_threaded(&self, client: &IrcClient, message: &Message) -> Result<(), IrcError> {
         match message.command {
             Command::PRIVMSG(_, ref content) => {
                 match self.url(content) {
-                    Ok(title) => server.send_privmsg(&message.response_target().unwrap(), &title),
+                    Ok(title) => client.send_privmsg(message.response_target().unwrap(), &title),
                     Err(_) => Ok(()),
                 }
             }
@@ -145,13 +149,13 @@ impl Plugin for Url {
         }
     }
 
-    fn command(&self, server: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
-        server.send_notice(&command.source,
+    fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
+        client.send_notice(&command.source,
                            "This Plugin does not implement any commands.")
     }
 
     fn evaluate(&self, _: &IrcClient, command: PluginCommand) -> Result<String, String> {
-        self.url(&command.tokens[0]).map_err(|e| String::from(e))
+        self.url(&command.tokens[0]).map_err(String::from)
     }
 }
 
-- 
cgit v1.2.3-70-g09d2


From 72f1411f1c72a9271c7d3993a3e307050e8d1b31 Mon Sep 17 00:00:00 2001
From: Jokler <jokler.contact@gmail.com>
Date: Mon, 12 Feb 2018 20:31:56 +0100
Subject: Run latest rustfmt

---
 src/lib.rs              | 74 +++++++++++++++++++++++++++----------------------
 src/main.rs             | 50 ++++++++++++++++-----------------
 src/plugin.rs           | 18 ++++--------
 src/plugins/currency.rs | 64 +++++++++++++++++++++++-------------------
 src/plugins/emoji.rs    | 22 +++++++--------
 src/plugins/keepnick.rs |  7 +++--
 src/plugins/url.rs      | 38 +++++++++++--------------
 7 files changed, 137 insertions(+), 136 deletions(-)

(limited to 'src/plugins/currency.rs')

diff --git a/src/lib.rs b/src/lib.rs
index 87c06c3..da14277 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,5 @@
-#![cfg_attr(feature="clippy", feature(plugin))]
-#![cfg_attr(feature="clippy", plugin(clippy))]
+#![cfg_attr(feature = "clippy", feature(plugin))]
+#![cfg_attr(feature = "clippy", plugin(clippy))]
 
 //! Frippy is an IRC bot that runs plugins on each message
 //! received.
@@ -30,11 +30,11 @@
 //! which might be of interest.
 
 #[macro_use]
-extern crate log;
+extern crate frippy_derive;
 #[macro_use]
 extern crate lazy_static;
 #[macro_use]
-extern crate frippy_derive;
+extern crate log;
 
 extern crate irc;
 
@@ -70,7 +70,9 @@ impl Bot {
     /// let mut bot = Bot::new();
     /// ```
     pub fn new() -> Bot {
-        Bot { plugins: ThreadedPlugins::new() }
+        Bot {
+            plugins: ThreadedPlugins::new(),
+        }
     }
 
     /// Adds the [`Plugin`](plugin/trait.Plugin.html).
@@ -103,10 +105,13 @@ impl Bot {
         self.plugins.remove(name)
     }
 
-    /// This connects the `Bot` to IRC and creates a task on the [`IrcReactor`](../irc/client/reactor/struct.IrcReactor.html)
-    /// which returns an Ok if the connection was cleanly closed and an Err if the connection was lost.
+    /// This connects the `Bot` to IRC and creates a task on the
+    /// [`IrcReactor`](../irc/client/reactor/struct.IrcReactor.html)
+    /// which returns an Ok if the connection was cleanly closed and
+    /// an Err if the connection was lost.
     ///
-    /// You need to run the [`IrcReactor`](../irc/client/reactor/struct.IrcReactor.html), so that the `Bot`
+    /// You need to run the [`IrcReactor`](../irc/client/reactor/struct.IrcReactor.html),
+    /// so that the `Bot`
     /// can actually do its work.
     ///
     /// # Examples
@@ -151,11 +156,11 @@ impl Bot {
     }
 }
 
-fn process_msg(server: &IrcClient,
-               mut plugins: ThreadedPlugins,
-               message: Message)
-               -> Result<(), IrcError> {
-
+fn process_msg(
+    server: &IrcClient,
+    mut plugins: ThreadedPlugins,
+    message: Message,
+) -> Result<(), IrcError> {
     // Log any channels we join
     if let Command::JOIN(ref channel, _, _) = message.command {
         if message.source_nickname().unwrap() == server.current_nickname() {
@@ -185,7 +190,9 @@ struct ThreadedPlugins {
 
 impl ThreadedPlugins {
     pub fn new() -> ThreadedPlugins {
-        ThreadedPlugins { plugins: HashMap::new() }
+        ThreadedPlugins {
+            plugins: HashMap::new(),
+        }
     }
 
     pub fn add<T: Plugin + 'static>(&mut self, plugin: T) {
@@ -208,10 +215,11 @@ impl ThreadedPlugins {
                 ExecutionStatus::Done => (),
                 ExecutionStatus::Err(e) => error!("Error in {} - {}", name, e),
                 ExecutionStatus::RequiresThread => {
-
-                    debug!("Spawning thread to execute {} with {}",
-                           name,
-                           message.to_string().replace("\r\n", ""));
+                    debug!(
+                        "Spawning thread to execute {} with {}",
+                        name,
+                        message.to_string().replace("\r\n", "")
+                    );
 
                     // Clone everything before the move - the server uses an Arc internally too
                     let plugin = Arc::clone(&plugin);
@@ -229,11 +237,11 @@ impl ThreadedPlugins {
         }
     }
 
-    pub fn handle_command(&mut self,
-                          server: &IrcClient,
-                          mut command: PluginCommand)
-                          -> Result<(), IrcError> {
-
+    pub fn handle_command(
+        &mut self,
+        server: &IrcClient,
+        mut command: PluginCommand,
+    ) -> Result<(), IrcError> {
         if !command.tokens.iter().any(|s| !s.is_empty()) {
             let help = format!("Use \"{} help\" to get help", server.current_nickname());
             return server.send_notice(&command.source, &help);
@@ -241,7 +249,6 @@ impl ThreadedPlugins {
 
         // Check if the command is for this plugin
         if let Some(plugin) = self.plugins.get(&command.tokens[0].to_lowercase()) {
-
             // The first token contains the name of the plugin
             let name = command.tokens.remove(0);
 
@@ -251,18 +258,19 @@ impl ThreadedPlugins {
             let server = server.clone();
             let plugin = Arc::clone(plugin);
             spawn(move || {
-                      if let Err(e) = plugin.command(&server, command) {
-                          error!("Error in {} command - {}", name, e);
-                      };
-                  });
+                if let Err(e) = plugin.command(&server, command) {
+                    error!("Error in {} command - {}", name, e);
+                };
+            });
 
             Ok(())
-
         } else {
-            let help = format!("\"{} {}\" is not a command, \
-                                try \"{0} help\" instead.",
-                               server.current_nickname(),
-                               command.tokens[0]);
+            let help = format!(
+                "\"{} {}\" is not a command, \
+                 try \"{0} help\" instead.",
+                server.current_nickname(),
+                command.tokens[0]
+            );
 
             server.send_notice(&command.source, &help)
         }
diff --git a/src/main.rs b/src/main.rs
index 7df8b3b..9a96791 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,15 +1,15 @@
-#![cfg_attr(feature="clippy", feature(plugin))]
-#![cfg_attr(feature="clippy", plugin(clippy))]
+#![cfg_attr(feature = "clippy", feature(plugin))]
+#![cfg_attr(feature = "clippy", plugin(clippy))]
 
 extern crate frippy;
-extern crate time;
-extern crate irc;
 extern crate glob;
+extern crate irc;
+extern crate time;
 
 #[macro_use]
 extern crate log;
 
-use log::{Record, Level, LevelFilter, Metadata};
+use log::{Level, LevelFilter, Metadata, Record};
 
 use irc::client::reactor::IrcReactor;
 use glob::glob;
@@ -27,16 +27,20 @@ impl log::Log for Logger {
     fn log(&self, record: &Record) {
         if self.enabled(record.metadata()) {
             if record.metadata().level() >= Level::Debug {
-                println!("[{}]({}) {} -> {}",
-                         time::now().rfc822(),
-                         record.level(),
-                         record.target(),
-                         record.args());
+                println!(
+                    "[{}]({}) {} -> {}",
+                    time::now().rfc822(),
+                    record.level(),
+                    record.target(),
+                    record.args()
+                );
             } else {
-                println!("[{}]({}) {}",
-                         time::now().rfc822(),
-                         record.level(),
-                         record.args());
+                println!(
+                    "[{}]({}) {}",
+                    time::now().rfc822(),
+                    record.level(),
+                    record.args()
+                );
             }
         }
     }
@@ -47,12 +51,11 @@ impl log::Log for Logger {
 static LOGGER: Logger = Logger;
 
 fn main() {
-
     log::set_max_level(if cfg!(debug_assertions) {
-                           LevelFilter::Debug
-                       } else {
-                           LevelFilter::Info
-                       });
+        LevelFilter::Debug
+    } else {
+        LevelFilter::Info
+    });
 
     log::set_logger(&LOGGER).unwrap();
 
@@ -82,14 +85,10 @@ fn main() {
 
     // Open a connection and add work for each config
     for config in configs {
-
         let mut disabled_plugins = None;
         if let Some(ref options) = config.options {
             if let Some(disabled) = options.get("disabled_plugins") {
-                disabled_plugins = Some(disabled
-                                            .split(',')
-                                            .map(|p| p.trim())
-                                            .collect::<Vec<_>>());
+                disabled_plugins = Some(disabled.split(',').map(|p| p.trim()).collect::<Vec<_>>());
             }
         }
 
@@ -109,7 +108,8 @@ fn main() {
             }
         }
 
-        bot.connect(&mut reactor, &config).expect("Failed to connect");
+        bot.connect(&mut reactor, &config)
+            .expect("Failed to connect");
     }
 
     // Run the bots until they throw an error - an error could be loss of connection
diff --git a/src/plugin.rs b/src/plugin.rs
index e343a2c..a67d68f 100644
--- a/src/plugin.rs
+++ b/src/plugin.rs
@@ -30,7 +30,7 @@ pub trait Plugin: PluginName + Send + Sync + fmt::Debug {
     fn evaluate(&self, server: &IrcClient, command: PluginCommand) -> Result<String, String>;
 }
 
-/// `PluginName` is required by [`Plugin`](trait.Plugin.html).  
+/// `PluginName` is required by [`Plugin`](trait.Plugin.html).
 ///
 /// To implement it simply add `#[derive(PluginName)]`
 /// above the definition of the struct.
@@ -64,25 +64,19 @@ impl PluginCommand {
     /// if it contains a [`PRIVMSG`](../../irc/proto/command/enum.Command.html#variant.PRIVMSG)
     /// that starts with the provided `nick`.
     pub fn from(nick: &str, message: &Message) -> Option<PluginCommand> {
-
         // Get the actual message out of PRIVMSG
         if let Command::PRIVMSG(_, ref content) = message.command {
-
             // Split content by spaces and filter empty tokens
             let mut tokens: Vec<String> = content.split(' ').map(ToOwned::to_owned).collect();
 
             // Commands start with our name
             if tokens[0].to_lowercase().starts_with(nick) {
-
                 // Remove the bot's name from the first token
                 tokens[0].drain(..nick.len());
 
                 // We assume that only ':' and ',' are used as suffixes on IRC
                 // If there are any other chars we assume that it is not ment for the bot
-                tokens[0] = tokens[0]
-                    .chars()
-                    .filter(|&c| !":,".contains(c))
-                    .collect();
+                tokens[0] = tokens[0].chars().filter(|&c| !":,".contains(c)).collect();
                 if !tokens[0].is_empty() {
                     return None;
                 }
@@ -91,10 +85,10 @@ impl PluginCommand {
                 tokens.remove(0);
 
                 Some(PluginCommand {
-                         source: message.source_nickname().unwrap().to_string(),
-                         target: message.response_target().unwrap().to_string(),
-                         tokens: tokens,
-                     })
+                    source: message.source_nickname().unwrap().to_string(),
+                    target: message.response_target().unwrap().to_string(),
+                    tokens: tokens,
+                })
             } else {
                 None
             }
diff --git a/src/plugins/currency.rs b/src/plugins/currency.rs
index 21330a1..393df9b 100644
--- a/src/plugins/currency.rs
+++ b/src/plugins/currency.rs
@@ -34,7 +34,6 @@ macro_rules! try_option {
 
 impl<'a> ConvertionRequest<'a> {
     fn send(&self) -> Option<f64> {
-
         let response = Client::new()
             .get("https://api.fixer.io/latest")
             .form(&[("base", self.source)])
@@ -49,7 +48,6 @@ impl<'a> ConvertionRequest<'a> {
                 let convertion_rates: Result<Value, _> = serde_json::from_str(&body);
                 match convertion_rates {
                     Ok(convertion_rates) => {
-
                         let rates: &Value = try_option!(convertion_rates.get("rates"));
                         let target_rate: &Value =
                             try_option!(rates.get(self.target.to_uppercase()));
@@ -68,14 +66,15 @@ impl Currency {
         Currency {}
     }
 
-    fn eval_command<'a>(&self,
-                        tokens: &'a [String])
-                        -> Result<ConvertionRequest<'a>, ParseFloatError> {
+    fn eval_command<'a>(
+        &self,
+        tokens: &'a [String],
+    ) -> Result<ConvertionRequest<'a>, ParseFloatError> {
         Ok(ConvertionRequest {
-               value: tokens[0].parse()?,
-               source: &tokens[1],
-               target: &tokens[2],
-           })
+            value: tokens[0].parse()?,
+            source: &tokens[1],
+            target: &tokens[2],
+        })
     }
 
     fn convert(&self, client: &IrcClient, command: &mut PluginCommand) -> Result<String, String> {
@@ -92,33 +91,41 @@ impl Currency {
 
         match request.send() {
             Some(response) => {
-                let response = format!("{} {} => {:.4} {}",
-                                       request.value,
-                                       request.source.to_lowercase(),
-                                       response / 1.00000000,
-                                       request.target.to_lowercase());
+                let response = format!(
+                    "{} {} => {:.4} {}",
+                    request.value,
+                    request.source.to_lowercase(),
+                    response / 1.00000000,
+                    request.target.to_lowercase()
+                );
 
                 Ok(response)
             }
-            None => Err(String::from("An error occured during the conversion of the given currency")),
+            None => Err(String::from(
+                "An error occured during the conversion of the given currency",
+            )),
         }
     }
 
     fn help(&self, client: &IrcClient) -> String {
-        format!("usage: {} currency value from_currency to_currency\r\n\
-                            example: {0} currency 1.5 eur usd\r\n\
-                            available currencies: AUD, BGN, BRL, CAD, \
-                            CHF, CNY, CZK, DKK, GBP, HKD, HRK, HUF, \
-                            IDR, ILS, INR, JPY, KRW, MXN, MYR, NOK, \
-                            NZD, PHP, PLN, RON, RUB, SEK, SGD, THB, \
-                            TRY, USD, ZAR",
-                           client.current_nickname())
+        format!(
+            "usage: {} currency value from_currency to_currency\r\n\
+             example: {0} currency 1.5 eur usd\r\n\
+             available currencies: AUD, BGN, BRL, CAD, \
+             CHF, CNY, CZK, DKK, GBP, HKD, HRK, HUF, \
+             IDR, ILS, INR, JPY, KRW, MXN, MYR, NOK, \
+             NZD, PHP, PLN, RON, RUB, SEK, SGD, THB, \
+             TRY, USD, ZAR",
+            client.current_nickname()
+        )
     }
 
     fn invalid_command(&self, client: &IrcClient) -> String {
-        format!("Incorrect Command. \
-                           Send \"{} currency help\" for help.",
-                   client.current_nickname())
+        format!(
+            "Incorrect Command. \
+             Send \"{} currency help\" for help.",
+            client.current_nickname()
+        )
     }
 }
 
@@ -132,7 +139,6 @@ impl Plugin for Currency {
     }
 
     fn command(&self, client: &IrcClient, mut command: PluginCommand) -> Result<(), IrcError> {
-
         if command.tokens.is_empty() {
             return client.send_notice(&command.source, &self.invalid_command(client));
         }
@@ -142,11 +148,11 @@ impl Plugin for Currency {
             _ => match self.convert(client, &mut command) {
                 Ok(msg) => client.send_privmsg(&command.target, &msg),
                 Err(msg) => client.send_notice(&command.source, &msg),
-            }
+            },
         }
     }
 
-    fn evaluate(&self, client: &IrcClient, mut command: PluginCommand) -> Result<String, String>{
+    fn evaluate(&self, client: &IrcClient, mut command: PluginCommand) -> Result<String, String> {
         if command.tokens.is_empty() {
             return Err(self.invalid_command(client));
         }
diff --git a/src/plugins/emoji.rs b/src/plugins/emoji.rs
index 02a31f8..fcb04d1 100644
--- a/src/plugins/emoji.rs
+++ b/src/plugins/emoji.rs
@@ -14,7 +14,6 @@ struct EmojiHandle {
 
 impl fmt::Display for EmojiHandle {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-
         let name = match unicode_names::name(self.symbol) {
             Some(sym) => sym.to_string().to_lowercase(),
             None => String::from("UNKNOWN"),
@@ -52,7 +51,6 @@ impl Emoji {
             count: 0,
         };
 
-
         for c in string.chars() {
             if !self.is_emoji(&c) {
                 continue;
@@ -60,7 +58,6 @@ impl Emoji {
 
             if current.symbol == c {
                 current.count += 1;
-
             } else {
                 if current.count > 0 {
                     emojis.push(current);
@@ -99,13 +96,12 @@ impl Emoji {
 impl Plugin for Emoji {
     fn execute(&self, client: &IrcClient, message: &Message) -> ExecutionStatus {
         match message.command {
-            Command::PRIVMSG(_, ref content) => {
-                match client.send_privmsg(message.response_target().unwrap(),
-                                          &self.emoji(content)) {
-                    Ok(_) => ExecutionStatus::Done,
-                    Err(e) => ExecutionStatus::Err(e),
-                }
-            }
+            Command::PRIVMSG(_, ref content) => match client
+                .send_privmsg(message.response_target().unwrap(), &self.emoji(content))
+            {
+                Ok(_) => ExecutionStatus::Done,
+                Err(e) => ExecutionStatus::Err(e),
+            },
             _ => ExecutionStatus::Done,
         }
     }
@@ -115,8 +111,10 @@ impl Plugin for Emoji {
     }
 
     fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
-        client.send_notice(&command.source,
-                           "This Plugin does not implement any commands.")
+        client.send_notice(
+            &command.source,
+            "This Plugin does not implement any commands.",
+        )
     }
 
     fn evaluate(&self, _: &IrcClient, command: PluginCommand) -> Result<String, String> {
diff --git a/src/plugins/keepnick.rs b/src/plugins/keepnick.rs
index e973769..73f4893 100644
--- a/src/plugins/keepnick.rs
+++ b/src/plugins/keepnick.rs
@@ -29,7 +29,6 @@ impl KeepNick {
                 Ok(_) => ExecutionStatus::Done,
                 Err(e) => ExecutionStatus::Err(e),
             }
-
         } else {
             ExecutionStatus::Done
         }
@@ -51,8 +50,10 @@ impl Plugin for KeepNick {
     }
 
     fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
-        client.send_notice(&command.source,
-                           "This Plugin does not implement any commands.")
+        client.send_notice(
+            &command.source,
+            "This Plugin does not implement any commands.",
+        )
     }
 
     fn evaluate(&self, _: &IrcClient, _: PluginCommand) -> Result<String, String> {
diff --git a/src/plugins/url.rs b/src/plugins/url.rs
index 9ce5a6a..455aa4e 100644
--- a/src/plugins/url.rs
+++ b/src/plugins/url.rs
@@ -29,7 +29,7 @@ pub struct Url {
 impl Url {
     /// If a file is larger than `max_kib` KiB the download is stopped
     pub fn new(max_kib: usize) -> Url {
-        Url {max_kib: max_kib}
+        Url { max_kib: max_kib }
     }
 
     fn grep_url(&self, msg: &str) -> Option<String> {
@@ -44,10 +44,7 @@ impl Url {
     }
 
     fn download(&self, url: &str) -> Option<String> {
-        let response = Client::new()
-            .get(url)
-            .header(Connection::close())
-            .send();
+        let response = Client::new().get(url).header(Connection::close()).send();
 
         match response {
             Ok(mut response) => {
@@ -81,10 +78,12 @@ impl Url {
 
                     // Check if the file is too large to download
                     if written > self.max_kib * 1024 {
-                        debug!("Stopping download - File from {:?} is larger than {} KiB", url, self.max_kib);
+                        debug!(
+                            "Stopping download - File from {:?} is larger than {} KiB",
+                            url, self.max_kib
+                        );
                         return None;
                     }
-
                 }
                 Some(body) // once told me
             }
@@ -98,15 +97,11 @@ impl Url {
     fn url(&self, text: &str) -> Result<String, &str> {
         let url = match self.grep_url(text) {
             Some(url) => url,
-            None => {
-                return Err("No Url was found.")
-            }
+            None => return Err("No Url was found."),
         };
 
-
         match self.download(&url) {
             Some(body) => {
-
                 let doc = Document::from(body.as_ref());
                 if let Some(title) = doc.find(Name("title")).next() {
                     let title = title.children().next().unwrap();
@@ -115,12 +110,11 @@ impl Url {
                     debug!("Text: {:?}", title_text);
 
                     Ok(title_text)
-
                 } else {
                     Err("No title was found.")
                 }
             }
-            None => Err("Failed to download document.")
+            None => Err("Failed to download document."),
         }
     }
 }
@@ -139,19 +133,19 @@ impl Plugin for Url {
 
     fn execute_threaded(&self, client: &IrcClient, message: &Message) -> Result<(), IrcError> {
         match message.command {
-            Command::PRIVMSG(_, ref content) => {
-                match self.url(content) {
-                    Ok(title) => client.send_privmsg(message.response_target().unwrap(), &title),
-                    Err(_) => Ok(()),
-                }
-            }
+            Command::PRIVMSG(_, ref content) => match self.url(content) {
+                Ok(title) => client.send_privmsg(message.response_target().unwrap(), &title),
+                Err(_) => Ok(()),
+            },
             _ => Ok(()),
         }
     }
 
     fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
-        client.send_notice(&command.source,
-                           "This Plugin does not implement any commands.")
+        client.send_notice(
+            &command.source,
+            "This Plugin does not implement any commands.",
+        )
     }
 
     fn evaluate(&self, _: &IrcClient, command: PluginCommand) -> Result<String, String> {
-- 
cgit v1.2.3-70-g09d2


From 968c837365c4a332fe3c802fd4ecab2562eb4d5a Mon Sep 17 00:00:00 2001
From: Jokler <jokler.contact@gmail.com>
Date: Tue, 13 Feb 2018 16:18:42 +0100
Subject: Replace try_option with ?

---
 src/plugins/currency.rs | 18 ++++--------------
 src/plugins/tell.rs     |  5 ++++-
 2 files changed, 8 insertions(+), 15 deletions(-)

(limited to 'src/plugins/currency.rs')

diff --git a/src/plugins/currency.rs b/src/plugins/currency.rs
index 393df9b..958c8e2 100644
--- a/src/plugins/currency.rs
+++ b/src/plugins/currency.rs
@@ -23,15 +23,6 @@ struct ConvertionRequest<'a> {
     target: &'a str,
 }
 
-macro_rules! try_option {
-    ($e:expr) => {
-        match $e {
-            Some(v) => v,
-            None    => { return None; }
-        }
-    }
-}
-
 impl<'a> ConvertionRequest<'a> {
     fn send(&self) -> Option<f64> {
         let response = Client::new()
@@ -43,15 +34,14 @@ impl<'a> ConvertionRequest<'a> {
         match response {
             Ok(mut response) => {
                 let mut body = String::new();
-                try_option!(response.read_to_string(&mut body).ok());
+                response.read_to_string(&mut body).ok()?;
 
                 let convertion_rates: Result<Value, _> = serde_json::from_str(&body);
                 match convertion_rates {
                     Ok(convertion_rates) => {
-                        let rates: &Value = try_option!(convertion_rates.get("rates"));
-                        let target_rate: &Value =
-                            try_option!(rates.get(self.target.to_uppercase()));
-                        Some(self.value * try_option!(target_rate.as_f64()))
+                        let rates: &Value = convertion_rates.get("rates")?;
+                        let target_rate: &Value = rates.get(self.target.to_uppercase())?;
+                        Some(self.value * target_rate.as_f64()?)
                     }
                     Err(_) => None,
                 }
diff --git a/src/plugins/tell.rs b/src/plugins/tell.rs
index 3ec9586..34d7cf8 100644
--- a/src/plugins/tell.rs
+++ b/src/plugins/tell.rs
@@ -77,7 +77,10 @@ impl Tell {
                 ) {
                     return ExecutionStatus::Err(e);
                 }
-                debug!("Sent {:?} from {:?} to {:?}", tell.message, tell.sender, receiver);
+                debug!(
+                    "Sent {:?} from {:?} to {:?}",
+                    tell.message, tell.sender, receiver
+                );
             }
         }
         tells.remove(receiver);
-- 
cgit v1.2.3-70-g09d2


From 0b4131e8cf91ed10f24d3faed341034d518aea53 Mon Sep 17 00:00:00 2001
From: Jokler <jokler.contact@gmail.com>
Date: Fri, 2 Mar 2018 22:11:21 +0100
Subject: Use Error & ErrorKind pair instead of simple enums

Each plugin should define its own errors with a respective variant
in the main ErrorKind of frippy.
A new procedural macro was added to reduce the boilerplate required
for new error system.
It can be used by deriving "Error" and adding a name for the Error
via the "error" attribute.

So far non of the plugins except for Url and Factoids
use their own errors yet.
---
 Cargo.lock                       |  40 ++++++++-
 frippy_derive/Cargo.toml         |   5 +-
 frippy_derive/src/lib.rs         |  86 +++++++++++++++++-
 src/error.rs                     | 114 +++++-------------------
 src/lib.rs                       |  56 ++++++------
 src/main.rs                      |  51 ++++++-----
 src/plugin.rs                    |  21 +++--
 src/plugins/currency.rs          |  28 +++---
 src/plugins/emoji.rs             |  25 +++---
 src/plugins/factoids/database.rs |  88 ++++++++----------
 src/plugins/factoids/mod.rs      | 187 +++++++++++++++++++++++----------------
 src/plugins/factoids/utils.rs    |   6 +-
 src/plugins/help.rs              |  16 ++--
 src/plugins/keepnick.rs          |  29 +++---
 src/plugins/mod.rs               |  23 ++---
 src/plugins/tell/mod.rs          |  32 ++++---
 src/plugins/url.rs               |  63 ++++++++-----
 src/utils.rs                     |  34 ++++---
 18 files changed, 528 insertions(+), 376 deletions(-)

(limited to 'src/plugins/currency.rs')

diff --git a/Cargo.lock b/Cargo.lock
index dcbaad5..acb6f80 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -414,8 +414,9 @@ dependencies = [
 name = "frippy_derive"
 version = "0.1.0"
 dependencies = [
- "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.12.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -925,6 +926,14 @@ name = "precomputed-hash"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "proc-macro2"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "pulldown-cmark"
 version = "0.0.15"
@@ -949,6 +958,14 @@ name = "quote"
 version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "quote"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "r2d2"
 version = "0.8.2"
@@ -1246,6 +1263,16 @@ dependencies = [
  "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "syn"
+version = "0.12.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "synom"
 version = "0.11.3"
@@ -1427,6 +1454,11 @@ name = "unicode-xid"
 version = "0.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "unicode-xid"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unicode_names"
 version = "0.1.7"
@@ -1636,10 +1668,12 @@ dependencies = [
 "checksum phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "07e24b0ca9643bdecd0632f2b3da6b1b89bbb0030e0b992afc1113b23a7bc2f2"
 "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903"
 "checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+"checksum proc-macro2 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cd07deb3c6d1d9ff827999c7f9b04cdfd66b1b17ae508e14fe47b620f2282ae0"
 "checksum pulldown-cmark 0.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "378e941dbd392c101f2cb88097fa4d7167bc421d4b88de3ff7dbee503bc3233b"
 "checksum quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eda5fe9b71976e62bc81b781206aaa076401769b2143379d3eb2118388babac4"
 "checksum quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "07589615d719a60c8dd8a4622e7946465dfef20d1a428f969e3443e7386d5f45"
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
+"checksum quote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1eca14c727ad12702eb4b6bfb5a232287dcf8385cb8ca83a3eeaf6519c44c408"
 "checksum r2d2 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f9078ca6a8a5568ed142083bb2f7dc9295b69d16f867ddcc9849e51b17d8db46"
 "checksum r2d2-diesel 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9c29bad92da76d02bc2c020452ebc3a3fe6fa74cfab91e711c43116e4fb1a3"
 "checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1"
@@ -1675,6 +1709,7 @@ dependencies = [
 "checksum string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "479cde50c3539481f33906a387f2bd17c8e87cb848c35b6021d41fb81ff9b4d7"
 "checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc"
 "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
+"checksum syn 0.12.13 (registry+https://github.com/rust-lang/crates.io-index)" = "517f6da31bc53bf080b9a77b29fbd0ff8da2f5a2ebd24c73c2238274a94ac7cb"
 "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
 "checksum synstructure 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3a761d12e6d8dcb4dcf952a7a89b475e3a9d69e4a69307e01a470977642914bd"
 "checksum take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b157868d8ac1f56b64604539990685fa7611d8fa9e5476cf0c02cf34d32917c5"
@@ -1695,6 +1730,7 @@ dependencies = [
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f"
 "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
+"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unicode_names 0.1.7 (git+https://github.com/Jokler/unicode_names?branch=update-to-latest-unicode)" = "<none>"
 "checksum unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
diff --git a/frippy_derive/Cargo.toml b/frippy_derive/Cargo.toml
index 937afba..b258f57 100644
--- a/frippy_derive/Cargo.toml
+++ b/frippy_derive/Cargo.toml
@@ -7,5 +7,6 @@ authors = ["Jokler <jokler.contact@gmail.com>"]
 proc-macro = true
 
 [dependencies]
-syn = "0.11.11"
-quote = "0.3.15"
+syn = "0.12.13"
+quote = "0.4.2"
+failure = "0.1.1"
diff --git a/frippy_derive/src/lib.rs b/frippy_derive/src/lib.rs
index 2622f0b..efa349a 100644
--- a/frippy_derive/src/lib.rs
+++ b/frippy_derive/src/lib.rs
@@ -1,18 +1,20 @@
-
 //! Provides the plugin derive macro
+#![recursion_limit="128"]
 
 extern crate proc_macro;
 extern crate syn;
 #[macro_use]
 extern crate quote;
 
+extern crate failure;
+
 use proc_macro::TokenStream;
 
 #[proc_macro_derive(PluginName)]
 pub fn derive_plugin(data: TokenStream) -> TokenStream {
-    let ast = syn::parse_derive_input(&data.to_string()).unwrap();
+    let ast = syn::parse(data).unwrap();
     let gen = expand_plugin(&ast);
-    gen.parse().unwrap()
+    gen.into()
 }
 
 fn expand_plugin(ast: &syn::DeriveInput) -> quote::Tokens {
@@ -27,3 +29,81 @@ fn expand_plugin(ast: &syn::DeriveInput) -> quote::Tokens {
         }
     }
 }
+
+#[proc_macro_derive(Error, attributes(error))]
+pub fn derive_error(data: TokenStream) -> TokenStream {
+    let ast = syn::parse(data).unwrap();
+    let tokens = expand_error(&ast);
+    // panic!("{}", tokens.to_string());
+    tokens.into()
+}
+
+fn expand_error(ast: &syn::DeriveInput) -> quote::Tokens {
+    if let syn::Data::Enum(_) = ast.data {
+    } else {
+        panic!("Error should only be derived on ErrorKind enums");
+    };
+
+    let mut name = None;
+    for attr in &ast.attrs {
+        if let Some(syn::Meta::NameValue(name_value)) = attr.interpret_meta() {
+            if "error" == name_value.ident.to_string() {
+                if let syn::Lit::Str(lit) = name_value.lit {
+                    name = Some(lit.value());
+                }
+            }
+        }
+    };
+
+    let struct_name = if let Some(name) = name {
+        syn::Ident::from(name)
+    } else {
+        panic!("Define the error attribute for all Error derives");
+    };
+
+    let enum_name = &ast.ident;
+
+    quote! {
+        #[derive(Debug)]
+        pub struct #struct_name {
+            inner: ::failure::Context<#enum_name>,
+        }
+
+        impl #struct_name {
+            pub fn kind(&self) -> #enum_name {
+                *self.inner.get_context()
+            }
+        }
+
+        impl From<#enum_name> for #struct_name {
+            fn from(kind: #enum_name) -> #struct_name {
+                #struct_name {
+                    inner: ::failure::Context::new(kind),
+                }
+            }
+        }
+
+        impl From<::failure::Context<#enum_name>> for #struct_name {
+            fn from(inner: ::failure::Context<#enum_name>) -> #struct_name {
+                #struct_name { inner: inner }
+            }
+        }
+
+        impl ::failure::Fail for #struct_name {
+            fn cause(&self) -> Option<&::failure::Fail> {
+                self.inner.cause()
+            }
+
+            fn backtrace(&self) -> Option<&::failure::Backtrace> {
+                self.inner.backtrace()
+            }
+        }
+
+        impl ::std::fmt::Display for #struct_name {
+            fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+                use std::fmt;
+                fmt::Display::fmt(&self.inner, f)
+            }
+        }
+    }
+}
diff --git a/src/error.rs b/src/error.rs
index fa232be..36d5724 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,101 +1,31 @@
 //! Errors for `frippy` crate using `failure`.
 
-use std::io::Error as IoError;
-use irc::error::IrcError;
-use reqwest::Error as ReqwestError;
-#[cfg(feature = "mysql")]
-use r2d2::Error as R2d2Error;
+use failure::Fail;
 
-/// The main crate-wide error type.
-#[derive(Debug, Fail)]
-pub enum FrippyError {
-    /// A plugin error
-    #[fail(display = "A plugin error occured")]
-    Plugin(#[cause] PluginError),
-
-    /// An IRC error
-    #[fail(display = "An IRC error occured")]
-    Irc(#[cause] IrcError),
-
-    /// Missing config error
-    #[fail(display = "No config file was found")]
-    MissingConfig,
-
-    /// A reqwest error
-    #[fail(display = "A reqwest error occured")]
-    Reqwest(#[cause] ReqwestError),
-
-    /// An I/O error
-    #[fail(display = "An I/O error occured")]
-    Io(#[cause] IoError),
-
-    /// An r2d2 error
-    #[cfg(feature = "mysql")]
-    #[fail(display = "An r2d2 error occured")]
-    R2d2(#[cause] R2d2Error),
-
-    /// Reached download limit error
-    #[fail(display = "Reached download limit of {} KiB", limit)]
-    DownloadLimit { limit: usize },
+pub fn log_error(e: FrippyError) {
+    let text = e.causes()
+        .skip(1)
+        .fold(format!("{}", e), |acc, err| format!("{}: {}", acc, err));
+    error!("{}", text);
 }
 
-/// Errors related to plugins
-#[derive(Debug, Fail)]
-pub enum PluginError {
-    /// A Url error
-    #[fail(display = "A Url error occured")]
-    Url(#[cause] UrlError),
-
-    /// A Factoids error
-    #[fail(display = "{}", error)]
-    Factoids { error: String },
-}
-
-/// A URL plugin error
-#[derive(Debug, Fail)]
-pub enum UrlError {
-    /// Missing URL error
-    #[fail(display = "No URL was found")]
-    MissingUrl,
-
-    /// Missing title error
-    #[fail(display = "No title was found")]
-    MissingTitle,
-}
-
-impl From<UrlError> for FrippyError {
-    fn from(e: UrlError) -> FrippyError {
-        FrippyError::Plugin(PluginError::Url(e))
-    }
-}
-
-impl From<PluginError> for FrippyError {
-    fn from(e: PluginError) -> FrippyError {
-        FrippyError::Plugin(e)
-    }
-}
-
-impl From<IrcError> for FrippyError {
-    fn from(e: IrcError) -> FrippyError {
-        FrippyError::Irc(e)
-    }
-}
+/// The main crate-wide error type.
+#[derive(Copy, Clone, Eq, PartialEq, Debug, Fail, Error)]
+#[error = "FrippyError"]
+pub enum ErrorKind {
+    /// Connection error
+    #[fail(display = "A connection error occured")]
+    Connection,
 
-impl From<ReqwestError> for FrippyError {
-    fn from(e: ReqwestError) -> FrippyError {
-        FrippyError::Reqwest(e)
-    }
-}
+    /// A Url error
+    #[fail(display = "A Url error has occured")]
+    Url,
 
-impl From<IoError> for FrippyError {
-    fn from(e: IoError) -> FrippyError {
-        FrippyError::Io(e)
-    }
-}
+    /// A Tell error
+    #[fail(display = "A Tell error has occured")]
+    Tell,
 
-#[cfg(feature = "mysql")]
-impl From<R2d2Error> for FrippyError {
-    fn from(e: R2d2Error) -> FrippyError {
-        FrippyError::R2d2(e)
-    }
+    /// A Factoids error
+    #[fail(display = "A Factoids error has occured")]
+    Factoids,
 }
diff --git a/src/lib.rs b/src/lib.rs
index 42b0089..8cf1e2f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -64,7 +64,8 @@ use std::sync::Arc;
 
 pub use irc::client::prelude::*;
 pub use irc::error::IrcError;
-use error::FrippyError;
+use error::*;
+use failure::ResultExt;
 
 use plugin::*;
 
@@ -150,11 +151,13 @@ impl Bot {
     pub fn connect(&self, reactor: &mut IrcReactor, config: &Config) -> Result<(), FrippyError> {
         info!("Plugins loaded: {}", self.plugins);
 
-        let client = reactor.prepare_client_and_connect(config)?;
+        let client = reactor
+            .prepare_client_and_connect(config)
+            .context(ErrorKind::Connection)?;
 
         info!("Connected to IRC server");
 
-        client.identify()?;
+        client.identify().context(ErrorKind::Connection)?;
         info!("Identified");
 
         // TODO Verify if we actually need to clone plugins twice
@@ -169,25 +172,25 @@ impl Bot {
 }
 
 fn process_msg(
-    server: &IrcClient,
+    client: &IrcClient,
     mut plugins: ThreadedPlugins,
     message: Message,
 ) -> Result<(), IrcError> {
     // Log any channels we join
     if let Command::JOIN(ref channel, _, _) = message.command {
-        if message.source_nickname().unwrap() == server.current_nickname() {
+        if message.source_nickname().unwrap() == client.current_nickname() {
             info!("Joined {}", channel);
         }
     }
 
     // Check for possible command and save the result for later
-    let command = PluginCommand::from(&server.current_nickname().to_lowercase(), &message);
+    let command = PluginCommand::from(&client.current_nickname().to_lowercase(), &message);
 
-    plugins.execute_plugins(server, message);
+    plugins.execute_plugins(client, message);
 
     // If the message contained a command, handle it
     if let Some(command) = command {
-        if let Err(e) = plugins.handle_command(server, command) {
+        if let Err(e) = plugins.handle_command(client, command) {
             error!("Failed to handle command: {}", e);
         }
     }
@@ -218,12 +221,12 @@ impl ThreadedPlugins {
         self.plugins.remove(&name.to_lowercase()).map(|_| ())
     }
 
-    pub fn execute_plugins(&mut self, server: &IrcClient, message: Message) {
+    pub fn execute_plugins(&mut self, client: &IrcClient, message: Message) {
         let message = Arc::new(message);
 
         for (name, plugin) in self.plugins.clone() {
             // Send the message to the plugin if the plugin needs it
-            match plugin.execute(server, &message) {
+            match plugin.execute(client, &message) {
                 ExecutionStatus::Done => (),
                 ExecutionStatus::Err(e) => error!("Error in {} - {}", name, e),
                 ExecutionStatus::RequiresThread => {
@@ -233,15 +236,15 @@ impl ThreadedPlugins {
                         message.to_string().replace("\r\n", "")
                     );
 
-                    // Clone everything before the move - the server uses an Arc internally too
+                    // Clone everything before the move - the client uses an Arc internally too
                     let plugin = Arc::clone(&plugin);
                     let message = Arc::clone(&message);
-                    let server = server.clone();
+                    let client = client.clone();
 
                     // Execute the plugin in another thread
                     spawn(move || {
-                        if let Err(e) = plugin.execute_threaded(&server, &message) {
-                            error!("Error in {} - {}", name, e);
+                        if let Err(e) = plugin.execute_threaded(&client, &message) {
+                            log_error(e);
                         };
                     });
                 }
@@ -251,12 +254,14 @@ impl ThreadedPlugins {
 
     pub fn handle_command(
         &mut self,
-        server: &IrcClient,
+        client: &IrcClient,
         mut command: PluginCommand,
     ) -> Result<(), FrippyError> {
         if !command.tokens.iter().any(|s| !s.is_empty()) {
-            let help = format!("Use \"{} help\" to get help", server.current_nickname());
-            server.send_notice(&command.source, &help)?;
+            let help = format!("Use \"{} help\" to get help", client.current_nickname());
+            client
+                .send_notice(&command.source, &help)
+                .context(ErrorKind::Connection)?;
         }
 
         // Check if the command is for this plugin
@@ -266,12 +271,12 @@ impl ThreadedPlugins {
 
             debug!("Sending command \"{:?}\" to {}", command, name);
 
-            // Clone for the move - the server uses an Arc internally
-            let server = server.clone();
+            // Clone for the move - the client uses an Arc internally
+            let client = client.clone();
             let plugin = Arc::clone(plugin);
             spawn(move || {
-                if let Err(e) = plugin.command(&server, command) {
-                    error!("Error in {} command - {}", name, e);
+                if let Err(e) = plugin.command(&client, command) {
+                    log_error(e);
                 };
             });
 
@@ -280,11 +285,13 @@ impl ThreadedPlugins {
             let help = format!(
                 "\"{} {}\" is not a command, \
                  try \"{0} help\" instead.",
-                server.current_nickname(),
+                client.current_nickname(),
                 command.tokens[0]
             );
 
-            Ok(server.send_notice(&command.source, &help)?)
+            Ok(client
+                .send_notice(&command.source, &help)
+                .context(ErrorKind::Connection)?)
         }
     }
 }
@@ -298,6 +305,3 @@ impl fmt::Display for ThreadedPlugins {
         write!(f, "{}", plugin_names.join(", "))
     }
 }
-
-#[cfg(test)]
-mod tests {}
diff --git a/src/main.rs b/src/main.rs
index 3432e3e..b9a4b8f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -16,6 +16,8 @@ extern crate r2d2;
 #[cfg(feature = "mysql")]
 extern crate r2d2_diesel;
 
+#[macro_use]
+extern crate failure;
 #[macro_use]
 extern crate log;
 
@@ -27,9 +29,16 @@ use log::{Level, LevelFilter, Metadata, Record};
 use irc::client::reactor::IrcReactor;
 use glob::glob;
 
-use frippy::plugins;
+pub use frippy::plugins::help::Help;
+pub use frippy::plugins::url::Url;
+pub use frippy::plugins::emoji::Emoji;
+pub use frippy::plugins::tell::Tell;
+pub use frippy::plugins::currency::Currency;
+pub use frippy::plugins::keepnick::KeepNick;
+pub use frippy::plugins::factoids::Factoids;
+
 use frippy::Config;
-use frippy::error::FrippyError;
+use failure::Error;
 
 #[cfg(feature = "mysql")]
 embed_migrations!();
@@ -70,11 +79,14 @@ static LOGGER: Logger = Logger;
 fn main() {
     // Print any errors that caused frippy to shut down
     if let Err(e) = run() {
-        frippy::utils::log_error(e);
+        let text = e.causes()
+            .skip(1)
+            .fold(format!("{}", e), |acc, err| format!("{}: {}", acc, err));
+        error!("{}", text);
     };
 }
 
-fn run() -> Result<(), FrippyError> {
+fn run() -> Result<(), Error> {
     log::set_max_level(if cfg!(debug_assertions) {
         LevelFilter::Debug
     } else {
@@ -100,7 +112,7 @@ fn run() -> Result<(), FrippyError> {
 
     // Without configs the bot would just idle
     if configs.is_empty() {
-        return Err(FrippyError::MissingConfig);
+        bail!("No config file was found");
     }
 
     // Create an event loop to run the connections on.
@@ -119,11 +131,11 @@ fn run() -> Result<(), FrippyError> {
         }
 
         let mut bot = frippy::Bot::new();
-        bot.add_plugin(plugins::Help::new());
-        bot.add_plugin(plugins::Url::new(1024));
-        bot.add_plugin(plugins::Emoji::new());
-        bot.add_plugin(plugins::Currency::new());
-        bot.add_plugin(plugins::KeepNick::new());
+        bot.add_plugin(Help::new());
+        bot.add_plugin(Url::new(1024));
+        bot.add_plugin(Emoji::new());
+        bot.add_plugin(Currency::new());
+        bot.add_plugin(KeepNick::new());
 
         #[cfg(feature = "mysql")]
         {
@@ -134,25 +146,24 @@ fn run() -> Result<(), FrippyError> {
 
                 let manager = ConnectionManager::<MysqlConnection>::new(url.clone());
                 match r2d2::Pool::builder().build(manager) {
-                    Ok(pool) => match embedded_migrations::run(&*pool.get()?)
-                    {
+                    Ok(pool) => match embedded_migrations::run(&*pool.get()?) {
                         Ok(_) => {
                             let pool = Arc::new(pool);
-                            bot.add_plugin(plugins::Factoids::new(pool.clone()));
-                            bot.add_plugin(plugins::Tell::new(pool.clone()));
+                            bot.add_plugin(Factoids::new(pool.clone()));
+                            bot.add_plugin(Tell::new(pool.clone()));
                             info!("Connected to MySQL server")
                         }
                         Err(e) => {
-                            bot.add_plugin(plugins::Factoids::new(HashMap::new()));
-                            bot.add_plugin(plugins::Tell::new(HashMap::new()));
+                            bot.add_plugin(Factoids::new(HashMap::new()));
+                            bot.add_plugin(Tell::new(HashMap::new()));
                             error!("Failed to run migrations: {}", e);
                         }
                     },
                     Err(e) => error!("Failed to connect to database: {}", e),
                 }
             } else {
-                bot.add_plugin(plugins::Factoids::new(HashMap::new()));
-                bot.add_plugin(plugins::Tell::new(HashMap::new()));
+                bot.add_plugin(Factoids::new(HashMap::new()));
+                bot.add_plugin(Tell::new(HashMap::new()));
             }
         }
         #[cfg(not(feature = "mysql"))]
@@ -160,8 +171,8 @@ fn run() -> Result<(), FrippyError> {
             if mysql_url.is_some() {
                 error!("frippy was not built with the mysql feature")
             }
-            bot.add_plugin(plugins::Factoids::new(HashMap::new()));
-            bot.add_plugin(plugins::Tell::new(HashMap::new()));
+            bot.add_plugin(Factoids::new(HashMap::new()));
+            bot.add_plugin(Tell::new(HashMap::new()));
         }
 
         if let Some(disabled_plugins) = disabled_plugins {
diff --git a/src/plugin.rs b/src/plugin.rs
index f33fa80..e57f072 100644
--- a/src/plugin.rs
+++ b/src/plugin.rs
@@ -2,16 +2,17 @@
 use std::fmt;
 
 use irc::client::prelude::*;
-use irc::error::IrcError;
+use error::FrippyError;
 
 /// Describes if a [`Plugin`](trait.Plugin.html) is done working on a
 /// [`Message`](../../irc/proto/message/struct.Message.html) or if another thread is required.
 #[derive(Debug)]
 pub enum ExecutionStatus {
-    /// The [`Plugin`](trait.Plugin.html) does not need to do any more work on this [`Message`](../../irc/proto/message/struct.Message.html).
+    /// The [`Plugin`](trait.Plugin.html) does not need to do any more work on this
+    /// [`Message`](../../irc/proto/message/struct.Message.html).
     Done,
     /// An error occured during the execution.
-    Err(Box<IrcError>),
+    Err(FrippyError),
     /// The execution needs to be done by [`execute_threaded()`](trait.Plugin.html#tymethod.execute_threaded).
     RequiresThread,
 }
@@ -19,15 +20,17 @@ pub enum ExecutionStatus {
 /// `Plugin` has to be implemented for any struct that should be usable
 /// as a `Plugin` in frippy.
 pub trait Plugin: PluginName + Send + Sync + fmt::Debug {
-    /// Handles messages which are not commands or returns [`RequiresThread`](enum.ExecutionStatus.html#variant.RequiresThread)
+    /// Handles messages which are not commands or returns
+    /// [`RequiresThread`](enum.ExecutionStatus.html#variant.RequiresThread)
     /// if [`execute_threaded()`](trait.Plugin.html#tymethod.execute_threaded) should be used instead.
-    fn execute(&self, server: &IrcClient, message: &Message) -> ExecutionStatus;
+    fn execute(&self, client: &IrcClient, message: &Message) -> ExecutionStatus;
     /// Handles messages which are not commands in a new thread.
-    fn execute_threaded(&self, server: &IrcClient, message: &Message) -> Result<(), IrcError>;
+    fn execute_threaded(&self, client: &IrcClient, message: &Message) -> Result<(), FrippyError>;
     /// Handles any command directed at this plugin.
-    fn command(&self, server: &IrcClient, command: PluginCommand) -> Result<(), IrcError>;
-    /// Similar to [`command()`](trait.Plugin.html#tymethod.command) but return a String instead of sending messages directly to IRC.
-    fn evaluate(&self, server: &IrcClient, command: PluginCommand) -> Result<String, String>;
+    fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), FrippyError>;
+    /// Similar to [`command()`](trait.Plugin.html#tymethod.command) but return a String instead of
+    /// sending messages directly to IRC.
+    fn evaluate(&self, client: &IrcClient, command: PluginCommand) -> Result<String, String>;
 }
 
 /// `PluginName` is required by [`Plugin`](trait.Plugin.html).
diff --git a/src/plugins/currency.rs b/src/plugins/currency.rs
index 958c8e2..53a245c 100644
--- a/src/plugins/currency.rs
+++ b/src/plugins/currency.rs
@@ -6,7 +6,6 @@ use std::io::Read;
 use std::num::ParseFloatError;
 
 use irc::client::prelude::*;
-use irc::error::IrcError;
 
 use self::reqwest::Client;
 use self::reqwest::header::Connection;
@@ -14,6 +13,10 @@ use self::serde_json::Value;
 
 use plugin::*;
 
+use error::FrippyError;
+use error::ErrorKind as FrippyErrorKind;
+use failure::ResultExt;
+
 #[derive(PluginName, Default, Debug)]
 pub struct Currency;
 
@@ -124,20 +127,28 @@ impl Plugin for Currency {
         ExecutionStatus::Done
     }
 
-    fn execute_threaded(&self, _: &IrcClient, _: &Message) -> Result<(), IrcError> {
+    fn execute_threaded(&self, _: &IrcClient, _: &Message) -> Result<(), FrippyError> {
         panic!("Currency does not implement the execute function!")
     }
 
-    fn command(&self, client: &IrcClient, mut command: PluginCommand) -> Result<(), IrcError> {
+    fn command(&self, client: &IrcClient, mut command: PluginCommand) -> Result<(), FrippyError> {
         if command.tokens.is_empty() {
-            return client.send_notice(&command.source, &self.invalid_command(client));
+            return Ok(client
+                .send_notice(&command.source, &self.invalid_command(client))
+                .context(FrippyErrorKind::Connection)?);
         }
 
         match command.tokens[0].as_ref() {
-            "help" => client.send_notice(&command.source, &self.help(client)),
+            "help" => Ok(client
+                .send_notice(&command.source, &self.help(client))
+                .context(FrippyErrorKind::Connection)?),
             _ => match self.convert(client, &mut command) {
-                Ok(msg) => client.send_privmsg(&command.target, &msg),
-                Err(msg) => client.send_notice(&command.source, &msg),
+                Ok(msg) => Ok(client
+                    .send_privmsg(&command.target, &msg)
+                    .context(FrippyErrorKind::Connection)?),
+                Err(msg) => Ok(client
+                    .send_notice(&command.source, &msg)
+                    .context(FrippyErrorKind::Connection)?),
             },
         }
     }
@@ -153,6 +164,3 @@ impl Plugin for Currency {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {}
diff --git a/src/plugins/emoji.rs b/src/plugins/emoji.rs
index a4276f4..f1d9376 100644
--- a/src/plugins/emoji.rs
+++ b/src/plugins/emoji.rs
@@ -3,10 +3,14 @@ extern crate unicode_names;
 use std::fmt;
 
 use irc::client::prelude::*;
-use irc::error::IrcError;
 
 use plugin::*;
 
+use error::FrippyError;
+use error::ErrorKind as FrippyErrorKind;
+use failure::Fail;
+use failure::ResultExt;
+
 struct EmojiHandle {
     symbol: char,
     count: i32,
@@ -100,21 +104,23 @@ impl Plugin for Emoji {
                 .send_privmsg(message.response_target().unwrap(), &self.emoji(content))
             {
                 Ok(_) => ExecutionStatus::Done,
-                Err(e) => ExecutionStatus::Err(Box::new(e)),
+                Err(e) => ExecutionStatus::Err(e.context(FrippyErrorKind::Connection).into()),
             },
             _ => ExecutionStatus::Done,
         }
     }
 
-    fn execute_threaded(&self, _: &IrcClient, _: &Message) -> Result<(), IrcError> {
+    fn execute_threaded(&self, _: &IrcClient, _: &Message) -> Result<(), FrippyError> {
         panic!("Emoji should not use threading")
     }
 
-    fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
-        client.send_notice(
-            &command.source,
-            "This Plugin does not implement any commands.",
-        )
+    fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), FrippyError> {
+        Ok(client
+            .send_notice(
+                &command.source,
+                "This Plugin does not implement any commands.",
+            )
+            .context(FrippyErrorKind::Connection)?)
     }
 
     fn evaluate(&self, _: &IrcClient, command: PluginCommand) -> Result<String, String> {
@@ -126,6 +132,3 @@ impl Plugin for Emoji {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {}
diff --git a/src/plugins/factoids/database.rs b/src/plugins/factoids/database.rs
index 88aa0fd..b1fe8dd 100644
--- a/src/plugins/factoids/database.rs
+++ b/src/plugins/factoids/database.rs
@@ -13,13 +13,12 @@ use diesel::mysql::MysqlConnection;
 use r2d2::Pool;
 #[cfg(feature = "mysql")]
 use r2d2_diesel::ConnectionManager;
+#[cfg(feature = "mysql")]
+use failure::ResultExt;
 
 use chrono::NaiveDateTime;
 
-pub enum DbResponse {
-    Success,
-    Failed(&'static str),
-}
+use super::error::*;
 
 #[cfg_attr(feature = "mysql", derive(Queryable))]
 #[derive(Clone, Debug)]
@@ -42,15 +41,15 @@ pub struct NewFactoid<'a> {
 }
 
 pub trait Database: Send {
-    fn insert_factoid(&mut self, factoid: &NewFactoid) -> DbResponse;
-    fn get_factoid(&self, name: &str, idx: i32) -> Option<Factoid>;
-    fn delete_factoid(&mut self, name: &str, idx: i32) -> DbResponse;
-    fn count_factoids(&self, name: &str) -> Result<i32, &'static str>;
+    fn insert_factoid(&mut self, factoid: &NewFactoid) -> Result<(), FactoidsError>;
+    fn get_factoid(&self, name: &str, idx: i32) -> Result<Factoid, FactoidsError>;
+    fn delete_factoid(&mut self, name: &str, idx: i32) -> Result<(), FactoidsError>;
+    fn count_factoids(&self, name: &str) -> Result<i32, FactoidsError>;
 }
 
 // HashMap
 impl Database for HashMap<(String, i32), Factoid> {
-    fn insert_factoid(&mut self, factoid: &NewFactoid) -> DbResponse {
+    fn insert_factoid(&mut self, factoid: &NewFactoid) -> Result<(), FactoidsError> {
         let factoid = Factoid {
             name: String::from(factoid.name),
             idx: factoid.idx,
@@ -61,23 +60,25 @@ impl Database for HashMap<(String, i32), Factoid> {
 
         let name = factoid.name.clone();
         match self.insert((name, factoid.idx), factoid) {
-            None => DbResponse::Success,
-            Some(_) => DbResponse::Failed("Factoid was overwritten"),
+            None => Ok(()),
+            Some(_) => Err(ErrorKind::Duplicate)?,
         }
     }
 
-    fn get_factoid(&self, name: &str, idx: i32) -> Option<Factoid> {
-        self.get(&(String::from(name), idx)).cloned()
+    fn get_factoid(&self, name: &str, idx: i32) -> Result<Factoid, FactoidsError> {
+        Ok(self.get(&(String::from(name), idx))
+            .cloned()
+            .ok_or(ErrorKind::NotFound)?)
     }
 
-    fn delete_factoid(&mut self, name: &str, idx: i32) -> DbResponse {
+    fn delete_factoid(&mut self, name: &str, idx: i32) -> Result<(), FactoidsError> {
         match self.remove(&(String::from(name), idx)) {
-            Some(_) => DbResponse::Success,
-            None => DbResponse::Failed("Factoid not found"),
+            Some(_) => Ok(()),
+            None => Err(ErrorKind::NotFound)?,
         }
     }
 
-    fn count_factoids(&self, name: &str) -> Result<i32, &'static str> {
+    fn count_factoids(&self, name: &str) -> Result<i32, FactoidsError> {
         Ok(self.iter().filter(|&(&(ref n, _), _)| n == name).count() as i32)
     }
 }
@@ -102,38 +103,31 @@ use self::schema::factoids;
 
 #[cfg(feature = "mysql")]
 impl Database for Arc<Pool<ConnectionManager<MysqlConnection>>> {
-    fn insert_factoid(&mut self, factoid: &NewFactoid) -> DbResponse {
+    fn insert_factoid(&mut self, factoid: &NewFactoid) -> Result<(), FactoidsError> {
         use diesel;
 
-        let conn = &*self.get().expect("Failed to get connection");
-        match diesel::insert_into(factoids::table)
+        let conn = &*self.get().context(ErrorKind::NoConnection)?;
+        diesel::insert_into(factoids::table)
             .values(factoid)
             .execute(conn)
-        {
-            Ok(_) => DbResponse::Success,
-            Err(e) => {
-                error!("DB Insertion Error: {}", e);
-                DbResponse::Failed("Failed to add factoid")
-            }
-        }
+            .context(ErrorKind::MysqlError)?;
+
+        Ok(())
     }
 
-    fn get_factoid(&self, name: &str, idx: i32) -> Option<Factoid> {
-        let conn = &*self.get().expect("Failed to get connection");
-        match factoids::table.find((name, idx)).first(conn) {
-            Ok(f) => Some(f),
-            Err(e) => {
-                error!("DB Count Error: {}", e);
-                None
-            }
-        }
+    fn get_factoid(&self, name: &str, idx: i32) -> Result<Factoid, FactoidsError> {
+        let conn = &*self.get().context(ErrorKind::NoConnection)?;
+        Ok(factoids::table
+            .find((name, idx))
+            .first(conn)
+            .context(ErrorKind::MysqlError)?)
     }
 
-    fn delete_factoid(&mut self, name: &str, idx: i32) -> DbResponse {
+    fn delete_factoid(&mut self, name: &str, idx: i32) -> Result<(), FactoidsError> {
         use diesel;
         use self::factoids::columns;
 
-        let conn = &*self.get().expect("Failed to get connection");
+        let conn = &*self.get().context(ErrorKind::NoConnection)?;
         match diesel::delete(
             factoids::table
                 .filter(columns::name.eq(name))
@@ -142,22 +136,19 @@ impl Database for Arc<Pool<ConnectionManager<MysqlConnection>>> {
         {
             Ok(v) => {
                 if v > 0 {
-                    DbResponse::Success
+                    Ok(())
                 } else {
-                    DbResponse::Failed("Could not find any factoid with that name")
+                    Err(ErrorKind::NotFound)?
                 }
             }
-            Err(e) => {
-                error!("DB Deletion Error: {}", e);
-                DbResponse::Failed("Failed to delete factoid")
-            }
+            Err(e) => Err(e).context(ErrorKind::MysqlError)?,
         }
     }
 
-    fn count_factoids(&self, name: &str) -> Result<i32, &'static str> {
+    fn count_factoids(&self, name: &str) -> Result<i32, FactoidsError> {
         use diesel;
 
-        let conn = &*self.get().expect("Failed to get connection");
+        let conn = &*self.get().context(ErrorKind::NoConnection)?;
         let count: Result<i64, _> = factoids::table
             .filter(factoids::columns::name.eq(name))
             .count()
@@ -166,10 +157,7 @@ impl Database for Arc<Pool<ConnectionManager<MysqlConnection>>> {
         match count {
             Ok(c) => Ok(c as i32),
             Err(diesel::NotFound) => Ok(0),
-            Err(e) => {
-                error!("DB Count Error: {}", e);
-                Err("Database Error")
-            }
+            Err(e) => Err(e).context(ErrorKind::MysqlError)?,
         }
     }
 }
diff --git a/src/plugins/factoids/mod.rs b/src/plugins/factoids/mod.rs
index 806bb7e..2f3690f 100644
--- a/src/plugins/factoids/mod.rs
+++ b/src/plugins/factoids/mod.rs
@@ -5,21 +5,22 @@ use std::str::FromStr;
 use std::sync::Mutex;
 use self::rlua::prelude::*;
 use irc::client::prelude::*;
-use irc::error::IrcError;
-use error::FrippyError;
-use error::PluginError;
-use failure::Fail;
 
 use time;
 use chrono::NaiveDateTime;
 
 use plugin::*;
 pub mod database;
-use self::database::{Database, DbResponse};
+use self::database::Database;
 
 mod utils;
 use self::utils::*;
 
+use failure::ResultExt;
+use error::ErrorKind as FrippyErrorKind;
+use error::FrippyError;
+use self::error::*;
+
 static LUA_SANDBOX: &'static str = include_str!("sandbox.lua");
 
 #[derive(PluginName)]
@@ -43,8 +44,13 @@ impl<T: Database> Factoids<T> {
         }
     }
 
-    fn create_factoid(&self, name: &str, content: &str, author: &str) -> Result<&str, FrippyError> {
-        let count = try_lock!(self.factoids).count_factoids(name).map_err(|e| PluginError::Factoids { error: e.to_owned() })?;
+    fn create_factoid(
+        &self,
+        name: &str,
+        content: &str,
+        author: &str,
+    ) -> Result<&str, FactoidsError> {
+        let count = try_lock!(self.factoids).count_factoids(name)?;
         let tm = time::now().to_timespec();
 
         let factoid = database::NewFactoid {
@@ -55,15 +61,14 @@ impl<T: Database> Factoids<T> {
             created: NaiveDateTime::from_timestamp(tm.sec, 0u32),
         };
 
-        match try_lock!(self.factoids).insert_factoid(&factoid) {
-            DbResponse::Success => Ok("Successfully added"),
-            DbResponse::Failed(e) => Err(PluginError::Factoids { error: e.to_owned() })?,
-        }
+        Ok(try_lock!(self.factoids)
+            .insert_factoid(&factoid)
+            .map(|()| "Successfully added!")?)
     }
 
-    fn add(&self, client: &IrcClient, command: &mut PluginCommand) -> Result<&str, FrippyError> {
+    fn add(&self, command: &mut PluginCommand) -> Result<&str, FactoidsError> {
         if command.tokens.len() < 2 {
-            return Ok(self.invalid_command(client, command).map(|()| "")?);
+            Err(ErrorKind::InvalidCommand)?;
         }
 
         let name = command.tokens.remove(0);
@@ -72,45 +77,41 @@ impl<T: Database> Factoids<T> {
         Ok(self.create_factoid(&name, &content, &command.source)?)
     }
 
-    fn add_from_url(
-        &self,
-        client: &IrcClient,
-        command: &mut PluginCommand,
-    ) -> Result<&str, FrippyError> {
+    fn add_from_url(&self, command: &mut PluginCommand) -> Result<&str, FactoidsError> {
         if command.tokens.len() < 2 {
-            return Ok(self.invalid_command(client, command).map(|()| "")?);
+            Err(ErrorKind::InvalidCommand)?;
         }
 
         let name = command.tokens.remove(0);
         let url = &command.tokens[0];
-        let content = ::utils::download(url, Some(1024))?;
+        let content = ::utils::download(url, Some(1024)).context(ErrorKind::Download)?;
 
         Ok(self.create_factoid(&name, &content, &command.source)?)
     }
 
-    fn remove(&self, client: &IrcClient, command: &mut PluginCommand) -> Result<&str, FrippyError> {
+    fn remove(&self, command: &mut PluginCommand) -> Result<&str, FactoidsError> {
         if command.tokens.len() < 1 {
-            return Ok(self.invalid_command(client, command).map(|()| "")?);
+            Err(ErrorKind::InvalidCommand)?;
         }
 
         let name = command.tokens.remove(0);
-        let count = try_lock!(self.factoids).count_factoids(&name).map_err(|e| PluginError::Factoids { error: e.to_owned() } )?;
+        let count = try_lock!(self.factoids).count_factoids(&name)?;
 
         match try_lock!(self.factoids).delete_factoid(&name, count - 1) {
-            DbResponse::Success => Ok("Successfully removed"),
-            DbResponse::Failed(e) => Err(PluginError::Factoids { error: e.to_owned() })?,
+            Ok(()) => Ok("Successfully removed"),
+            Err(e) => Err(e)?,
         }
     }
 
-    fn get(&self, client: &IrcClient, command: &PluginCommand) -> Result<String, FrippyError> {
+    fn get(&self, command: &PluginCommand) -> Result<String, FactoidsError> {
         let (name, idx) = match command.tokens.len() {
-            0 => return Ok(self.invalid_command(client, command).map(|()| String::new())?),
+            0 => Err(ErrorKind::InvalidCommand)?,
             1 => {
                 let name = &command.tokens[0];
-                let count = try_lock!(self.factoids).count_factoids(name).map_err(|e| PluginError::Factoids { error: e.to_owned() } )?;
+                let count = try_lock!(self.factoids).count_factoids(name)?;
 
                 if count < 1 {
-                    Err(PluginError::Factoids { error: format!("{} does not exist", name) })?;
+                    Err(ErrorKind::NotFound)?;
                 }
 
                 (name, count - 1)
@@ -119,61 +120,55 @@ impl<T: Database> Factoids<T> {
                 let name = &command.tokens[0];
                 let idx = match i32::from_str(&command.tokens[1]) {
                     Ok(i) => i,
-                    Err(_) => Err(PluginError::Factoids { error: String::from("Invalid index") })?,
+                    Err(_) => Err(ErrorKind::InvalidCommand)?,
                 };
 
                 (name, idx)
             }
         };
 
-        let factoid = match try_lock!(self.factoids).get_factoid(name, idx) {
-            Some(v) => v,
-            None => Err(PluginError::Factoids { error: format!("{}~{} does not exist", name, idx) })?,
-        };
+        let factoid = try_lock!(self.factoids)
+            .get_factoid(name, idx)
+            .context(ErrorKind::NotFound)?;
 
         let message = factoid.content.replace("\n", "|").replace("\r", "");
 
         Ok(format!("{}: {}", factoid.name, message))
     }
 
-    fn info(&self, client: &IrcClient, command: &PluginCommand) -> Result<String, FrippyError> {
+    fn info(&self, command: &PluginCommand) -> Result<String, FactoidsError> {
         match command.tokens.len() {
-            0 => Ok(self.invalid_command(client, command).map(|()| String::new())?),
+            0 => Err(ErrorKind::InvalidCommand)?,
             1 => {
                 let name = &command.tokens[0];
-                let count = try_lock!(self.factoids).count_factoids(name).map_err(|e| PluginError::Factoids { error: e.to_owned() } )?;
+                let count = try_lock!(self.factoids).count_factoids(name)?;
 
                 Ok(match count {
-                    0 => Err(PluginError::Factoids { error: format!("{} does not exist", name) })?,
+                    0 => Err(ErrorKind::NotFound)?,
                     1 => format!("There is 1 version of {}", name),
                     _ => format!("There are {} versions of {}", count, name),
                 })
             }
             _ => {
                 let name = &command.tokens[0];
-                let idx = i32::from_str(&command.tokens[1]).map_err(|_| PluginError::Factoids { error: String::from("Invalid index") })?;
-
-                let factoid = match try_lock!(self.factoids).get_factoid(name, idx) {
-                    Some(v) => v,
-                    None => return Ok(format!("{}~{} does not exist", name, idx)),
-                };
+                let idx = i32::from_str(&command.tokens[1]).context(ErrorKind::InvalidIndex)?;
+                let factoid = try_lock!(self.factoids).get_factoid(name, idx)?;
 
-                Ok(format!("{}: Added by {} at {} UTC", name, factoid.author, factoid.created))
+                Ok(format!(
+                    "{}: Added by {} at {} UTC",
+                    name, factoid.author, factoid.created
+                ))
             }
         }
     }
 
-    fn exec(
-        &self,
-        client: &IrcClient,
-        mut command: PluginCommand,
-    ) -> Result<String, FrippyError> {
+    fn exec(&self, mut command: PluginCommand) -> Result<String, FactoidsError> {
         if command.tokens.len() < 1 {
-            Ok(self.invalid_command(client, &command).map(|()| String::new())?)
+            Err(ErrorKind::InvalidIndex)?
         } else {
             let name = command.tokens.remove(0);
-            let count = try_lock!(self.factoids).count_factoids(&name).map_err(|e| PluginError::Factoids { error: e.to_owned() } )?;
-            let factoid = try_lock!(self.factoids).get_factoid(&name, count - 1).ok_or(PluginError::Factoids { error: format!("The factoid \"{}\" does not exist", name) })?;
+            let count = try_lock!(self.factoids).count_factoids(&name)?;
+            let factoid = try_lock!(self.factoids).get_factoid(&name, count - 1)?;
 
             let content = factoid.content;
             let value = if content.starts_with('>') {
@@ -225,10 +220,6 @@ impl<T: Database> Factoids<T> {
 
         Ok(output.join("|"))
     }
-
-    fn invalid_command(&self, client: &IrcClient, command: &PluginCommand) -> Result<(), IrcError> {
-        client.send_notice(&command.source, "Invalid Command")
-    }
 }
 
 impl<T: Database> Plugin for Factoids<T> {
@@ -243,7 +234,7 @@ impl<T: Database> Plugin for Factoids<T> {
         }
     }
 
-    fn execute_threaded(&self, client: &IrcClient, message: &Message) -> Result<(), IrcError> {
+    fn execute_threaded(&self, client: &IrcClient, message: &Message) -> Result<(), FrippyError> {
         if let Command::PRIVMSG(_, mut content) = message.command.clone() {
             content.remove(0);
 
@@ -255,18 +246,22 @@ impl<T: Database> Plugin for Factoids<T> {
                 tokens: t,
             };
 
-            match self.exec(client, c) {
-                Ok(f) => client.send_privmsg(&message.response_target().unwrap(), &f),
-                Err(_) => Ok(()),
-            }
+            Ok(match self.exec(c) {
+                Ok(f) => client
+                    .send_privmsg(&message.response_target().unwrap(), &f)
+                    .context(FrippyErrorKind::Connection)?,
+                Err(_) => (),
+            })
         } else {
             Ok(())
         }
     }
 
-    fn command(&self, client: &IrcClient, mut command: PluginCommand) -> Result<(), IrcError> {
+    fn command(&self, client: &IrcClient, mut command: PluginCommand) -> Result<(), FrippyError> {
         if command.tokens.is_empty() {
-            return self.invalid_command(client, &command);
+            return Ok(client
+                .send_notice(&command.target, "Invalid command")
+                .context(FrippyErrorKind::Connection)?);
         }
 
         let target = command.target.clone();
@@ -274,19 +269,27 @@ impl<T: Database> Plugin for Factoids<T> {
 
         let sub_command = command.tokens.remove(0);
         let result = match sub_command.as_ref() {
-            "add" => self.add(client, &mut command).map(|s| s.to_owned()),
-            "fromurl" => self.add_from_url(client, &mut command).map(|s| s.to_owned()),
-            "remove" => self.remove(client, &mut command).map(|s| s.to_owned()),
-            "get" => self.get(client, &command),
-            "info" => self.info(client, &command),
-            "exec" => self.exec(client, command),
-            _ => self.invalid_command(client, &command).map(|()| String::new()).map_err(|e| e.into()),
+            "add" => self.add(&mut command).map(|s| s.to_owned()),
+            "fromurl" => self.add_from_url(&mut command).map(|s| s.to_owned()),
+            "remove" => self.remove(&mut command).map(|s| s.to_owned()),
+            "get" => self.get(&command),
+            "info" => self.info(&command),
+            "exec" => self.exec(command),
+            _ => Err(ErrorKind::InvalidCommand.into()),
         };
 
         Ok(match result {
-            Ok(v) => client.send_privmsg(&target, &v),
-            Err(e) => client.send_notice(&source, &e.cause().unwrap().to_string()),
-        }?)
+            Ok(v) => client
+                .send_privmsg(&target, &v)
+                .context(FrippyErrorKind::Connection)?,
+            Err(e) => {
+                let message = e.to_string();
+                client
+                    .send_notice(&source, &message)
+                    .context(FrippyErrorKind::Connection)?;
+                Err(e).context(FrippyErrorKind::Factoids)?
+            }
+        })
     }
 
     fn evaluate(&self, _: &IrcClient, _: PluginCommand) -> Result<String, String> {
@@ -301,3 +304,39 @@ impl<T: Database> fmt::Debug for Factoids<T> {
         write!(f, "Factoids {{ ... }}")
     }
 }
+
+pub mod error {
+    #[derive(Copy, Clone, Eq, PartialEq, Debug, Fail, Error)]
+    #[error = "FactoidsError"]
+    pub enum ErrorKind {
+        /// Invalid command error
+        #[fail(display = "Invalid Command")]
+        InvalidCommand,
+
+        /// Invalid index error
+        #[fail(display = "Invalid index")]
+        InvalidIndex,
+
+        /// Download  error
+        #[fail(display = "Download failed")]
+        Download,
+
+        /// Duplicate error
+        #[fail(display = "Entry already exists")]
+        Duplicate,
+
+        /// Not found error
+        #[fail(display = "Factoid was not found")]
+        NotFound,
+
+        /// MySQL error
+        #[cfg(feature = "mysql")]
+        #[fail(display = "Failed to execute MySQL Query")]
+        MysqlError,
+
+        /// No connection error
+        #[cfg(feature = "mysql")]
+        #[fail(display = "No connection to the database")]
+        NoConnection,
+    }
+}
diff --git a/src/plugins/factoids/utils.rs b/src/plugins/factoids/utils.rs
index 009b46b..70ac8a7 100644
--- a/src/plugins/factoids/utils.rs
+++ b/src/plugins/factoids/utils.rs
@@ -11,7 +11,11 @@ use self::LuaError::RuntimeError;
 pub fn download(_: &Lua, url: String) -> Result<String, LuaError> {
     match utils::download(&url, Some(1024)) {
         Ok(v) => Ok(v),
-        Err(e) => Err(RuntimeError(format!("Failed to download {} - {}", url, e.to_string()))),
+        Err(e) => Err(RuntimeError(format!(
+            "Failed to download {} - {}",
+            url,
+            e.to_string()
+        ))),
     }
 }
 
diff --git a/src/plugins/help.rs b/src/plugins/help.rs
index 4dd93d7..7e3658d 100644
--- a/src/plugins/help.rs
+++ b/src/plugins/help.rs
@@ -1,8 +1,11 @@
 use irc::client::prelude::*;
-use irc::error::IrcError;
 
 use plugin::*;
 
+use error::FrippyError;
+use error::ErrorKind as FrippyErrorKind;
+use failure::ResultExt;
+
 #[derive(PluginName, Default, Debug)]
 pub struct Help;
 
@@ -17,18 +20,17 @@ impl Plugin for Help {
         ExecutionStatus::Done
     }
 
-    fn execute_threaded(&self, _: &IrcClient, _: &Message) -> Result<(), IrcError> {
+    fn execute_threaded(&self, _: &IrcClient, _: &Message) -> Result<(), FrippyError> {
         panic!("Help should not use threading")
     }
 
-    fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
-        client.send_notice(&command.source, "Help has not been added yet.")
+    fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), FrippyError> {
+        Ok(client
+            .send_notice(&command.source, "Help has not been added yet.")
+            .context(FrippyErrorKind::Connection)?)
     }
 
     fn evaluate(&self, _: &IrcClient, _: PluginCommand) -> Result<String, String> {
         Err(String::from("Help has not been added yet."))
     }
 }
-
-#[cfg(test)]
-mod tests {}
diff --git a/src/plugins/keepnick.rs b/src/plugins/keepnick.rs
index bdabd90..58ac167 100644
--- a/src/plugins/keepnick.rs
+++ b/src/plugins/keepnick.rs
@@ -1,8 +1,11 @@
 use irc::client::prelude::*;
-use irc::error::IrcError;
 
 use plugin::*;
 
+use error::FrippyError;
+use error::ErrorKind as FrippyErrorKind;
+use failure::ResultExt;
+
 #[derive(PluginName, Default, Debug)]
 pub struct KeepNick;
 
@@ -25,9 +28,12 @@ impl KeepNick {
 
         if client_nick != cfg_nick {
             info!("Trying to switch nick from {} to {}", client_nick, cfg_nick);
-            match client.send(Command::NICK(cfg_nick)) {
+            match client
+                .send(Command::NICK(cfg_nick))
+                .context(FrippyErrorKind::Connection)
+            {
                 Ok(_) => ExecutionStatus::Done,
-                Err(e) => ExecutionStatus::Err(Box::new(e)),
+                Err(e) => ExecutionStatus::Err(e.into()),
             }
         } else {
             ExecutionStatus::Done
@@ -45,21 +51,20 @@ impl Plugin for KeepNick {
         }
     }
 
-    fn execute_threaded(&self, _: &IrcClient, _: &Message) -> Result<(), IrcError> {
+    fn execute_threaded(&self, _: &IrcClient, _: &Message) -> Result<(), FrippyError> {
         panic!("Tell should not use threading")
     }
 
-    fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
-        client.send_notice(
-            &command.source,
-            "This Plugin does not implement any commands.",
-        )
+    fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), FrippyError> {
+        Ok(client
+            .send_notice(
+                &command.source,
+                "This Plugin does not implement any commands.",
+            )
+            .context(FrippyErrorKind::Connection)?)
     }
 
     fn evaluate(&self, _: &IrcClient, _: PluginCommand) -> Result<String, String> {
         Err(String::from("This Plugin does not implement any commands."))
     }
 }
-
-#[cfg(test)]
-mod tests {}
diff --git a/src/plugins/mod.rs b/src/plugins/mod.rs
index 5b32efd..9a3ba2f 100644
--- a/src/plugins/mod.rs
+++ b/src/plugins/mod.rs
@@ -1,17 +1,8 @@
 //! Collection of plugins included
-mod help;
-mod url;
-mod emoji;
-mod tell;
-mod currency;
-mod factoids;
-mod keepnick;
-
-pub use self::help::Help;
-pub use self::url::Url;
-pub use self::emoji::Emoji;
-pub use self::tell::Tell;
-pub use self::currency::Currency;
-pub use self::factoids::Factoids;
-pub use self::factoids::database;
-pub use self::keepnick::KeepNick;
+pub mod help;
+pub mod url;
+pub mod emoji;
+pub mod tell;
+pub mod currency;
+pub mod factoids;
+pub mod keepnick;
diff --git a/src/plugins/tell/mod.rs b/src/plugins/tell/mod.rs
index 3a8feeb..7052b3e 100644
--- a/src/plugins/tell/mod.rs
+++ b/src/plugins/tell/mod.rs
@@ -1,5 +1,4 @@
 use irc::client::prelude::*;
-use irc::error::IrcError;
 
 use std::time::Duration;
 use std::sync::Mutex;
@@ -10,6 +9,11 @@ use humantime::format_duration;
 
 use plugin::*;
 
+use error::FrippyError;
+use error::ErrorKind as FrippyErrorKind;
+use failure::Fail;
+use failure::ResultExt;
+
 pub mod database;
 use self::database::{Database, DbResponse};
 
@@ -84,7 +88,7 @@ impl<T: Database> Tell<T> {
                         tell.sender, human_dur, tell.message
                     ),
                 ) {
-                    return ExecutionStatus::Err(Box::new(e));
+                    return ExecutionStatus::Err(e.context(FrippyErrorKind::Connection).into());
                 }
                 debug!(
                     "Sent {:?} from {:?} to {:?}",
@@ -123,22 +127,30 @@ impl<T: Database> Plugin for Tell<T> {
         }
     }
 
-    fn execute_threaded(&self, _: &IrcClient, _: &Message) -> Result<(), IrcError> {
+    fn execute_threaded(&self, _: &IrcClient, _: &Message) -> Result<(), FrippyError> {
         panic!("Tell should not use threading")
     }
 
-    fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
+    fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), FrippyError> {
         if command.tokens.is_empty() {
-            return client.send_notice(&command.source, &self.invalid_command(client));
+            return Ok(client
+                .send_notice(&command.source, &self.invalid_command(client))
+                .context(FrippyErrorKind::Connection)?);
         }
 
-        match command.tokens[0].as_ref() {
-            "help" => client.send_notice(&command.source, &self.help(client)),
+        Ok(match command.tokens[0].as_ref() {
+            "help" => client
+                .send_notice(&command.source, &self.help(client))
+                .context(FrippyErrorKind::Connection),
             _ => match self.tell_command(client, &command) {
-                Ok(msg) => client.send_notice(&command.source, msg),
-                Err(msg) => client.send_notice(&command.source, &msg),
+                Ok(msg) => client
+                    .send_notice(&command.source, msg)
+                    .context(FrippyErrorKind::Connection),
+                Err(msg) => client
+                    .send_notice(&command.source, &msg)
+                    .context(FrippyErrorKind::Connection),
             },
-        }
+        }?)
     }
 
     fn evaluate(&self, _: &IrcClient, _: PluginCommand) -> Result<String, String> {
diff --git a/src/plugins/url.rs b/src/plugins/url.rs
index 6f00466..fa4c6f4 100644
--- a/src/plugins/url.rs
+++ b/src/plugins/url.rs
@@ -2,7 +2,6 @@ extern crate regex;
 extern crate select;
 
 use irc::client::prelude::*;
-use irc::error::IrcError;
 
 use self::regex::Regex;
 
@@ -11,9 +10,12 @@ use self::select::predicate::Name;
 
 use plugin::*;
 use utils;
+
+use self::error::*;
 use error::FrippyError;
-use error::UrlError;
+use error::ErrorKind as FrippyErrorKind;
 use failure::Fail;
+use failure::ResultExt;
 
 lazy_static! {
     static ref RE: Regex = Regex::new(r"(^|\s)(https?://\S+)").unwrap();
@@ -48,11 +50,11 @@ impl Url {
         Some(title_text)
     }
 
-    fn url(&self, text: &str) -> Result<String, FrippyError> {
-        let url =  self.grep_url(text).ok_or(UrlError::MissingUrl)?;
-        let body = utils::download(&url, Some(self.max_kib))?;
+    fn url(&self, text: &str) -> Result<String, UrlError> {
+        let url = self.grep_url(text).ok_or(ErrorKind::MissingUrl)?;
+        let body = utils::download(&url, Some(self.max_kib)).context(ErrorKind::Download)?;
 
-        Ok(self.get_title(&body).ok_or(UrlError::MissingTitle)?)
+        Ok(self.get_title(&body).ok_or(ErrorKind::MissingTitle)?)
     }
 }
 
@@ -68,27 +70,48 @@ impl Plugin for Url {
         }
     }
 
-    fn execute_threaded(&self, client: &IrcClient, message: &Message) -> Result<(), IrcError> {
-        match message.command {
+    fn execute_threaded(&self, client: &IrcClient, message: &Message) -> Result<(), FrippyError> {
+        Ok(match message.command {
             Command::PRIVMSG(_, ref content) => match self.url(content) {
-                Ok(title) => client.send_privmsg(message.response_target().unwrap(), &title),
-                Err(e) => Ok(utils::log_error(e)),
+                Ok(title) => client
+                    .send_privmsg(message.response_target().unwrap(), &title)
+                    .context(FrippyErrorKind::Connection)?,
+                Err(e) => Err(e).context(FrippyErrorKind::Url)?,
             },
-            _ => Ok(()),
-        }
+            _ => (),
+        })
     }
 
-    fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), IrcError> {
-        client.send_notice(
-            &command.source,
-            "This Plugin does not implement any commands.",
-        )
+    fn command(&self, client: &IrcClient, command: PluginCommand) -> Result<(), FrippyError> {
+        Ok(client
+            .send_notice(
+                &command.source,
+                "This Plugin does not implement any commands.",
+            )
+            .context(FrippyErrorKind::Connection)?)
     }
 
     fn evaluate(&self, _: &IrcClient, command: PluginCommand) -> Result<String, String> {
-        self.url(&command.tokens[0]).map_err(|e| e.cause().unwrap().to_string())
+        self.url(&command.tokens[0])
+            .map_err(|e| e.cause().unwrap().to_string())
     }
 }
 
-#[cfg(test)]
-mod tests {}
+pub mod error {
+    /// A URL plugin error
+    #[derive(Copy, Clone, Eq, PartialEq, Debug, Fail, Error)]
+    #[error = "UrlError"]
+    pub enum ErrorKind {
+        /// A download error
+        #[fail(display = "A download error occured")]
+        Download,
+
+        /// Missing URL error
+        #[fail(display = "No URL was found")]
+        MissingUrl,
+
+        /// Missing title error
+        #[fail(display = "No title was found")]
+        MissingTitle,
+    }
+}
diff --git a/src/utils.rs b/src/utils.rs
index cf91b37..06156be 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -4,15 +4,19 @@ use std::io::{self, Read};
 use reqwest::Client;
 use reqwest::header::Connection;
 
-use failure::Fail;
-use error::FrippyError;
+use failure::ResultExt;
+use self::error::{DownloadError, ErrorKind};
 
 /// Downloads the file and converts it to a String.
 /// Any invalid bytes are converted to a replacement character.
 ///
 /// The error indicated either a failed download or that the DownloadLimit was reached
-pub fn download(url: &str, max_kib: Option<usize>) -> Result<String, FrippyError> {
-    let mut response = Client::new().get(url).header(Connection::close()).send()?;
+pub fn download(url: &str, max_kib: Option<usize>) -> Result<String, DownloadError> {
+    let mut response = Client::new()
+        .get(url)
+        .header(Connection::close())
+        .send()
+        .context(ErrorKind::Connection)?;
 
     // 100 kibibyte buffer
     let mut buf = [0; 100 * 1024];
@@ -25,7 +29,7 @@ pub fn download(url: &str, max_kib: Option<usize>) -> Result<String, FrippyError
             Ok(0) => break,
             Ok(len) => len,
             Err(ref e) if e.kind() == io::ErrorKind::Interrupted => continue,
-            Err(e) => Err(e)?,
+            Err(e) => Err(e).context(ErrorKind::Read)?,
         };
 
         bytes.extend_from_slice(&buf);
@@ -34,7 +38,7 @@ pub fn download(url: &str, max_kib: Option<usize>) -> Result<String, FrippyError
         // Check if the file is too large to download
         if let Some(max_kib) = max_kib {
             if written > max_kib * 1024 {
-                Err(FrippyError::DownloadLimit { limit: max_kib })?;
+                Err(ErrorKind::DownloadLimit)?;
             }
         }
     }
@@ -42,12 +46,20 @@ pub fn download(url: &str, max_kib: Option<usize>) -> Result<String, FrippyError
     Ok(String::from_utf8_lossy(&bytes).into_owned())
 }
 
+pub mod error {
+    #[derive(Copy, Clone, Eq, PartialEq, Debug, Fail, Error)]
+    #[error = "DownloadError"]
+    pub enum ErrorKind {
+        /// Connection Error
+        #[fail(display = "A connection error has occured")]
+        Connection,
 
-pub fn log_error(e: FrippyError) {
-    let mut causes = e.causes();
+        /// Read Error
+        #[fail(display = "A read error has occured")]
+        Read,
 
-    error!("{}", causes.next().unwrap());
-    for cause in causes {
-        error!("caused by: {}", cause);
+        /// Reached download limit error
+        #[fail(display = "Reached download limit")]
+        DownloadLimit,
     }
 }
-- 
cgit v1.2.3-70-g09d2