diff --git a/run.sh b/run.sh new file mode 100755 index 0000000..9151687 --- /dev/null +++ b/run.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +export $(cat .env | xargs) && cargo run diff --git a/src/main.rs b/src/main.rs index 610cc19..ed33e7b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,7 @@ mod commands; use poise::serenity_prelude::{self as serenity}; +use std::env::var; type Error = Box; @@ -16,12 +17,10 @@ async fn on_ready( serenity::ChannelId(865673694184996888).send_message(&ctx.http, |m| m.embed(|e| e.color(COLOR) .thumbnail(ready.user.avatar_url().unwrap_or_default()) - .author(|a| - a.name(format!("{} is ready!", ready.user.name)) - ) + .author(|a| a.name(format!("{} is ready!", ready.user.name))) )).await?; - let register_commands = std::env::var("REGISTER_CMDS").unwrap_or_else(|_| String::from("true")).parse::().unwrap_or(true); + let register_commands = var("REGISTER_CMDS").unwrap_or_else(|_| String::from("true")).parse::().unwrap_or(true); if register_commands { let builder = poise::builtins::create_application_commands(&framework.options().commands); @@ -31,11 +30,9 @@ async fn on_ready( }).await; match commands { - Ok(cmdmap) => { - for command in cmdmap.iter() { + Ok(cmdmap) => for command in cmdmap.iter() { println!("Registered command globally: {}", command.name); - } - }, + }, Err(why) => println!("Error registering commands: {:?}", why) } } @@ -45,7 +42,7 @@ async fn on_ready( #[tokio::main] async fn main() { - let token = std::env::var("DISCORD_TOKEN").expect("Expected a \"DISCORD_TOKEN\" in the envvar but none was found"); + let token = var("DISCORD_TOKEN").expect("Expected a \"DISCORD_TOKEN\" in the envvar but none was found"); let client = poise::Framework::builder().token(token) .intents(serenity::GatewayIntents::MESSAGE_CONTENT | serenity::GatewayIntents::GUILDS)