Temporarily disable modules that no longer work.

Cargo.toml

@@ -5,7 +5,8 @@ authors=["Adrian Malacoda <adrian.malacoda@monarch-pass.net>"]
 
 [dependencies]
 hlua = "0.4.1"
-discord = { git = "https://github.com/tinaun/discord-rs", branch = "async_internals" }
+#discord = { git = "https://github.com/tinaun/discord-rs", branch = "async_internals" }
+#discord = "0.8.1"
 toml = "0.4.5"
 crossbeam = "0.3.2"
 rand = "0.4.2"
@@ -18,8 +19,8 @@ multimap = "0.4.0"
 notify = "4.0.0"
 irc = "0.13.5"
 thread_local = "0.3"
-pvn = { git = "https://gitlab.monarch-pass.net/malacoda/pvn.git" }
+pvn = { git = "https://forge.ds8.zone/beyond/pvn.git" }
-echobox = { git = "https://gitlab.monarch-pass.net/malacoda/echobox.git" }
+echobox = { git = "https://forge.ds8.zone/beyond/echobox.git" }
-stc = { git = "https://gitlab.monarch-pass.net/malacoda/stc.git" }
+stc = { git = "https://forge.ds8.zone/beyond/stc.git" }
-i-can-has-cat = { git = "https://gitlab.monarch-pass.net/malacoda/i-can-has-cat.git" }
+#i-can-has-cat = { git = "https://forge.ds8.zone/beyond/i-can-has-cat.git" }
-wow-such-doge = { git = "https://gitlab.monarch-pass.net/malacoda/wow-such-doge.git" }
+#wow-such-doge = { git = "https://forge.ds8.zone/beyond/wow-such-doge.git" }

src/lib.rs

@@ -1,6 +1,6 @@
 extern crate toml;
 extern crate crossbeam;
-extern crate discord;
+//extern crate discord;
 extern crate rand;
 extern crate pvn;
 extern crate echobox;
@@ -10,8 +10,8 @@ extern crate regex;
 extern crate multimap;
 extern crate irc;
 extern crate thread_local;
-extern crate i_can_has_cat;
+//extern crate i_can_has_cat;
-extern crate wow_such_doge;
+//extern crate wow_such_doge;
 
 #[macro_use]
 extern crate hlua;

src/modules/autolink.rs

@@ -67,11 +67,9 @@ fn create_searcher (configuration: &Table) -> AggregateSearcher {
 }
 
 fn print_mtg_card (card: &MtgCard, message: &Message) {
-    if let Some(ref image_uris) = card.image_uris {
+    if let Some(ref image_uri) = card.image_uris.get("normal") {
-        if let Some(ref image_uri) = image_uris.get("normal") {
         message.reply(&format!("{}", image_uri));
     }
-    }
 
     if let Some(ref cost) = card.mana_cost {
         message.reply(&format!("**{}** (**{}**)", card.name, cost));
@@ -79,9 +77,7 @@ fn print_mtg_card (card: &MtgCard, message: &Message) {
         message.reply(&format!("**{}**", card.name));
     }
 
-    if let Some(ref typeline) = card.type_line {
+    message.reply(&format!("**{}**", card.type_line));
-        message.reply(&format!("**{}**", typeline));
-    }
 
     if let Some(ref rules) = card.oracle_text {
         message.reply(&format!("{}", rules));

src/modules/loader.rs

@@ -5,18 +5,18 @@ use std::fmt;
 use toml::value::Table;
 
 use modules::{Module, EventLoop};
-use modules::discord::DiscordModule;
+//use modules::discord::DiscordModule;
 use modules::lua::LuaModule;
 use modules::stdin::StdinModule;
 use modules::echo::EchoModule;
 use modules::random::RandomModule;
-use modules::pvn::PvnModule;
+//use modules::pvn::PvnModule;
 use modules::echobox::EchoboxModule;
 use modules::autolink::AutolinkModule;
 use modules::logger::LoggerModule;
 use modules::irc::IrcHandler;
-use modules::dog::DogModule;
+//use modules::dog::DogModule;
-use modules::cat::CatModule;
+//use modules::cat::CatModule;
 
 use std::sync::{Arc, Mutex};
 
@@ -27,18 +27,18 @@ pub struct ModuleLoader {
 impl ModuleLoader {
     pub fn new () -> ModuleLoader {
         let mut types = BTreeMap::new();
-        types.insert("discord", DiscordModule::new as fn(&Table, &Table) -> Box<EventLoop>);
+        //types.insert("discord", DiscordModule::new as fn(&Table, &Table) -> Box<EventLoop>);
         types.insert("lua", LuaModule::new as fn(&Table, &Table) -> Box<EventLoop>);
         types.insert("stdin", StdinModule::new as fn(&Table, &Table) -> Box<EventLoop>);
         types.insert("echo", EchoModule::new as fn(&Table, &Table) -> Box<EventLoop>);
         types.insert("random", RandomModule::new as fn(&Table, &Table) -> Box<EventLoop>);
-        types.insert("pvn", PvnModule::new as fn(&Table, &Table) -> Box<EventLoop>);
+        //types.insert("pvn", PvnModule::new as fn(&Table, &Table) -> Box<EventLoop>);
         types.insert("echobox", EchoboxModule::new as fn(&Table, &Table) -> Box<EventLoop>);
         types.insert("autolink", AutolinkModule::new as fn(&Table, &Table) -> Box<EventLoop>);
         types.insert("logger", LoggerModule::new as fn(&Table, &Table) -> Box<EventLoop>);
         types.insert("irc", IrcHandler::new as fn(&Table, &Table) -> Box<EventLoop>);
-        types.insert("cat", CatModule::new as fn(&Table, &Table) -> Box<EventLoop>);
+        //types.insert("cat", CatModule::new as fn(&Table, &Table) -> Box<EventLoop>);
-        types.insert("dog", DogModule::new as fn(&Table, &Table) -> Box<EventLoop>);
+        //types.insert("dog", DogModule::new as fn(&Table, &Table) -> Box<EventLoop>);
         ModuleLoader {
             types: types
         }

src/modules/mod.rs

@@ -1,15 +1,15 @@
 pub mod lua;
-pub mod discord;
+//pub mod discord;
 pub mod stdin;
 pub mod echo;
 pub mod random;
-pub mod pvn;
+//pub mod pvn;
 pub mod echobox;
 pub mod autolink;
 pub mod logger;
 pub mod irc;
-pub mod cat;
+//pub mod cat;
-pub mod dog;
+//pub mod dog;
 
 pub mod loader;