From 496ba89d945d66abe55eb859a0183025c60fb332 Mon Sep 17 00:00:00 2001 From: Captain Beyond Date: Mon, 13 Mar 2023 00:21:50 -0500 Subject: [PATCH] Temporarily disable modules that no longer work. --- Cargo.toml | 13 +++++++------ README.md | 0 TODO.md | 0 lua/dailies.lua | 0 src/event/filter.rs | 0 src/event/mod.rs | 0 src/helpers/command.rs | 0 src/helpers/config.rs | 0 src/helpers/mod.rs | 0 src/lib.rs | 6 +++--- src/main.rs | 0 src/modules/autolink.rs | 10 +++------- src/modules/cat.rs | 0 src/modules/discord.rs | 0 src/modules/dog.rs | 0 src/modules/echo.rs | 0 src/modules/echobox.rs | 0 src/modules/irc.rs | 0 src/modules/loader.rs | 16 ++++++++-------- src/modules/logger.rs | 0 src/modules/lua.rs | 0 src/modules/mod.rs | 8 ++++---- src/modules/pvn.rs | 0 src/modules/random.rs | 0 src/modules/stdin.rs | 0 tenquestionmarks.toml | 0 26 files changed, 25 insertions(+), 28 deletions(-) mode change 100644 => 100755 README.md mode change 100644 => 100755 TODO.md mode change 100644 => 100755 lua/dailies.lua mode change 100644 => 100755 src/event/filter.rs mode change 100644 => 100755 src/event/mod.rs mode change 100644 => 100755 src/helpers/command.rs mode change 100644 => 100755 src/helpers/config.rs mode change 100644 => 100755 src/helpers/mod.rs mode change 100644 => 100755 src/lib.rs mode change 100644 => 100755 src/main.rs mode change 100644 => 100755 src/modules/autolink.rs mode change 100644 => 100755 src/modules/cat.rs mode change 100644 => 100755 src/modules/discord.rs mode change 100644 => 100755 src/modules/dog.rs mode change 100644 => 100755 src/modules/echo.rs mode change 100644 => 100755 src/modules/echobox.rs mode change 100644 => 100755 src/modules/irc.rs mode change 100644 => 100755 src/modules/loader.rs mode change 100644 => 100755 src/modules/logger.rs mode change 100644 => 100755 src/modules/lua.rs mode change 100644 => 100755 src/modules/mod.rs mode change 100644 => 100755 src/modules/pvn.rs mode change 100644 => 100755 src/modules/random.rs mode change 100644 => 100755 src/modules/stdin.rs mode change 100644 => 100755 tenquestionmarks.toml diff --git a/Cargo.toml b/Cargo.toml index 32dc26e..5fd71a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,8 @@ authors=["Adrian Malacoda "] [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" } -echobox = { git = "https://gitlab.monarch-pass.net/malacoda/echobox.git" } -stc = { git = "https://gitlab.monarch-pass.net/malacoda/stc.git" } -i-can-has-cat = { git = "https://gitlab.monarch-pass.net/malacoda/i-can-has-cat.git" } -wow-such-doge = { git = "https://gitlab.monarch-pass.net/malacoda/wow-such-doge.git" } +pvn = { git = "https://forge.ds8.zone/beyond/pvn.git" } +echobox = { git = "https://forge.ds8.zone/beyond/echobox.git" } +stc = { git = "https://forge.ds8.zone/beyond/stc.git" } +#i-can-has-cat = { git = "https://forge.ds8.zone/beyond/i-can-has-cat.git" } +#wow-such-doge = { git = "https://forge.ds8.zone/beyond/wow-such-doge.git" } diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/TODO.md b/TODO.md old mode 100644 new mode 100755 diff --git a/lua/dailies.lua b/lua/dailies.lua old mode 100644 new mode 100755 diff --git a/src/event/filter.rs b/src/event/filter.rs old mode 100644 new mode 100755 diff --git a/src/event/mod.rs b/src/event/mod.rs old mode 100644 new mode 100755 diff --git a/src/helpers/command.rs b/src/helpers/command.rs old mode 100644 new mode 100755 diff --git a/src/helpers/config.rs b/src/helpers/config.rs old mode 100644 new mode 100755 diff --git a/src/helpers/mod.rs b/src/helpers/mod.rs old mode 100644 new mode 100755 diff --git a/src/lib.rs b/src/lib.rs old mode 100644 new mode 100755 index 11eccf3..bf881f0 --- a/src/lib.rs +++ b/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 wow_such_doge; +//extern crate i_can_has_cat; +//extern crate wow_such_doge; #[macro_use] extern crate hlua; diff --git a/src/main.rs b/src/main.rs old mode 100644 new mode 100755 diff --git a/src/modules/autolink.rs b/src/modules/autolink.rs old mode 100644 new mode 100755 index fde4989..2cd596d --- a/src/modules/autolink.rs +++ b/src/modules/autolink.rs @@ -67,10 +67,8 @@ 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) = image_uris.get("normal") { - message.reply(&format!("{}", image_uri)); - } + if let Some(ref image_uri) = card.image_uris.get("normal") { + message.reply(&format!("{}", image_uri)); } if let Some(ref cost) = card.mana_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!("**{}**", typeline)); - } + message.reply(&format!("**{}**", card.type_line)); if let Some(ref rules) = card.oracle_text { message.reply(&format!("{}", rules)); diff --git a/src/modules/cat.rs b/src/modules/cat.rs old mode 100644 new mode 100755 diff --git a/src/modules/discord.rs b/src/modules/discord.rs old mode 100644 new mode 100755 diff --git a/src/modules/dog.rs b/src/modules/dog.rs old mode 100644 new mode 100755 diff --git a/src/modules/echo.rs b/src/modules/echo.rs old mode 100644 new mode 100755 diff --git a/src/modules/echobox.rs b/src/modules/echobox.rs old mode 100644 new mode 100755 diff --git a/src/modules/irc.rs b/src/modules/irc.rs old mode 100644 new mode 100755 diff --git a/src/modules/loader.rs b/src/modules/loader.rs old mode 100644 new mode 100755 index de29bf7..4e5a5a2 --- a/src/modules/loader.rs +++ b/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::cat::CatModule; +//use modules::dog::DogModule; +//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); + //types.insert("discord", DiscordModule::new as fn(&Table, &Table) -> Box); types.insert("lua", LuaModule::new as fn(&Table, &Table) -> Box); types.insert("stdin", StdinModule::new as fn(&Table, &Table) -> Box); types.insert("echo", EchoModule::new as fn(&Table, &Table) -> Box); types.insert("random", RandomModule::new as fn(&Table, &Table) -> Box); - types.insert("pvn", PvnModule::new as fn(&Table, &Table) -> Box); + //types.insert("pvn", PvnModule::new as fn(&Table, &Table) -> Box); types.insert("echobox", EchoboxModule::new as fn(&Table, &Table) -> Box); types.insert("autolink", AutolinkModule::new as fn(&Table, &Table) -> Box); types.insert("logger", LoggerModule::new as fn(&Table, &Table) -> Box); types.insert("irc", IrcHandler::new as fn(&Table, &Table) -> Box); - types.insert("cat", CatModule::new as fn(&Table, &Table) -> Box); - types.insert("dog", DogModule::new as fn(&Table, &Table) -> Box); + //types.insert("cat", CatModule::new as fn(&Table, &Table) -> Box); + //types.insert("dog", DogModule::new as fn(&Table, &Table) -> Box); ModuleLoader { types: types } diff --git a/src/modules/logger.rs b/src/modules/logger.rs old mode 100644 new mode 100755 diff --git a/src/modules/lua.rs b/src/modules/lua.rs old mode 100644 new mode 100755 diff --git a/src/modules/mod.rs b/src/modules/mod.rs old mode 100644 new mode 100755 index 7d67a4b..a816470 --- a/src/modules/mod.rs +++ b/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 dog; +//pub mod cat; +//pub mod dog; pub mod loader; diff --git a/src/modules/pvn.rs b/src/modules/pvn.rs old mode 100644 new mode 100755 diff --git a/src/modules/random.rs b/src/modules/random.rs old mode 100644 new mode 100755 diff --git a/src/modules/stdin.rs b/src/modules/stdin.rs old mode 100644 new mode 100755 diff --git a/tenquestionmarks.toml b/tenquestionmarks.toml old mode 100644 new mode 100755