reduced ai timeout, impl uptime

This commit is contained in:
2024-08-04 21:26:45 +02:00
parent d0af34833b
commit f224ccfbdf
6 changed files with 52 additions and 28 deletions

1
Cargo.lock generated
View File

@@ -1355,6 +1355,7 @@ dependencies = [
"fancy-regex", "fancy-regex",
"json", "json",
"lib-spotify-parser", "lib-spotify-parser",
"once_cell",
"openssl", "openssl",
"owoify", "owoify",
"poise", "poise",

View File

@@ -44,3 +44,4 @@ tracing = "0.1.40"
tracing-futures = "0.2.5" tracing-futures = "0.2.5"
tracing-subscriber = "0.3.18" tracing-subscriber = "0.3.18"
url = "2.5.2" url = "2.5.2"
once_cell = "1.19.0"

View File

@@ -10,7 +10,7 @@ pub mod posix;
pub mod qr; pub mod qr;
pub mod register; pub mod register;
pub mod taf; pub mod taf;
// pub mod uptime; pub mod uptime;
pub mod verse; pub mod verse;
pub mod weather; pub mod weather;
@@ -26,6 +26,6 @@ pub use posix::posix;
pub use qr::qr; pub use qr::qr;
pub use register::register; pub use register::register;
pub use taf::taf; pub use taf::taf;
// pub use uptime::uptime; pub use uptime::uptime;
pub use verse::verse; pub use verse::verse;
pub use weather::weather; pub use weather::weather;

View File

@@ -35,7 +35,7 @@ pub async fn ai(
response = rng.gen_range(0..iamsorry.len()); response = rng.gen_range(0..iamsorry.len());
}; };
sleep(Duration::from_secs(3)); sleep(Duration::from_secs(1));
ctx.send( ctx.send(
CreateReply::default().embed( CreateReply::default().embed(

View File

@@ -1,34 +1,47 @@
use once_cell::sync::Lazy;
use poise::CreateReply; use poise::CreateReply;
use std::sync::Mutex;
use crate::{commands::embeds::embed, Context, Error}; use crate::{commands::embeds::embed, Context, Error};
// Currently unable to get information on how long the thread was running. pub static PROCESS_UPTIME: Lazy<Mutex<std::time::SystemTime>> =
const PROCESS_UPTIME: i64 = 1000; Lazy::new(|| Mutex::new(std::time::SystemTime::now()));
/// Checks how long the bot has been running /// Checks how long the bot has been running
#[poise::command(prefix_command, slash_command, category = "Tools")] #[poise::command(prefix_command, slash_command, category = "Tools")]
pub async fn uptime(ctx: Context<'_>) -> Result<(), Error> { pub async fn uptime(ctx: Context<'_>) -> Result<(), Error> {
let uptime = PROCESS_UPTIME; let start = PROCESS_UPTIME.lock().unwrap().clone();
let days = uptime / (24 * 60 * 60); let uptime = std::time::SystemTime::now().duration_since(start).unwrap();
let hours = (uptime % (24 * 60 * 60)) / 3600;
let minutes = (uptime % 60 * 60) / 60;
let seconds = uptime % 60;
ctx.send( let (days, hours, minutes, seconds) = (
CreateReply::default().embed( uptime.as_secs() / 86400,
embed( (uptime.as_secs() / 3600) % 24,
ctx, (uptime.as_secs() / 60) % 60,
"I have been up and awake for", uptime.as_secs() % 60,
&format!("{} seconds", uptime), );
&format!(
"{} days, {} hours, {} minutes and {} seconds", let mut message = format!(
"I have been awake for {} days, {} hours, {} minutes and {} seconds!",
days, hours, minutes, seconds days, hours, minutes, seconds
), );
)
.await if days != 0 {
.unwrap(), message = format!("I have been awake for {} days!", days);
), }
)
if days == 0 && hours != 0 {
message = format!("I have been awake for {} hours!", hours);
}
if days == 0 && hours == 0 && minutes != 0 {
message = format!("I have been awake for {} minutes!", minutes);
}
if days == 0 && hours == 0 && minutes == 0 && seconds != 0 {
message = format!("I have been awake for {} seconds!", seconds);
}
ctx.send(CreateReply::default().embed(embed(ctx, "Uptime", "", &message).await.unwrap()))
.await?; .await?;
Ok(()) Ok(())

View File

@@ -1,3 +1,4 @@
use commands::tools::uptime::PROCESS_UPTIME;
use poise::serenity_prelude::{self as serenity, ActivityData}; use poise::serenity_prelude::{self as serenity, ActivityData};
use reqwest::Client as HttpClient; use reqwest::Client as HttpClient;
use songbird::SerenityInit; use songbird::SerenityInit;
@@ -37,6 +38,8 @@ async fn main() {
tracing_subscriber::fmt::init(); tracing_subscriber::fmt::init();
dotenv::dotenv().expect("Failed to load .env file."); dotenv::dotenv().expect("Failed to load .env file.");
let _ = PROCESS_UPTIME.lock().unwrap().clone();
let token = let token =
std::env::var("DISCORD_TOKEN").expect("Environment variable `DISCORD_TOKEN` not found!"); std::env::var("DISCORD_TOKEN").expect("Environment variable `DISCORD_TOKEN` not found!");
let prefix = std::env::var("PREFIX").expect("Environment variable `PREFIX` not found!"); let prefix = std::env::var("PREFIX").expect("Environment variable `PREFIX` not found!");
@@ -70,7 +73,7 @@ async fn main() {
tools::qr(), tools::qr(),
tools::register(), tools::register(),
tools::taf(), tools::taf(),
// tools::uptime(), tools::uptime(),
tools::verse(), tools::verse(),
tools::weather(), tools::weather(),
]; ];
@@ -123,7 +126,7 @@ async fn main() {
}; };
let framework = poise::Framework::builder() let framework = poise::Framework::builder()
.setup(move |ctx, ready, _framework| { .setup(move |ctx, ready, framework| {
Box::pin(async move { Box::pin(async move {
info!( info!(
"{} [{}] connected successfully!", "{} [{}] connected successfully!",
@@ -131,6 +134,12 @@ async fn main() {
); );
ctx.set_activity(Some(ActivityData::listening(prefix + "help"))); ctx.set_activity(Some(ActivityData::listening(prefix + "help")));
// poise::builtins::register_globally(ctx, &framework.options().commands).await?; // poise::builtins::register_globally(ctx, &framework.options().commands).await?;
poise::builtins::register_in_guild(
ctx,
&framework.options().commands,
512680330495524873.into(),
)
.await?;
Ok(Data {}) Ok(Data {})
}) })