From 6424a7a37ffe41a50506cace0d36248c16361a35 Mon Sep 17 00:00:00 2001
From: Adrian Malacoda <adrian.malacoda@monarch-pass.net>
Date: Mon, 13 Feb 2017 21:44:37 -0600
Subject: [PATCH] Remove unused imports, stub out send() for user and channel.

---
 src/lib.rs             | 14 +++++++++++++-
 src/plugins/discord.rs |  2 --
 src/plugins/echo.rs    |  9 ++++++---
 src/plugins/lua.rs     |  2 --
 src/plugins/mod.rs     |  7 +------
 src/plugins/stdin.rs   |  3 +--
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index bb21388..fc44215 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,7 +12,7 @@ mod event;
 use event::Event;
 
 use std::sync::mpsc;
-use std::sync::mpsc::{Sender, Receiver};
+use std::sync::mpsc::Sender;
 
 pub struct Tenquestionmarks {
     plugins: BTreeMap<String, Box<Plugin>>
@@ -84,7 +84,19 @@ pub struct Channel {
     topic: String
 }
 
+impl Channel {
+    pub fn send (&self, message: &str) {
+        println!("send to {:?}: {:?}", self.name, message);
+    }
+}
+
 #[derive(Debug, Clone)]
 pub struct User {
     name: String
 }
+
+impl User {
+    pub fn send (&self, message: &str) {
+        println!("send to {:?}: {:?}", self.name, message);
+    }
+}
diff --git a/src/plugins/discord.rs b/src/plugins/discord.rs
index 37dc31a..f1cbd14 100644
--- a/src/plugins/discord.rs
+++ b/src/plugins/discord.rs
@@ -1,8 +1,6 @@
 use plugins::Plugin;
 use toml::Table;
 
-use Tenquestionmarks;
-
 pub struct DiscordPlugin {
 
 }
diff --git a/src/plugins/echo.rs b/src/plugins/echo.rs
index b5cdda3..00a8057 100644
--- a/src/plugins/echo.rs
+++ b/src/plugins/echo.rs
@@ -26,10 +26,13 @@ impl Plugin for EchoPlugin {
             match receiver.recv() {
                 Ok(event) => {
                     match event {
-                        Event::Message { content: message, channel: channel, sender: sender } => {
+                        Event::Message { content: message, channel, sender } => {
                             if message.starts_with(self.prefix.as_str()) {
-                                let substring = String::from(&message[self.prefix.chars().count()..]);
-                                println!("Echo: {:?}", substring);
+                                let substring = &message[self.prefix.chars().count()..];
+                                match channel {
+                                    Some(channel) => channel.send(substring),
+                                    None => sender.send(substring)
+                                }
                             }
                         }
                         _ => ()
diff --git a/src/plugins/lua.rs b/src/plugins/lua.rs
index 92dc958..11edacb 100644
--- a/src/plugins/lua.rs
+++ b/src/plugins/lua.rs
@@ -1,8 +1,6 @@
 use plugins::Plugin;
 use toml::Table;
 
-use Tenquestionmarks;
-
 pub struct LuaPlugin {
 
 }
diff --git a/src/plugins/mod.rs b/src/plugins/mod.rs
index 854fe44..21a4b70 100644
--- a/src/plugins/mod.rs
+++ b/src/plugins/mod.rs
@@ -1,8 +1,3 @@
-use std::collections::HashMap;
-
-use toml::Value;
-use toml::Table;
-
 pub mod hello;
 pub mod lua;
 pub mod discord;
@@ -19,5 +14,5 @@ use std::sync::mpsc::{Sender, Receiver};
 pub trait Plugin : Sync {
     fn register (&self, tenquestionmarks: &Tenquestionmarks) {}
     fn consume_events (&self, receiver: Receiver<Event>) {}
-    fn produce_events (&self, sender: Sender<Event>) {}
+    fn produce_events<'a>(&'a self, sender: Sender<Event<'a>>) {}
 }
diff --git a/src/plugins/stdin.rs b/src/plugins/stdin.rs
index ffd8dd4..348eb76 100644
--- a/src/plugins/stdin.rs
+++ b/src/plugins/stdin.rs
@@ -3,7 +3,6 @@ use std::io;
 use plugins::Plugin;
 use toml::Table;
 
-use Tenquestionmarks;
 use User;
 
 use std::sync::mpsc::Sender;
@@ -24,7 +23,7 @@ impl StdinPlugin {
 }
 
 impl Plugin for StdinPlugin {
-    fn produce_events (&self, sender: Sender<Event>) {
+    fn produce_events<'a>(&'a self, sender: Sender<Event<'a>>) {
         let user = &self.user;
 
         loop {