Add support for extras, conditionally displaying commands in the help command, and start working on moderation commands

src/groups/about/commands.rs

@@ -1,9 +1,10 @@
 use async_trait::async_trait;
 
 use crate::{
+    extras::Extras,
     framework::commands::{
         Command, CommandError,
-        arguments::{Argument, NeedyString, ParseArguments},
+        arguments::{Arg, Argument, NeedyString, ParseArguments},
         context::CommandContext,
     },
     groups::about::{
@@ -19,7 +20,7 @@ use crate::{
 pub struct HelpCommand;
 
 #[async_trait]
-impl Command<State> for HelpCommand {
+impl Command<State, Extras> for HelpCommand {
     fn name(&self) -> &'static str {
         "help"
     }
@@ -38,12 +39,12 @@ impl Command<State> for HelpCommand {
 
     async fn execute(
         &self,
-        ctx: CommandContext<'_, State>,
+        ctx: CommandContext<'_, State, Extras>,
         args: &str,
     ) -> Result<(), CommandError> {
-        let command_name: Option<NeedyString> = ParseArguments::parse(args).unwrap();
+        let command_name = Arg::<Option<NeedyString>>::parse(args, &ctx).await.unwrap();
 
-        if let Some(command_name) = command_name {
+        if let Some(command_name) = command_name.0 {
             if let Some(command) = ctx.rt.get_command(&command_name) {
                 ctx.send()
                     .embed(get_command_help_embed(&command, &ctx))
@@ -54,7 +55,7 @@ impl Command<State> for HelpCommand {
                     .map_err(|_| CommandError::MessageSendingFailed)?;
             } else {
                 ctx.send()
-                    .embed(get_command_not_found_embed(ctx.rt, command_name.0))
+                    .embed(get_command_not_found_embed(&ctx.rt, command_name.0))
                     .component(HelpGoBackButton, 1)
                     .component(HelpSupportLinkButton, 1)
                     .await
@@ -62,7 +63,7 @@ impl Command<State> for HelpCommand {
             }
         } else {
             ctx.send()
-                .embed(get_all_command_help_embed(ctx.prefix, ctx.rt))
+                .embed(get_all_command_help_embed(ctx.prefix, &ctx.rt, &ctx.extras))
                 .component(HelpWebsiteLinkButton, 1)
                 .component(HelpSupportLinkButton, 1)
                 .component(HelpDonateLinkButton, 1)