Handle asm command errors in after hook

Headline · Oct 19, 2020 · ae5b817 · ae5b817
1 parent b0e9165
commit ae5b817
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 29 deletions.
diff --git a/src/commands/asm.rs b/src/commands/asm.rs
@@ -20,11 +20,7 @@ pub mod hide {
         let result : ParserResult = match Parser::get_components(&msg.content).await {
             Ok(r) => r,
             Err(e) => {
-                let emb = DiscordHelpers::build_fail_embed( &msg.author, &format!("{}", e));
-                let mut emb_msg = DiscordHelpers::embed_message(emb);
-                msg.channel_id.send_message(&ctx.http, |_| &mut emb_msg).await?;
-
-                return Ok(());
+                return Err(CommandError::from(format!("{}", e)));
             }
         };
 
@@ -34,23 +30,15 @@ pub mod hide {
         let godbolt_lock = match data_read.get::<GodboltInfo>() {
             Some(l) => l,
             None => {
-                let emb = DiscordHelpers::build_fail_embed( &msg.author, "Internal request failure\nGodbolt cache is uninitialized, please file a bug.");
-                let mut emb_msg = DiscordHelpers::embed_message(emb);
-                msg.channel_id.send_message(&ctx.http, |_| &mut emb_msg).await?;
-
-                return Ok(());
+                return Err(CommandError::from(format!("Internal request failure\nGodbolt cache is uninitialized, please file a bug.")));
             }
         };
         let godbolt = godbolt_lock.read().await;
 
         let c = match godbolt.resolve(&result.target) {
             Some(c) => c,
             None => {
-                let emb = DiscordHelpers::build_fail_embed( &msg.author, &format!("Unable to find valid compiler or language '{}'\n", &result.target));
-                let mut emb_msg = DiscordHelpers::embed_message(emb);
-                msg.channel_id.send_message(&ctx.http, |_| &mut emb_msg).await?;
-
-                return Ok(());
+                return Err(CommandError::from(format!("Unable to find valid compiler or language '{}'\n", &result.target)));
             }
         };
 
@@ -59,11 +47,7 @@ pub mod hide {
         let reaction = match msg.react(&ctx.http, DiscordHelpers::build_reaction(752440820036272139, "compiler_loading2")).await {
             Ok(r) => r,
             Err(e) => {
-                let emb = DiscordHelpers::build_fail_embed( &msg.author, &format!("Unable to react to message, am I missing permissions?\n{}", e));
-                let mut emb_msg = DiscordHelpers::embed_message(emb);
-                msg.channel_id.send_message(&ctx.http, |_| &mut emb_msg).await?;
-
-                return Ok(());
+                return Err(CommandError::from(format!(" Unable to react to message, am I missing permissions to react or use external emoji?\n{}", e)));
             }
         };
 
@@ -82,23 +66,17 @@ pub mod hide {
         let response = match Godbolt::send_request(&c, &result.code, &result.options.join(" "), &filters).await {
             Ok(resp) => resp,
             Err(e) => {
-                let emb = DiscordHelpers::build_fail_embed( &msg.author, &format!("Godbolt request failed!\n\n{}", e));
-                let mut emb_msg = DiscordHelpers::embed_message(emb);
-                msg.channel_id.send_message(&ctx.http, |_| &mut emb_msg).await?;
-
                 // we failed, lets remove the loading react before leaving so it doesn't seem like we're still processing
                 msg.delete_reaction_emoji(&ctx.http, reaction.emoji.clone()).await?;
-                return Ok(());
+                return Err(CommandError::from(format!("Godbolt request failed!\n\n{}", e)));
             }
         };
 
         // remove our loading emote
         match msg.delete_reaction_emoji(&ctx.http, reaction.emoji.clone()).await {
             Ok(()) => (),
             Err(_e) => {
-                let emb = DiscordHelpers::build_fail_embed( &msg.author, "Unable to remove reactions!\nAm I missing permission to manage messages?");
-                let mut emb_msg = DiscordHelpers::embed_message(emb);
-                msg.channel_id.send_message(&ctx.http, |_| &mut emb_msg).await?;
+                return Err(CommandError::from("Unable to remove reactions!\nAm I missing permission to manage messages?"));
             }
         }
 

diff --git a/src/commands/compile.rs b/src/commands/compile.rs
@@ -61,7 +61,7 @@ pub async fn compile(ctx: &Context, msg: &Message, _args: Args) -> CommandResult
     let reaction = match msg.react(&ctx.http, DiscordHelpers::build_reaction(loading_id, &loading_name)).await {
         Ok(r) => r,
         Err(e) => {
-            return Err(CommandError::from(format!(" Unable to react to message, am I missing permissions?\n{}", e)));
+            return Err(CommandError::from(format!(" Unable to react to message, am I missing permissions to react or use external emoji?\n{}", e)));
         }
     };