Skynet/discord-bot
7
0
Fork 2
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

feat: bump up rust version and a big cleanup
All checks were successful
On_Push / lint_fmt (push) Successful in 1m9s
Details
On_Push / lint_clippy (push) Successful in 4m4s
Details
On_Push / build (push) Successful in 10m16s
Details
On_Push / deploy (push) Successful in 12s
Details

Browse source 
Also added an example .env

This will break stuff (briefly)
This commit is contained in:
silver 2024-09-17 00:21:07 +01:00
parent 8ba92cc47e
commit 9452c0ac2e
Signed by: silver
GPG key ID: 36F93D61BAD3FD7D
7 changed files with 825 additions and 681 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/lib.rs
View file

@ -23,19 +23,20 @@ use std::{env, str::FromStr, sync::Arc};
use tokio::sync::RwLock;
pub struct Config {
pub skynet_server: GuildId,
pub ldap_api: String,
// manages where teh database is stored
pub home: String,
pub database: String,
pub auth: String,
// tokens for discord and other API's
pub discord_token: String,
pub discord_minecraft: String,
pub discord_token_minecraft: String,
// email settings
pub mail_smtp: String,
pub mail_user: String,
pub mail_pass: String,
// wolves API base for clubs/socs
pub wolves_url: String,
}
impl TypeMapKey for Config {
@ -52,11 +53,8 @@ pub fn get_config() -> Config {
// reasonable defaults
let mut config = Config {
skynet_server: Default::default(),
ldap_api: "https://api.account.skynet.ie".to_string(),
auth: "".to_string(),
discord_token: "".to_string(),
discord_minecraft: "".to_string(),
discord_token_minecraft: "".to_string(),
home: ".".to_string(),
database: "database.db".to_string(),
@ -67,12 +65,6 @@ pub fn get_config() -> Config {
wolves_url: "".to_string(),
};
if let Ok(x) = env::var("LDAP_API") {
config.ldap_api = x.trim().to_string();
}
if let Ok(x) = env::var("SKYNET_SERVER") {
config.skynet_server = GuildId::from(str_to_num::<u64>(&x));
}
if let Ok(x) = env::var("HOME") {
config.home = x.trim().to_string();
}
@ -80,15 +72,11 @@ pub fn get_config() -> Config {
config.database = x.trim().to_string();
}
if let Ok(x) = env::var("LDAP_DISCORD_AUTH") {
config.auth = x.trim().to_string();
}
if let Ok(x) = env::var("DISCORD_TOKEN") {
config.discord_token = x.trim().to_string();
}
if let Ok(x) = env::var("DISCORD_MINECRAFT") {
config.discord_minecraft = x.trim().to_string();
if let Ok(x) = env::var("DISCORD_TOKEN_MINECRAFT") {
config.discord_token_minecraft = x.trim().to_string();
}
if let Ok(x) = env::var("EMAIL_SMTP") {
@ -108,10 +96,6 @@ pub fn get_config() -> Config {
config
}
fn str_to_num<T: FromStr + Default>(x: &str) -> T {
x.trim().parse::<T>().unwrap_or_default()
}
#[derive(Debug, Clone, Deserialize, Serialize)]
pub struct ServerMembers {
pub server: GuildId,
@ -727,7 +711,7 @@ pub async fn update_server(server_id: &str, db: &Pool<Sqlite>, g_id: &GuildId, c
}
}
if !usernames.is_empty() {
whitelist_update(&usernames, server_id, &config.discord_minecraft).await;
whitelist_update(&usernames, server_id, &config.discord_token_minecraft).await;
}
}