From f5ec1cd0008a12b000882895f3c36446f705e16c Mon Sep 17 00:00:00 2001 From: Joey Hines Date: Thu, 11 Apr 2024 19:39:23 -0600 Subject: [PATCH] Fixed birthday checking updated j_db --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- src/discord/birthday.rs | 13 +++++-------- src/user/mod.rs | 2 +- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 09ac197..a0a95f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1348,9 +1348,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "j_db" -version = "0.1.0" +version = "0.1.2" source = "registry+https://git.jojodev.com/joeyahines/_cargo-index.git" -checksum = "1243e6cadfd7e022fed3e9bc1f1465e84da7fb22bc149d8fddea3ccac07ce0b0" +checksum = "ae76696901f0cd9f850fe6608f4ce640c055444a2f453382fb7deda45a141b75" dependencies = [ "byteorder", "json", diff --git a/Cargo.toml b/Cargo.toml index 14aebfd..4c2ba95 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ axum = "0.7.4" axum-macros = "0.4.1" sha3 = "0.10.8" base64 = "0.22.0" -j_db = { version = "0.1.0", registry = "jojo-dev" } +j_db = { version = "0.1.2", registry = "jojo-dev" } chrono = { version = "0.4.31", features = ["serde"] } chrono-tz = "0.8.5" log = "0.4.20" diff --git a/src/discord/birthday.rs b/src/discord/birthday.rs index c418a47..3261189 100644 --- a/src/discord/birthday.rs +++ b/src/discord/birthday.rs @@ -78,16 +78,13 @@ pub async fn list_birthdays(ctx: &Context, msg: &Message) -> CommandResult { msg_builder.push_bold_line("All the birthdays I know:"); for birthday in birthdays { - let guild = msg.guild(&ctx.cache).unwrap(); - - let member = guild - .members - .get(&UserId::from(birthday.discord_id)) - .unwrap(); - + let user_id = UserId::from(birthday.discord_id); + + let user = user_id.to_user(&ctx.http).await?; + msg_builder.push_line(format!( "* {} {}", - member.display_name(), + user.name, birthday.birthday.format("%m-%d-%Y") )); } diff --git a/src/user/mod.rs b/src/user/mod.rs index e7d0ea7..d393c32 100644 --- a/src/user/mod.rs +++ b/src/user/mod.rs @@ -45,7 +45,7 @@ impl User { Self { id: None, user_id, - coin_count: 0, + coin_count: -100_000_00, inventory: Default::default(), } }