refactor commands

Cargo.toml

@@ -7,9 +7,9 @@ edition = "2021"
 
 [dependencies]
 poise = "0.6.1"
-serenity = { version = "0.12.0", default-features = false,  features = ["client", "gateway", "model", "rustls_backend", "utils", "framework"] }
-tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread", "rt"] }
-env_logger = "0.11.2"
-anyhow = "1.0.75"
+serenity = { version = "0.12.1", default-features = false,  features = ["client", "gateway", "model", "rustls_backend", "utils", "framework"] }
+tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread", "rt"] }
+env_logger = "0.11.3"
+anyhow = "1.0.86"
 tracing = "0.1.40"
-regex = "1.10.2"
+regex = "1.10.4"

src/commands/bots.rs

@@ -1,17 +1,16 @@
-use crate::commands::{command_helper, helpstart};
-use crate::{Context, Error};
 use std::string::String;
 
-#[poise::command(slash_command, guild_only)]
+use crate::{Context, Error};
+use crate::commands::command_helper;
+
+#[poise::command(slash_command, guild_only, owners_only)]
 pub(crate) async fn bots(
     ctx: Context<'_>,
-
     #[min = 0_u8]
     #[description = "default: 0"]
     bots: u8,
 ) -> Result<(), Error> {
-    helpstart::set_bots_available(bots).await;
-
+    *ctx.data().bots.write().await = bots;
     let reply = format!("{} bots are now registered as available", bots).to_string();
-    command_helper::send(ctx, reply).await
+    command_helper::send_simple(ctx, reply).await
 }

src/commands/command_helper.rs

@@ -1,8 +1,8 @@
-use crate::{Context, Error};
-use serenity::all::CreateAllowedMentions;
 use std::time::Duration;
 
-pub(crate) async fn send(ctx: Context<'_>, reply: String) -> Result<(), Error> {
+use crate::{Context, Error};
+
+pub(crate) async fn send_simple(ctx: Context<'_>, reply: String) -> Result<(), Error> {
     if let Err(why) = ctx
         .send(poise::CreateReply {
             content: Some(reply),
@@ -10,7 +10,7 @@ pub(crate) async fn send(ctx: Context<'_>, reply: String) -> Result<(), Error> {
             attachments: vec![],
             ephemeral: None,
             components: None,
-            allowed_mentions: Some(CreateAllowedMentions::new().all_roles(true)),
+            allowed_mentions: None,
             reply: false,
             __non_exhaustive: (),
         })
@@ -21,7 +21,7 @@ pub(crate) async fn send(ctx: Context<'_>, reply: String) -> Result<(), Error> {
     Ok(())
 }
 
-pub(crate) fn cooldown(ctx: &Context, user: u64, global: u64) -> Option<Result<(), Error>> {
+pub(crate) fn cooldown(ctx: &Context, user: u64, global: u64) -> Result<(), Error> {
     let mut cooldown_tracker = ctx.command().cooldowns.lock().unwrap();
     let cooldown_durations = poise::CooldownConfig {
         global: Some(Duration::from_secs(global)),
@@ -32,12 +32,7 @@ pub(crate) fn cooldown(ctx: &Context, user: u64, global: u64) -> Option<Result<(
         __non_exhaustive: (),
     };
     match cooldown_tracker.remaining_cooldown((*ctx).cooldown_context(), &cooldown_durations) {
-        Some(remaining) => Some(Err(
-            format!("Please wait {} seconds", remaining.as_secs()).into()
-        )),
-        None => {
-            cooldown_tracker.start_cooldown((*ctx).cooldown_context());
-            None
-        }
+        Some(remaining) => Err(format!("Please wait {} seconds", remaining.as_secs()).into()),
+        None => Ok(cooldown_tracker.start_cooldown((*ctx).cooldown_context())),
     }
 }

src/commands/helpstart.rs

@@ -1,12 +1,11 @@
-use crate::commands::command_helper;
-use crate::{Context, Error};
+use poise::CreateReply;
 
-static mut BOTS_AVAILABLE: u8 = 0;
+use crate::{Context, Error};
+use crate::commands::command_helper;
 
 #[poise::command(slash_command, guild_only)]
 pub(crate) async fn helpstart(
     ctx: Context<'_>,
-
     #[min = 1_u8]
     #[max = 3_u8]
     #[description = "amount of players in your party, DO NOT include bots"]
@@ -14,22 +13,26 @@ pub(crate) async fn helpstart(
     current_players: u8,
 ) -> Result<(), Error> {
     let needed_players = 4 - current_players;
-    let bots = unsafe { BOTS_AVAILABLE };
+    let bots = *ctx.data().bots.read().await;
 
-    let reply = if bots >= needed_players {
-        "Bots available. Please use <@424767825001971715> in the bot-commands channel instead."
-            .to_string()
+    let mut reply = CreateReply::default();
+
+    reply = if bots >= needed_players {
+        reply.content("Bots available. Please use <@424767825001971715> in the bot-commands channel instead.")
+            .ephemeral(true)
     } else {
-        if let Some(value) = command_helper::cooldown(&ctx, 1200, 600) {
-            return value;
+        match command_helper::cooldown(&ctx, 1200, 600) {
+            Ok(_) => reply
+                .content(format!(
+                    "<@&1008075054971621448>\nneed: {}",
+                    needed_players - bots
+                ))
+                .ephemeral(false),
+            Err(why) => reply.content(why.to_string()).ephemeral(true),
+        }
     };
-        format!("<@&1008075054971621448>\nneed: {}", needed_players - bots)
-    };
-
-    command_helper::send(ctx, reply).await
-}
-pub async fn set_bots_available(bots: u8) {
-    unsafe {
-        BOTS_AVAILABLE = bots;
+    if let Err(why) = ctx.send(reply).await {
+        println!("Error sending message: {why}")
     }
+    Ok(())
 }

src/commands/lfg.rs

@@ -1,14 +1,13 @@
+use poise::{ChoiceParameter, CreateReply};
+use serenity::all::CreateAllowedMentions;
+
+//from main.rs
+use crate::{Context, Error};
+use crate::commands::command_helper::cooldown;
 //
 use crate::commands::lfg::Difficulty::Normal;
 use crate::commands::lfg::Map::*;
 use crate::commands::lfg::Mode::*;
-//from main.rs
-use crate::{Context, Error};
-//
-use crate::commands::command_helper;
-use poise::ChoiceParameter;
-use serenity::model::mention::Mention;
-use serenity::model::mention::Mention::Role;
 
 #[derive(Debug, poise::ChoiceParameter, PartialEq)]
 pub enum Map {
@@ -29,8 +28,8 @@ pub enum Mode {
     Challenge,
     #[name = "Challenge of the week"]
     Event,
-    #[name = "Tournament Practice"]
-    Tournament
+    //#[name = "Tournament Practice"]
+    //Tournament,
 }
 #[derive(Debug, poise::ChoiceParameter)]
 pub enum Difficulty {
@@ -71,52 +70,61 @@ pub(crate) async fn lfg(
     #[rename = "message"]
     note: Option<String>,
 ) -> Result<(), Error> {
-    if let Some(value) = command_helper::cooldown(&ctx, 600, 300) {
-        return value;
-    }
 
+    let mut reply = CreateReply::default();
+
+    reply = match cooldown(&ctx, 600, 300) {
+        Ok(_) => {
             let current = current_players.unwrap_or(1);
             let mut desired = desired_players.unwrap_or(4);
             if current >= desired {
                 desired = 4
             }
             let map_name: &str = map.name();
-    let ping: Mention;
-    match mode {
+            let ping = match mode {
                 Casual => match map {
-            DeadEnd => ping = Role(1005837123921915914.into()),
-            BadBlood => ping = Role(1140190470698438666.into()),
-            AlienArcadium => ping = Role(1105917281898336356.into()),
+                    DeadEnd => 1005837123921915914,
+                    BadBlood => 1140190470698438666,
+                    AlienArcadium => 1105917281898336356,
                 },
-        Speedrun => ping = Role(1005836989595144243.into()),
-        Challenge => ping = Role(1005836864680361994.into()),
-        Event => ping = Role(1175116511095050331.into()),
-        Tournament => ping = Role(1210508966036242445.into()),
-    }
-    let diff_name: &str = if map != AlienArcadium {
-        difficulty.unwrap_or(Normal).name()
-    } else {
-        Normal.name()
+                Speedrun => 1005836989595144243,
+                Challenge => 1005836864680361994,
+                Event => 1175116511095050331,
+                //Tournament => 1210508966036242445,
+            };
+            let difficulty = match map {
+                DeadEnd => difficulty.unwrap_or(Normal),
+                BadBlood => difficulty.unwrap_or(Normal),
+                AlienArcadium => Normal,
             };
 
-    let mut reply = format!(
-        "{c}/{d} {e} {f} {b}",
-        b = ping,
-        c = current,
-        d = desired,
-        e = map_name,
-        f = diff_name
+            let mut reply_content = format!(
+                "<@&{ping}> {current}/{desired} {map_name}",
             );
+            match difficulty {
+                Normal => {},
+                Difficulty::Hard | Difficulty::Rip => {
+                    reply_content.push(' ');
+                    reply_content.push_str(difficulty.name());
+                }
+            }
+            match note {
+                None => {},
+                Some(note) => {
+                    reply_content.push_str(format!("\nNote: {note}").as_str());
+                }
+            }
+            reply.content(reply_content)
+                .ephemeral(false)
+                .allowed_mentions(CreateAllowedMentions::new()
+                    .roles(vec![ping])
+                )
+        },
+        Err(why) => reply.content(why.to_string()).ephemeral(true),
+    };
 
-    if note.is_some() {
-        let t = note.unwrap();
-        let regex = regex::Regex::new("(<@&?[0-9]*>)|(@everyone|@here)").unwrap();
-        if regex.is_match(&t) {
-            reply = String::from("Your Note seems to match a ping <:Maark:1128577127931985950>");
-        } else {
-            reply.push_str(format!("\nNote: {}", t).as_str());
+    if let Err(why) = ctx.send(reply).await {
+        println!("Error sending message: {why}");
     }
-    }
-
-    command_helper::send(ctx, reply).await
+    Ok(())
 }

src/main.rs

@@ -1,12 +1,17 @@
-mod commands;
-
-use poise::{async_trait, serenity_prelude as serenity};
-use serenity::{client::EventHandler, model::id::UserId, FullEvent};
 use std::collections::HashSet;
 use std::convert::Into;
-use serenity::all::{ActivityData};
+use std::sync::Arc;
 
-struct Data {} // User data, which is stored and accessible in all command invocations
+use poise::{async_trait, serenity_prelude as serenity};
+use serenity::{client::EventHandler, FullEvent, model::id::UserId};
+use serenity::all::ActivityData;
+use tokio::sync::RwLock;
+
+mod commands;
+
+struct Data {
+    bots: Arc<RwLock<u8>>
+} // User data, which is stored and accessible in all command invocations
 type Error = Box<dyn std::error::Error + Send + Sync>;
 type Context<'a> = poise::Context<'a, Data, Error>;
 struct ReadyHandler;
@@ -39,13 +44,6 @@ async fn main() {
         on_error: |error| {
             Box::pin(async move {
                 match error {
-                    poise::FrameworkError::ArgumentParse { error, .. } => {
-                        if let Some(error) = error.downcast_ref::<serenity::RoleParseError>() {
-                            println!("Found a RoleParseError: {:?}", error);
-                        } else {
-                            println!("Not a RoleParseError :(");
-                        }
-                    }
                     other => poise::builtins::on_error(other).await.unwrap(),
                 }
             })
@@ -62,7 +60,9 @@ async fn main() {
         .setup(move |ctx, _ready, framework| {
             Box::pin(async move {
                 poise::builtins::register_globally(ctx, &framework.options().commands).await?;
-                Ok(Data {})
+                Ok(Data {
+                    bots: Arc::new(RwLock::new(0)),
+                })
             })
         })
         .build();