Merge branch 'dev' into factoid-plugin

1 files changed, 29 insertions, 24 deletions

diff --git a/src/plugins/keepnick.rs b/src/plugins/keepnick.rs
index 1d4627d..73f4893 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,48 +11,53 @@ impl KeepNick {
         KeepNick {}
     }
 
-    fn check_nick(&self, server: &IrcServer, 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();
-
-        if server_nick != cfg_nick {
-            info!("Trying to switch nick from {} to {}", server_nick, cfg_nick);
-            server.send(Command::NICK(cfg_nick))
+        let client_nick = client.current_nickname();
 
+        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, _: &IrcServer, message: &Message) -> bool {
-        match message.command {
-            Command::QUIT(_) => true,
-            _ => false,
-        }
-    }
-
-    fn execute(&self, server: &IrcServer, 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: &IrcServer, command: PluginCommand) -> Result<(), IrcError> {
-        server.send_notice(&command.source,
-                           "This Plugin does not implement any commands.")
+    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.",
+        )
+    }
+
+    fn evaluate(&self, _: &IrcClient, _: PluginCommand) -> Result<String, String> {
+        Err(String::from("This Plugin does not implement any commands."))
     }
 }