From ed2e5f990d049f79dbc7389ab6c4582adece8c87 Mon Sep 17 00:00:00 2001
From: Giovanni Capuano <webmaster@giovannicapuano.net>
Date: Sun, 11 Dec 2016 00:47:34 +0100
Subject: [PATCH] Update slack to 0.16 and serde to 0.8

---
 Cargo.toml           | 4 ++--
 src/event_handler.rs | 4 ++--
 src/lib.rs           | 4 ++--
 src/sender.rs        | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 66fd6b7..a6a5e3a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,5 +10,5 @@ homepage = "https://github.com/mthjones/slackbot"
 documentation = "https://mthjones.github.io/slackbot/slackbot"
 
 [dependencies]
-slack = "^0.8.2"
-serde_json = "^0.6.0"
+slack = "^0.16"
+serde_json = "^0.8.0"
diff --git a/src/event_handler.rs b/src/event_handler.rs
index 2a43847..cf78adf 100644
--- a/src/event_handler.rs
+++ b/src/event_handler.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use slack::{EventHandler,RtmClient};
+use slack::{Error, Event, EventHandler, RtmClient};
 use serde_json::{self, Value};
 
 use super::CommandHandler;
@@ -61,7 +61,7 @@ impl<'a> SlackBotEventHandler<'a> {
 }
 
 impl<'a> EventHandler for SlackBotEventHandler<'a> {
-    fn on_receive(&mut self, cli: &mut RtmClient, json_str: &str) {
+    fn on_event(&mut self, cli: &mut RtmClient, _: Result<Event, Error>, json_str: &str) {
         if let Some(cmd) = Self::parse_json_to_command(&self.bot_name[..], json_str) {
             let user = cli.get_users().iter().find(|u| u.id == cmd.user_id).unwrap().clone();
             if let Some(handler) = self.handlers.get_mut(&cmd.command[..]) {
diff --git a/src/lib.rs b/src/lib.rs
index 1b878bc..ea49cdb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -30,7 +30,7 @@ extern crate slack;
 extern crate serde_json;
 
 use std::collections::HashMap;
-use slack::RtmClient;
+use slack::{Error, RtmClient};
 
 mod event_handler;
 mod sender;
@@ -113,7 +113,7 @@ impl SlackBot {
     ///     Err(err) => println!("Bot crashed. Error message: {}", err)
     /// };
     /// ```
-    pub fn run(&mut self) -> Result<(), String> {
+    pub fn run(&mut self) -> Result<(), Error> {
         let mut client = RtmClient::new(&self.token[..]);
         let mut handler = SlackBotEventHandler::new(&self.name[..], &mut self.handlers);
 
diff --git a/src/sender.rs b/src/sender.rs
index 1caf178..30dce0f 100644
--- a/src/sender.rs
+++ b/src/sender.rs
@@ -1,4 +1,4 @@
-use slack::{RtmClient, User};
+use slack::{Error, RtmClient, User};
 
 /// The sender of a command to the bot.
 pub struct Sender<'a> {
@@ -30,7 +30,7 @@ impl<'a> Sender<'a> {
     /// sender.respond_in_channel("Hello, world!");
     /// # }));
     /// ```
-    pub fn respond_in_channel<S: Into<String>>(&mut self, message: S) -> Result<(), String> {
+    pub fn respond_in_channel<S: Into<String>>(&mut self, message: S) -> Result<isize, Error> {
         self.channel_writer.write(message)
     }
 }
@@ -48,7 +48,7 @@ impl<'a> ChannelWriter<'a> {
         }
     }
 
-    fn write<S: Into<String>>(&mut self, message: S) -> Result<(), String> {
+    fn write<S: Into<String>>(&mut self, message: S) -> Result<isize, Error> {
         self.client.send_message(&self.channel_id[..], &message.into()[..])
     }
 }