Add more counters

Cargo.lock

@@ -2215,7 +2215,7 @@ dependencies = [
 
 [[package]]
 name = "soundfx-rs"
-version = "1.5.11"
+version = "1.5.12"
 dependencies = [
  "axum",
  "dashmap",

Cargo.toml

@@ -2,7 +2,7 @@
 name = "soundfx-rs"
 description = "Discord bot for custom sound effects and soundboards"
 license = "AGPL-3.0-only"
-version = "1.5.11"
+version = "1.5.12"
 authors = ["jellywx <judesouthworth@pm.me>"]
 edition = "2018"
 

src/cmds/manage.rs

@@ -1,6 +1,8 @@
 use poise::serenity_prelude::{Attachment, GuildId, RoleId};
 use tokio::fs::File;
 
+#[cfg(feature = "metrics")]
+use crate::metrics::{DELETE_COUNTER, UPLOAD_COUNTER};
 use crate::{
     cmds::autocomplete_sound,
     consts::{MAX_SOUNDS, PATREON_GUILD, PATREON_ROLE},
@@ -21,6 +23,9 @@ pub async fn upload_new_sound(
     #[description = "Name to upload sound to"] name: String,
     #[description = "Sound file (max. 2MB)"] file: Attachment,
 ) -> Result<(), Error> {
+    #[cfg(feature = "metrics")]
+    UPLOAD_COUNTER.inc();
+
     ctx.defer().await?;
 
     fn is_numeric(s: &String) -> bool {
@@ -110,6 +115,9 @@ pub async fn delete_sound(
     #[autocomplete = "autocomplete_sound"]
     name: String,
 ) -> Result<(), Error> {
+    #[cfg(feature = "metrics")]
+    DELETE_COUNTER.inc();
+
     let pool = ctx.data().database.clone();
 
     let uid = ctx.author().id.0;

src/cmds/play.rs

@@ -25,13 +25,13 @@ pub async fn play(
     #[channel_types("Voice")]
     channel: Option<GuildChannel>,
 ) -> Result<(), Error> {
+    #[cfg(feature = "metrics")]
+    PLAY_COUNTER.inc();
+
     ctx.defer().await?;
 
     let guild = ctx.guild().unwrap();
 
-    #[cfg(feature = "metrics")]
-    PLAY_COUNTER.inc();
-
     ctx.say(
         play_from_query(
             &ctx.serenity_context(),
@@ -78,9 +78,15 @@ pub async fn play_random(
                 join_channel(ctx.serenity_context(), guild.clone(), channel).await;
 
             let sounds = ctx.data().guild_sounds(guild.id, None).await?;
+            if sounds.len() == 0 {
+                ctx.say("No sounds in this server!").await?;
+                return Ok(());
+            }
 
             let ts = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
 
+            println!("{}", ts.subsec_micros());
+
             // This is far cheaper and easier than using an RNG. No reason to use a full RNG here
             // anyway.
             match sounds.get(ts.subsec_micros() as usize % sounds.len()) {
@@ -97,6 +103,9 @@ pub async fn play_random(
                     )
                     .await
                     .unwrap();
+
+                    ctx.say(format!("Playing {} (ID {})", sound.name, sound.id))
+                        .await?;
                 }
 
                 None => {

src/main.rs

@@ -30,7 +30,6 @@ type Database = MySql;
 
 pub struct Data {
     database: Pool<Database>,
-    http: reqwest::Client,
     guild_data_cache: DashMap<GuildId, Arc<RwLock<GuildData>>>,
     join_sound_cache: DashMap<UserId, DashMap<Option<GuildId>, Option<u32>>>,
 }
@@ -159,7 +158,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
                     .unwrap();
 
                 Ok(Data {
-                    http: reqwest::Client::new(),
                     database,
                     guild_data_cache: Default::default(),
                     join_sound_cache: Default::default(),

src/metrics.rs

@@ -8,7 +8,11 @@ use prometheus::{register_int_counter, IntCounter, Registry};
 lazy_static! {
     static ref REGISTRY: Registry = Registry::new();
     pub static ref PLAY_COUNTER: IntCounter =
-        register_int_counter!("play", "Number of calls to /play").unwrap();
+        register_int_counter!("play_cmd", "Number of calls to /play").unwrap();
+    pub static ref UPLOAD_COUNTER: IntCounter =
+        register_int_counter!("upload_cmd", "Number of calls to /upload").unwrap();
+    pub static ref DELETE_COUNTER: IntCounter =
+        register_int_counter!("delete_cmd", "Number of calls to /delete").unwrap();
 }
 
 pub fn init_metrics() {