changed command structure

Author: kingananas20

src/bin/main.rs

@@ -27,7 +27,9 @@ async fn main() -> Result<(), Box<Error>> {
             register(),
             commands::help(),
             commands::cargo(),
-            commands::run_alias(),
+            commands::run_code_block(),
+            commands::miri_code_block(),
+            commands::publish(),
             commands::explain(),
             commands::reload_errors(),
             commands::krate(),

src/commands.rs

@@ -4,7 +4,7 @@ mod explain;
 mod help;
 mod krate;
 
-pub use cargo::{cargo, run_alias};
+pub use cargo::{cargo, miri_code_block, publish, run_code_block};
 pub use docs::docs;
 pub use explain::{explain, reload_errors};
 pub use help::help;

src/commands/cargo.rs

@@ -15,18 +15,18 @@ use common::{Output, WithCode};
 use crates::crates;
 use file::file;
 use gist::gist;
-use miri::miri;
+pub use miri::miri_code_block;
 use poise::command;
-use publish::publish;
+pub use publish::publish;
 use response::BotResponse;
-pub use run::run_alias;
-use run::run_code_block;
+pub use run::run_code_block;
 use version::version;
 
 #[command(
     prefix_command,
     slash_command,
-    subcommands("run_code_block", "publish", "miri", "crates", "version")
+    subcommands("crates", "version"),
+    category = "cargo"
 )]
 pub async fn cargo(_ctx: Context<'_>) -> Result<(), Error> {
     Ok(())

src/commands/cargo/crates.rs

@@ -2,7 +2,7 @@ use crate::{Context, Error};
 use poise::{CreateReply, serenity_prelude::CreateEmbed};
 
 /// List the crates available to use in the rust playground
-#[poise::command(slash_command)]
+#[poise::command(slash_command, category = "cargo")]
 pub async fn crates(
     ctx: Context<'_>,
     #[description = "Which page (24 per page)?"] page: Option<usize>,

src/commands/cargo/miri.rs

@@ -10,13 +10,25 @@ const MIRI_RES: MiriResponse = MiriResponse {
     exit_detail: Cow::Borrowed(""),
 };
 
-#[poise::command(prefix_command, slash_command, subcommands("miri_gist", "miri_file"))]
-pub async fn miri(ctx: Context<'_>, #[rest] input: String) -> Result<(), Error> {
+#[poise::command(
+    prefix_command,
+    slash_command,
+    rename = "miri",
+    subcommands("miri_gist", "miri_file"),
+    category = "cargo",
+    broadcast_typing
+)]
+pub async fn miri_code_block(ctx: Context<'_>, #[rest] input: String) -> Result<(), Error> {
     super::code_block(ctx, &input, parse_miri, MIRI_RES, "miri").await
 }
 
 /// Runs code from a Github gist using miri
-#[poise::command(slash_command, rename = "gist", member_cooldown = 60)]
+#[poise::command(
+    slash_command,
+    rename = "gist",
+    member_cooldown = 60,
+    category = "cargo"
+)]
 #[allow(clippy::too_many_arguments)]
 async fn miri_gist(
     ctx: Context<'_>,
@@ -38,7 +50,12 @@ async fn miri_gist(
 }
 
 /// Run code from a rust file using miri
-#[poise::command(slash_command, rename = "file", member_cooldown = 60)]
+#[poise::command(
+    slash_command,
+    rename = "file",
+    member_cooldown = 60,
+    category = "cargo"
+)]
 #[allow(clippy::too_many_arguments)]
 async fn miri_file(
     ctx: Context<'_>,

src/commands/cargo/publish.rs

@@ -4,7 +4,7 @@ use poise::{CreateReply, command};
 use std::borrow::Cow;
 
 /// Publish code in a code block to GitHub Gists
-#[command(prefix_command, guild_cooldown = 60)]
+#[command(prefix_command, guild_cooldown = 60, category = "cargo")]
 pub async fn publish(ctx: Context<'_>, #[rest] input: Option<String>) -> Result<(), Error> {
     let input = input.unwrap_or("".to_owned());
     let (_, code) = crate::common::extract_before_and_code(&input)?;

src/commands/cargo/run.rs

@@ -17,20 +17,21 @@ const EXECUTE_RES: ExecuteResponse = ExecuteResponse {
     prefix_command,
     slash_command,
     rename = "run",
-    subcommands("run_gist", "run_file")
+    subcommands("run_gist", "run_file"),
+    category = "cargo",
+    broadcast_typing
 )]
 pub async fn run_code_block(ctx: Context<'_>, #[rest] input: String) -> Result<(), Error> {
     super::code_block(ctx, &input, parse_run_command, EXECUTE_RES, "run").await
 }
 
-/// Runs code from a code block in the Rust playground and returns the output
-#[poise::command(prefix_command, rename = "run")]
-pub async fn run_alias(ctx: Context<'_>, #[rest] input: String) -> Result<(), Error> {
-    super::code_block(ctx, &input, parse_run_command, EXECUTE_RES, "run").await
-}
-
 /// Runs code from a Github gist
-#[poise::command(slash_command, rename = "gist", member_cooldown = 60)]
+#[poise::command(
+    slash_command,
+    rename = "gist",
+    member_cooldown = 60,
+    category = "cargo"
+)]
 #[allow(clippy::too_many_arguments)]
 async fn run_gist(
     ctx: Context<'_>,
@@ -58,7 +59,12 @@ async fn run_gist(
 }
 
 /// Runs code from a Rust source file upload
-#[poise::command(slash_command, rename = "file", member_cooldown = 60)]
+#[poise::command(
+    slash_command,
+    rename = "file",
+    member_cooldown = 60,
+    category = "cargo"
+)]
 #[allow(clippy::too_many_arguments)]
 async fn run_file(
     ctx: Context<'_>,

src/commands/cargo/version.rs

@@ -6,7 +6,7 @@ use poise::{
 };
 
 /// Get the current `rustc`, `clippy`, `rustfmt` and `miri` versions used when running `!cargo run`
-#[command(slash_command, prefix_command)]
+#[command(slash_command, prefix_command, category = "cargo")]
 pub async fn version(ctx: Context<'_>, channel: Channel) -> Result<(), Error> {
     let res = if let Some(content) = ctx.data().redis_client.get("version").await? {
         content