Skynet/discord-bot
6
0
Fork 2
Code Issues 4 Pull requests Projects 1 Releases Packages Wiki Activity Actions

Merge branch 'main' of https://forgejo.skynet.ie/Skynet/discord-bot into new-member-message

Browse source
This commit is contained in:
esy 2024-09-17 08:24:27 +01:00
commit e7caf148dd
No known key found for this signature in database
6 changed files with 23 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
example.env Normal file
View file

@ -0,0 +1,8 @@
HOME="."
DATABASE="database.db"
DISCORD_TOKEN=""
DISCORD_TOKEN_MINECRAFT=""
EMAIL_SMTP=""
EMAIL_USER=""
EMAIL_PASS=""
WOLVES_URL=""

26
flake.nix
View file

@ -75,8 +75,6 @@
cfg = config.services."${package_name}";
# secret options are in the env file(s) loaded separately
environment_config = {
LDAP_API = cfg.ldap;
SKYNET_SERVER = cfg.discord.server;
HOME = cfg.home;
DATABASE = "database.db";
};
@ -97,7 +95,6 @@
Group = "${cfg.user}";
ExecStart = "${self.defaultPackage."${system}"}/bin/${script}";
EnvironmentFile = [
"${cfg.env.ldap}"
"${cfg.env.discord}"
"${cfg.env.mail}"
"${cfg.env.wolves}"
@ -133,13 +130,9 @@
enable = mkEnableOption "enable ${package_name}";
env = {
ldap = mkOption rec {
type = types.str;
description = "ENV file with LDAP_DISCORD_AUTH";
};
discord = mkOption rec {
type = types.str;
description = "ENV file with DISCORD_TOKEN, DISCORD_MINECRAFT";
description = "ENV file with DISCORD_TOKEN, DISCORD_TOKEN_MINECRAFT";
};
mail = mkOption rec {
type = types.str;
@ -147,23 +140,10 @@
};
wolves = mkOption rec {
type = types.str;
description = "Mail details, has WOLVES_URL, WOLVES_KEY";
description = "Mail details, has WOLVES_URL";
};
};
discord = {
server = mkOption rec {
type = types.str;
description = "ID of the server the bot runs on";
};
};
ldap = mkOption rec {
type = types.str;
default = "https://api.account.skynet.ie";
description = "Location of the ldap api";
};
user = mkOption rec {
type = types.str;
default = "${package_name}";
@ -211,14 +191,12 @@
ExecStart = "${self.defaultPackage."${system}"}/bin/${package_name}";
# can have multiple env files
EnvironmentFile = [
"${cfg.env.ldap}"
"${cfg.env.discord}"
"${cfg.env.mail}"
"${cfg.env.wolves}"
];
};
restartTriggers = [
"${cfg.env.ldap}"
"${cfg.env.discord}"
"${cfg.env.mail}"
"${cfg.env.wolves}"

2
rust-toolchain.toml
View file

@ -1,2 +1,2 @@
[toolchain]
channel = "1.80.1"
channel = "1.80"

2
src/bin/update_minecraft.rs
View file

@ -15,7 +15,7 @@ async fn main() {
for server in &servers {
// wipe whitelist first
if !wiped.contains(&server.minecraft) {
whitelist_wipe(&server.minecraft, &config.discord_minecraft).await;
whitelist_wipe(&server.minecraft, &config.discord_token_minecraft).await;
// add it to teh done list so its not done again
wiped.insert(&server.minecraft);
}

4
src/commands/minecraft.rs
View file

@ -73,7 +73,7 @@ pub(crate) mod user {
// get a list of servers that the user is a member of
if let Ok(servers) = get_servers(&db, &command.user.id).await {
for server in servers {
whitelist_update(&vec![username.to_string()], &server.minecraft, &config.discord_minecraft).await;
whitelist_update(&vec![username.to_string()], &server.minecraft, &config.discord_token_minecraft).await;
}
}
@ -236,7 +236,7 @@ pub(crate) mod server {
let mut result = "Server Information:\n".to_string();
for server in get_minecraft_config_server(&db, g_id).await {
if let Some(x) = server_information(&server.minecraft, &config.discord_minecraft).await {
if let Some(x) = server_information(&server.minecraft, &config.discord_token_minecraft).await {
result.push_str(&format!(
r#"
Name: {name}

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;
}
}