moved message sending to their own functions

src/cmds.rs

@@ -1,6 +1,6 @@
-use crate::{Context, Error};
+use crate::{send_embed, send_msg, Context, EmbedOptions, Error};
 
-use poise::{serenity_prelude::{Color, CreateEmbed, OnlineStatus, Timestamp}, CreateReply};
+use poise::serenity_prelude::{OnlineStatus, Timestamp};
 
 
 #[poise::command(slash_command, prefix_command)]
@@ -9,15 +9,7 @@ pub async fn ping(
   #[description = "The text to echo back"] text: Option<String>,
 ) -> Result<(), Error>
 {
-  let t = text.unwrap_or_else(|| "Pong".to_string());
-
-  let r = CreateReply {
-    content: Some(t),
-    ephemeral: Some(true),
-    ..Default::default()
-  };
-
-  ctx.send(r).await?;
+  send_msg(ctx, text.unwrap_or_else(|| "Pong".to_string()), true).await?;
 
   return Ok(());
 }
@@ -33,36 +25,19 @@ pub async fn stop(
   let should_stop = dev_enabled
     || confirmation.unwrap_or_else(|| "".to_string()).to_lowercase() == "i want to stop the bot now";
 
-  let r_success = CreateReply {
-    content: Some("Shutting down...".to_string()),
-    ephemeral: Some(true),
-    ..Default::default()
-  };
-
-  let r_fail = CreateReply {
-    content: Some("Failed to shut down.".to_string()),
-    ephemeral: Some(true),
-    ..Default::default()
-  };
-
   if should_stop {
-    ctx.send(r_success).await?;
+    send_msg(ctx, "Shutting down...".to_string(), true).await?;
     ctx.serenity_context().set_presence(None, OnlineStatus::Invisible);
     ctx.framework().shard_manager.shutdown_all().await;
   }
   else {
-    ctx.send(r_fail).await?;
+    send_msg(ctx, "Failed to shut down.".to_string(), true).await?;
   }
 
   return Ok(());
 }
 
 
-fn none_to_empty(string: Option<String>) -> String {
-  return string.unwrap_or_else(|| "".to_string());
-}
-
-
 #[poise::command(
   slash_command,
   prefix_command,
@@ -75,21 +50,20 @@ pub async fn embed(
   #[description = "Color of side strip."] color: Option<u32>,
   #[description = "A URL the title is bound to."] url: Option<String>,
   #[description = "Timestamp at bottom (best to leave empty)."] timestamp: Option<Timestamp>,
+  #[description = "Empheral (only visible to you)"] empheral: Option<bool>
 ) -> Result<(), Error> 
 {
-  let embed = CreateEmbed::new()
-    .title      (none_to_empty(title))
-    .description(description)
-    .colour     (Color::new(color.unwrap_or_else(|| 5793266)))
-    .url        (none_to_empty(url))
-    .timestamp  (timestamp.unwrap_or_else(|| Timestamp::now()));
-
-  let r = CreateReply {
-    embeds: vec![embed],
-    ..Default::default()
-  };
-
-  ctx.send(r).await?;
+  send_embed(
+    ctx,
+    EmbedOptions {
+      desc: description,
+      title,
+      col: color,
+      url,
+      ts: timestamp,
+      empheral: empheral.unwrap_or_else(|| false)
+    }
+  ).await?;
 
   return Ok(());
 }