Merge pull request #3 from c-git/develop

c-git · web-flow · commit ed778e7657d8 · 2025-07-11T21:44:27.000-04:00
0.6.3
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bazooka-bot"
-version = "0.6.1"
-edition = "2021"
+version = "0.6.2"
+edition = "2024"
 publish = false
 
 [dependencies]
@@ -11,9 +11,9 @@ poise = "0.6.1"
 secrecy = "0.10.3"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
-shuttle-runtime = { version = "0.53.0", default-features = false }
-shuttle-serenity = "0.53.0" # Since poise is a serenity command framework, it can run on Shuttle with shuttle-serenity
-shuttle-shared-db = { version = "0.53.0", default-features = false, features = ["sqlx", "postgres"] }
+shuttle-runtime = { version = "0.56.0", default-features = false }
+shuttle-serenity = "0.56.0" # Since poise is a serenity command framework, it can run on Shuttle with shuttle-serenity
+shuttle-shared-db = { version = "0.56.0", default-features = false, features = ["sqlx", "postgres"] }
 sqlx = { version = "0.8.5", default-features = false, features = ["postgres", "runtime-tokio-rustls"] }
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
diff --git a/scripts/init_db.sh b/scripts/init_db.sh
@@ -72,6 +72,6 @@ fi
 # Create the application database
 export DATABASE_URL=postgres://${APP_USER}:${APP_USER_PWD}@localhost:${DB_PORT}/${APP_DB_NAME}
 sqlx database create
-sqlx migrate run --source migrations_pg
+sqlx migrate run --source migrations
 
 >&2 echo "Postgres has been migrated, ready to go!"
diff --git a/src/commands.rs b/src/commands.rs
@@ -4,12 +4,12 @@ use poise::serenity_prelude::Mentionable;
 use tracing::{error, info, instrument, warn};
 
 use crate::{
+    AuthorPreferredDisplay as _, Context, Data,
     commands::{
         general::{help, ping, register, uptime},
         schedule::schedule,
         unranked_cmd::unranked,
     },
-    AuthorPreferredDisplay as _, Context, Data,
 };
 pub use unranked_cmd::do_start_event;
 mod general;
diff --git a/src/commands/general.rs b/src/commands/general.rs
@@ -4,8 +4,8 @@ use human_time::ToHumanTimeString as _;
 use tracing::{info, instrument};
 
 use crate::{
-    commands::{tracing_handler_end, tracing_handler_start},
     Context,
+    commands::{tracing_handler_end, tracing_handler_start},
 };
 
 /// Responds with "pong"
@@ -53,7 +53,9 @@ pub async fn uptime(ctx: Context<'_>) -> anyhow::Result<()> {
 #[instrument(name = "help", skip(ctx))]
 pub async fn help(
     ctx: Context<'_>,
-    #[description = "Specific command to show help about"] command: Option<String>,
+    #[description = "Specific command to show help about"]
+    #[autocomplete = "poise::builtins::autocomplete_command"]
+    command: Option<String>,
 ) -> anyhow::Result<()> {
     tracing_handler_start(&ctx).await;
     let config = Default::default();
diff --git a/src/commands/schedule.rs b/src/commands/schedule.rs
@@ -2,15 +2,15 @@
 
 use std::num::NonZeroUsize;
 
-use poise::{serenity_prelude::CreateEmbed, CreateReply};
+use poise::{CreateReply, serenity_prelude::CreateEmbed};
 use tracing::{info, instrument};
 
 use crate::{
+    Context,
     commands::{call_to_parent_command, is_auth, tracing_handler_end, tracing_handler_start},
     model::schedule::{
         Objective, OutcomeCreateScheduledTask, ScheduledTaskId, ScheduledTasks, UnixTimestamp,
     },
-    Context,
 };
 
 #[poise::command(
diff --git a/src/commands/unranked_cmd.rs b/src/commands/unranked_cmd.rs
@@ -5,14 +5,14 @@ use tracing::{info, instrument};
 
 use self::{idea::idea, score::score};
 use crate::{
+    Context, Data,
     commands::{
         call_to_parent_command, is_auth, tracing_handler_end, tracing_handler_start,
         unranked_cmd::{
             idea::{display_ideas_channel, do_ideas_reset},
             score::{display_scores_channel, do_scores_reset},
         },
     },
-    Context, Data,
 };
 
 mod idea;
diff --git a/src/commands/unranked_cmd/idea.rs b/src/commands/unranked_cmd/idea.rs
@@ -3,20 +3,21 @@
 use std::{fmt::Debug, num::NonZeroUsize};
 
 use poise::{
-    serenity_prelude::{CacheHttp, ChannelId, CreateEmbed, CreateMessage},
     CreateReply,
+    serenity_prelude::{CacheHttp, ChannelId, CreateEmbed, CreateMessage},
 };
 use tracing::{info, instrument};
 
 use crate::{
+    Data,
     commands::{
-        call_to_parent_command, is_auth, tracing_handler_end, tracing_handler_start, Context,
+        Context, call_to_parent_command, is_auth, tracing_handler_end, tracing_handler_start,
     },
     model::{
         unranked::ideas::{IdeaId, Ideas},
         user_serde::UserRecordSupport as _,
     },
-    sanitize_markdown, Data,
+    sanitize_markdown,
 };
 
 #[poise::command(
diff --git a/src/commands/unranked_cmd/score.rs b/src/commands/unranked_cmd/score.rs
@@ -1,16 +1,17 @@
 //! Groups the commands related to the scoring functionality for unranked
 
 use crate::{
+    Context, Data,
     commands::{is_auth, tracing_handler_end, tracing_handler_start},
     model::{
         unranked::scores::{ScoreValue, Scores},
         user_serde::UserRecordSupport as _,
     },
-    sanitize_markdown, Context, Data,
+    sanitize_markdown,
 };
 use poise::{
-    serenity_prelude::{CacheHttp, ChannelId, CreateEmbed, CreateMessage},
     CreateReply,
+    serenity_prelude::{CacheHttp, ChannelId, CreateEmbed, CreateMessage},
 };
 use std::fmt::Debug;
 use tracing::{info, instrument};
diff --git a/src/config.rs b/src/config.rs
@@ -2,7 +2,7 @@ use std::{collections::HashSet, fmt::Debug, time::Instant};
 
 use anyhow::Context as _;
 use poise::serenity_prelude::{ChannelId, GuildId, RoleId, UserId};
-use shuttle_runtime::{tokio, SecretStore};
+use shuttle_runtime::{SecretStore, tokio};
 use tracing::{error, info};
 
 use crate::secrets::KeyName;
diff --git a/src/main.rs b/src/main.rs
@@ -1,15 +1,15 @@
 use anyhow::Context as _;
-use bazooka_bot::{commands_list, get_secret_discord_token, Data, SharedConfig, StartupConfig};
+use bazooka_bot::{Data, SharedConfig, StartupConfig, commands_list, get_secret_discord_token};
 use poise::serenity_prelude::{ClientBuilder, GatewayIntents};
 use secrecy::ExposeSecret;
 use shuttle_runtime::SecretStore;
 use shuttle_serenity::ShuttleSerenity;
 use std::sync::Arc;
 use tracing::{error, info, warn};
 use tracing_subscriber::{
+    EnvFilter,
     fmt::{self, format::FmtSpan},
     prelude::*,
-    EnvFilter,
 };
 use version::version;
 
@@ -22,7 +22,7 @@ async fn main(
     db_pool: sqlx::PgPool,
 ) -> ShuttleSerenity {
     tracing_subscriber::registry()
-        .with(fmt::layer().with_span_events(FmtSpan::ACTIVE))
+        .with(fmt::layer().with_span_events(FmtSpan::NEW | FmtSpan::CLOSE))
         .with(
             EnvFilter::try_from_default_env()
                 .unwrap_or_else(|_| EnvFilter::new("zbus=warn,serenity=warn,info")),
diff --git a/src/model/schedule.rs b/src/model/schedule.rs
@@ -1,6 +1,6 @@
 use super::one_based_id::OneBasedId;
-use crate::{commands::do_start_event, Data};
-use anyhow::{bail, Context};
+use crate::{Data, commands::do_start_event};
+use anyhow::{Context, bail};
 use human_time::ToHumanTimeString;
 use shuttle_runtime::tokio::{self, task::JoinHandle};
 use std::{
@@ -208,9 +208,9 @@ impl ScheduledTasks {
                 Ok(_) => (),
                 Err(e) => {
                     error!(
-                            "Removing task with objective {} because failed to hydrate with error: {e:?}",
-                            self.data[i].objective
-                        );
+                        "Removing task with objective {} because failed to hydrate with error: {e:?}",
+                        self.data[i].objective
+                    );
                     self.data.remove(i);
                 }
             };
diff --git a/src/model/unranked/ideas.rs b/src/model/unranked/ideas.rs
@@ -2,7 +2,7 @@ use crate::{
     config::SharedConfig,
     model::{one_based_id::OneBasedId, user_serde::UserIdNumber},
 };
-use anyhow::{bail, Context as _};
+use anyhow::{Context as _, bail};
 use poise::serenity_prelude::CacheHttp;
 use std::fmt::Display;
 use tracing::{info, warn};
@@ -59,11 +59,7 @@ impl Idea {
     fn change_vote(&mut self, user_id_number: UserIdNumber, is_add_vote: bool) -> bool {
         let user_number: UserIdNumber = user_id_number;
         let position = self.voters.iter().enumerate().find_map(|(i, voter)| {
-            if &user_number == voter {
-                Some(i)
-            } else {
-                None
-            }
+            if &user_number == voter { Some(i) } else { None }
         });
         match (position, is_add_vote) {
             (None, false) | (Some(_), true) => {
diff --git a/src/model/unranked/scores.rs b/src/model/unranked/scores.rs
@@ -4,9 +4,9 @@ use anyhow::bail;
 use tracing::{error, info};
 
 use crate::{
+    RemoveElement as _, Resettable,
     config::SharedConfig,
     model::user_serde::{UserIdNumber, UserName, UserRecord},
-    RemoveElement as _, Resettable,
 };
 
 pub mod protected_ops;
diff --git a/src/model/unranked/scores/protected_ops.rs b/src/model/unranked/scores/protected_ops.rs
@@ -4,11 +4,11 @@
 use std::sync::MutexGuard;
 
 use crate::{
+    Resettable as _,
     model::{
         unranked::Unranked,
         user_serde::{UserIdNumber, UserRecord},
     },
-    Resettable as _,
 };
 
 use super::{ScoreValue, Scores};
diff --git a/src/secrets.rs b/src/secrets.rs
@@ -2,8 +2,8 @@
 
 use std::str::FromStr;
 
-use anyhow::{bail, Context as _};
-use secrecy::{zeroize::DefaultIsZeroes, SecretBox, SecretString};
+use anyhow::{Context as _, bail};
+use secrecy::{SecretBox, SecretString, zeroize::DefaultIsZeroes};
 use shuttle_runtime::SecretStore;
 use tracing::warn;
 
