diff --git a/src/types/schema/message.rs b/src/types/schema/message.rs index 20523b4..ade8e4d 100644 --- a/src/types/schema/message.rs +++ b/src/types/schema/message.rs @@ -8,42 +8,14 @@ use crate::types::entities::{ #[serde(rename_all = "snake_case")] pub struct MessageSendSchema { #[serde(rename = "type")] - message_type: Option, - content: Option, - nonce: Option, - tts: Option, - embeds: Option>, - allowed_mentions: Option, - message_reference: Option, - components: Option>, - sticker_ids: Option>, + pub message_type: Option, + pub content: Option, + pub nonce: Option, + pub tts: Option, + pub embeds: Option>, + pub allowed_mentions: Option, + pub message_reference: Option, + pub components: Option>, + pub sticker_ids: Option>, pub attachments: Option>, } - -impl MessageSendSchema { - pub fn new( - message_type: Option, - content: Option, - nonce: Option, - tts: Option, - embeds: Option>, - allowed_mentions: Option, - message_reference: Option, - components: Option>, - sticker_ids: Option>, - attachments: Option>, - ) -> MessageSendSchema { - MessageSendSchema { - message_type, - content, - nonce, - tts, - embeds, - allowed_mentions, - message_reference, - components, - sticker_ids, - attachments, - } - } -} diff --git a/tests/message.rs b/tests/message.rs index d614538..e92c35c 100644 --- a/tests/message.rs +++ b/tests/message.rs @@ -8,18 +8,10 @@ mod common; #[tokio::test] async fn send_message() { let mut bundle = common::setup().await; - let mut message = types::MessageSendSchema::new( - None, - Some("A Message!".to_string()), - None, - None, - None, - None, - None, - None, - None, - None, - ); + let mut message = types::MessageSendSchema { + content: Some("A Message!".to_string()), + ..Default::default() + }; let _ = bundle .user .send_message(&mut message, bundle.channel.id.to_string(), None) @@ -53,18 +45,11 @@ async fn send_message_attachment() { content: buffer, }; - let mut message = types::MessageSendSchema::new( - None, - Some("trans rights now".to_string()), - None, - None, - None, - None, - None, - None, - None, - Some(vec![attachment.clone()]), - ); + let mut message = types::MessageSendSchema { + content: Some("trans rights now".to_string()), + attachments: Some(vec![attachment.clone()]), + ..Default::default() + }; let vec_attach = vec![attachment.clone()]; let _arg = Some(&vec_attach);