Merge pull request #26 from jamesbt365/hotfix

Fix various problems and override specific framework errors.

Author: InfinityGhost

src/commands/utils.rs

@@ -379,7 +379,7 @@ pub async fn list_repos(ctx: Context<'_>) -> Result<(), Error> {
         .map(|token| {
             (
                 token.0.clone(),
-                format!("{}/{}", token.1.name, token.1.owner),
+                format!("{}/{}", token.1.owner, token.1.name),
                 true,
             )
         })

src/events/issue.rs

@@ -107,8 +107,7 @@ async fn issue_embeds(data: &Data, message: &Message) -> Option<Vec<CreateEmbed>
     let client = octocrab::instance();
     let ratelimit = client.ratelimit();
 
-    let regex =
-        Regex::new(r#" ?([a-zA-Z0-9-_.]+)?#([0-9]+[0-9]) ?"#).expect("Expected numbers regex");
+    let regex = Regex::new(r#" ?([a-zA-Z0-9-_.]+)?#([0-9]+) ?"#).expect("Expected numbers regex");
 
     let custom_repos = { data.state.read().unwrap().issue_prefixes.clone() };
 
@@ -126,7 +125,9 @@ async fn issue_embeds(data: &Data, message: &Message) -> Option<Vec<CreateEmbed>
 
                     issues = client.issues(owner, repo);
                     prs = client.pulls(owner, repo);
-                }
+                } else {
+                    continue; // discards when it doesn't match a repo.
+                };
             }
 
             let ratelimit = ratelimit

src/main.rs

@@ -21,9 +21,38 @@ type Context<'a> = poise::Context<'a, Data, Error>;
 async fn on_error(error: poise::FrameworkError<'_, Data, Error>) {
     match error {
         poise::FrameworkError::Setup { error, .. } => panic!("Failed to start bot: {:?}", error),
-        poise::FrameworkError::Command { error, ctx, .. } => {
-            println!("Error in command `{}`: {:?}", ctx.command().name, error,);
+        poise::FrameworkError::Command { ctx, error, .. } => {
+            let error = error.to_string();
+            eprintln!("An error occured in a command: {}", error);
+            commands::respond_err(&ctx, "Command Error", &error).await;
         }
+
+        poise::FrameworkError::ArgumentParse {
+            error, input, ctx, ..
+        } => {
+            let usage = match &ctx.command().help_text {
+                Some(help_text) => &**help_text,
+                None => "Please check the help menu for usage information",
+            };
+            let response = if let Some(input) = input {
+                format!(
+                    "**Cannot parse `{}` as argument: {}**\n{}",
+                    input, error, usage
+                )
+            } else {
+                format!("### {}\n{}", error, usage)
+            };
+            commands::respond_err(&ctx, "Argument Parsing Error", &response).await;
+        }
+        poise::FrameworkError::GuildOnly { ctx, .. } => {
+            commands::respond_err(
+                &ctx,
+                "This command cannot be ran in DMs.",
+                "You cannot run this command in DMs.",
+            )
+            .await;
+        }
+
         error => {
             if let Err(e) = poise::builtins::on_error(error).await {
                 println!("Error while handling error: {}", e)