aboutsummaryrefslogtreecommitdiffstats
path: root/src/main.rs
diff options
context:
space:
mode:
authorJokler <jokler.contact@gmail.com>2018-02-25 18:54:16 +0100
committerJokler <jokler.contact@gmail.com>2018-02-25 18:54:16 +0100
commit92668ad4c53edcc1a317a16aa5ea30ca502f54ee (patch)
tree4a93dad53b06f2b4dccfaf0282e8e9ee94b3a070 /src/main.rs
parent76461addd2fb7ec383123b1efc4368b7662eea04 (diff)
downloadfrippy-92668ad4c53edcc1a317a16aa5ea30ca502f54ee.tar.gz
frippy-92668ad4c53edcc1a317a16aa5ea30ca502f54ee.zip
Add Mysql as a possible database to the Tell plugin
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/main.rs b/src/main.rs
index 511fe09..ec04d33 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,6 +19,8 @@ extern crate r2d2_diesel;
#[macro_use]
extern crate log;
+#[cfg(feature = "mysql")]
+use std::sync::Arc;
use std::collections::HashMap;
use log::{Level, LevelFilter, Metadata, Record};
@@ -115,7 +117,6 @@ fn main() {
bot.add_plugin(plugins::Emoji::new());
bot.add_plugin(plugins::Currency::new());
bot.add_plugin(plugins::KeepNick::new());
- bot.add_plugin(plugins::Tell::new());
#[cfg(feature = "mysql")]
{
@@ -130,11 +131,14 @@ fn main() {
.expect("Failed to get connection"))
{
Ok(_) => {
- bot.add_plugin(plugins::Factoids::new(pool));
+ let pool = Arc::new(pool);
+ bot.add_plugin(plugins::Factoids::new(pool.clone()));
+ bot.add_plugin(plugins::Tell::new(pool.clone()));
info!("Connected to MySQL server")
}
Err(e) => {
bot.add_plugin(plugins::Factoids::new(HashMap::new()));
+ bot.add_plugin(plugins::Tell::new(HashMap::new()));
error!("Failed to run migrations: {}", e);
}
},
@@ -142,6 +146,7 @@ fn main() {
}
} else {
bot.add_plugin(plugins::Factoids::new(HashMap::new()));
+ bot.add_plugin(plugins::Tell::new(HashMap::new()));
}
}
#[cfg(not(feature = "mysql"))]
@@ -150,6 +155,7 @@ fn main() {
error!("frippy was not built with the mysql feature")
}
bot.add_plugin(plugins::Factoids::new(HashMap::new()));
+ bot.add_plugin(plugins::Tell::new(HashMap::new()));
}
if let Some(disabled_plugins) = disabled_plugins {