From a709598cf6c617c498443271beb84d2348e88593 Mon Sep 17 00:00:00 2001 From: Max batleforc Date: Mon, 1 Jul 2024 23:34:45 +0200 Subject: [PATCH] feat: group meme command --- src/botv2/cmd/meme/main.rs | 18 ++++++++++++++++++ src/botv2/cmd/meme/mod.rs | 1 + src/botv2/handler.rs | 2 +- src/botv2/init.rs | 13 ++----------- 4 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 src/botv2/cmd/meme/main.rs diff --git a/src/botv2/cmd/meme/main.rs b/src/botv2/cmd/meme/main.rs new file mode 100644 index 0000000..2918a74 --- /dev/null +++ b/src/botv2/cmd/meme/main.rs @@ -0,0 +1,18 @@ +use crate::botv2::{ + cmd::meme::{answer::answer, enable::enable, list::list}, + init::{Context, Error}, +}; +use tracing::instrument; + +/// Handle meme command +#[instrument(skip(ctx), level = "info", fields(channel = ctx.channel_id().get(), guild = ?ctx.guild_id().unwrap().get()))] +#[poise::command( + slash_command, + prefix_command, + category = "mem", + subcommands("answer", "enable", "list"), + guild_only = true +)] +pub async fn meme(ctx: Context<'_>) -> Result<(), Error> { + Ok(()) +} diff --git a/src/botv2/cmd/meme/mod.rs b/src/botv2/cmd/meme/mod.rs index 611fd0d..0a1ff90 100644 --- a/src/botv2/cmd/meme/mod.rs +++ b/src/botv2/cmd/meme/mod.rs @@ -1,3 +1,4 @@ pub mod answer; pub mod enable; pub mod list; +pub mod main; diff --git a/src/botv2/handler.rs b/src/botv2/handler.rs index eee73df..25ea46f 100644 --- a/src/botv2/handler.rs +++ b/src/botv2/handler.rs @@ -1,7 +1,7 @@ use super::init::{Data, Error}; use poise::serenity_prelude as serenity; use tracing::{info, instrument}; - +#[allow(clippy::single_match)] #[instrument(skip(_ctx, _framework, _data), err, level = "trace")] pub async fn event_handler( _ctx: &serenity::Context, diff --git a/src/botv2/init.rs b/src/botv2/init.rs index 7ac8d95..ea65285 100644 --- a/src/botv2/init.rs +++ b/src/botv2/init.rs @@ -1,4 +1,4 @@ -use crate::botv2::cmd::meme::{answer::answer, enable::enable, list::list}; +use crate::botv2::cmd::meme::main::meme; use crate::botv2::cmd::server_config::server::server; use crate::botv2::cmd::{help::help, ping::ping}; use crate::config::Config; @@ -67,16 +67,7 @@ pub async fn start_bot( let prefix = config.prefix.clone(); let framework = poise::Framework::builder() .options(poise::FrameworkOptions { - commands: vec![ - age(), - ping(), - help(), - list(), - enable(), - answer(), - server(), - concour(), - ], + commands: vec![age(), ping(), help(), meme(), server(), concour()], prefix_options: poise::PrefixFrameworkOptions { prefix: Some(prefix), ..Default::default()