3 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/factoids/mod.rs b/src/plugins/factoids/mod.rs
index 3f89943..806bb7e 100644
--- a/src/plugins/factoids/mod.rs
+++ b/src/plugins/factoids/mod.rs
@@ -83,7 +83,7 @@ impl<T: Database> Factoids<T> {
 
         let name = command.tokens.remove(0);
         let url = &command.tokens[0];
-        let content = ::utils::download(1024, url)?;
+        let content = ::utils::download(url, Some(1024))?;
 
         Ok(self.create_factoid(&name, &content, &command.source)?)
     }
diff --git a/src/plugins/factoids/utils.rs b/src/plugins/factoids/utils.rs
index 036dcc6..009b46b 100644
--- a/src/plugins/factoids/utils.rs
+++ b/src/plugins/factoids/utils.rs
@@ -9,7 +9,7 @@ use super::rlua::prelude::*;
 use self::LuaError::RuntimeError;
 
 pub fn download(_: &Lua, url: String) -> Result<String, LuaError> {
-    match utils::download(1024, &url) {
+    match utils::download(&url, Some(1024)) {
         Ok(v) => Ok(v),
         Err(e) => Err(RuntimeError(format!("Failed to download {} - {}", url, e.to_string()))),
     }
diff --git a/src/plugins/url.rs b/src/plugins/url.rs
index af6f36f..6f00466 100644
--- a/src/plugins/url.rs
+++ b/src/plugins/url.rs
@@ -50,7 +50,7 @@ impl Url {
 
     fn url(&self, text: &str) -> Result<String, FrippyError> {
         let url =  self.grep_url(text).ok_or(UrlError::MissingUrl)?;
-        let body = utils::download(self.max_kib, &url)?;
+        let body = utils::download(&url, Some(self.max_kib))?;
 
         Ok(self.get_title(&body).ok_or(UrlError::MissingTitle)?)
     }
@@ -72,10 +72,7 @@ impl Plugin for Url {
         match message.command {
             Command::PRIVMSG(_, ref content) => match self.url(content) {
                 Ok(title) => client.send_privmsg(message.response_target().unwrap(), &title),
-                Err(e) => {
-                    error!("Url plugin error: {}", e);
-                    Ok(())
-                }
+                Err(e) => Ok(utils::log_error(e)),
             },
             _ => Ok(()),
         }