Allow setting the embed builders directly (#962)

serenity-rs · Oct 4, 2020 · b522e83 · b522e83
1 parent 7ef12ee
commit b522e83
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/builder/create_embed.rs b/src/builder/create_embed.rs
@@ -43,7 +43,7 @@ use crate::utils::Colour;
 pub struct CreateEmbed(pub HashMap<&'static str, Value>);
 
 impl CreateEmbed {
-    /// Set the author of the embed.
+    /// Build the author of the embed.
     ///
     /// Refer to the documentation for [`CreateEmbedAuthor`] for more
     /// information.
@@ -53,7 +53,11 @@ impl CreateEmbed {
         where F: FnOnce(&mut CreateEmbedAuthor) -> &mut CreateEmbedAuthor {
         let mut author = CreateEmbedAuthor::default();
         f(&mut author);
+        self.set_author(author)
+    }
 
+    /// Set the author of the embed.
+    pub fn set_author(&mut self, author: CreateEmbedAuthor) -> &mut Self {
         let map = utils::hashmap_to_json_map(author.0);
 
         self.0.insert("author", Value::Object(map));
@@ -160,7 +164,7 @@ impl CreateEmbed {
         self
     }
 
-    /// Set the footer of the embed.
+    /// Build the footer of the embed.
     ///
     /// Refer to the documentation for [`CreateEmbedFooter`] for more
     /// information.
@@ -170,6 +174,11 @@ impl CreateEmbed {
         where F: FnOnce(&mut CreateEmbedFooter) -> &mut CreateEmbedFooter {
         let mut create_embed_footer = CreateEmbedFooter::default();
         f(&mut create_embed_footer);
+        self.set_footer(create_embed_footer)
+    }
+
+    /// Set the footer of the embed.
+    pub fn set_footer(&mut self, create_embed_footer: CreateEmbedFooter) -> &mut Self {
         let footer = create_embed_footer.0;
         let map = utils::hashmap_to_json_map(footer);
 

diff --git a/src/builder/create_message.rs b/src/builder/create_message.rs
@@ -70,11 +70,16 @@ impl<'a> CreateMessage<'a> {
         self
     }
 
-    /// Set an embed for the message.
+    /// Create an embed for the message.
     pub fn embed<F>(&mut self, f: F) -> &mut Self
     where F: FnOnce(&mut CreateEmbed) -> &mut CreateEmbed {
         let mut embed = CreateEmbed::default();
         f(&mut embed);
+        self.set_embed(embed)
+    }
+
+    /// Set an embed for the message.
+    pub fn set_embed(&mut self, embed: CreateEmbed) -> &mut Self {
         let map = utils::hashmap_to_json_map(embed.0);
         let embed = Value::Object(map);