From 85fb24cd8c969d34a867375a54742c278c3ddf4f Mon Sep 17 00:00:00 2001
From: Flori <39242991+bitfl0wer@users.noreply.github.com>
Date: Mon, 17 Jul 2023 23:26:25 +0200
Subject: [PATCH] Fix: message file attachment duplication (#159)

* make send() take ownership of MessageSendSchema

* Remove message file attachment duplication

* Remove superfluous docstrings
---
 src/api/channels/messages.rs | 41 +++++++-----------------------------
 tests/channels.rs            |  3 +--
 tests/messages.rs            | 12 ++++-------
 3 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/src/api/channels/messages.rs b/src/api/channels/messages.rs
index dbffaa8..6beec7f 100644
--- a/src/api/channels/messages.rs
+++ b/src/api/channels/messages.rs
@@ -6,34 +6,22 @@ use serde_json::to_string;
 use crate::api::LimitType;
 use crate::instance::UserMeta;
 use crate::ratelimiter::ChorusRequest;
-use crate::types::{Message, MessageSendSchema, PartialDiscordFileAttachment, Snowflake};
+use crate::types::{Message, MessageSendSchema, Snowflake};
 
 impl Message {
-    /**
-    Sends a message to the Spacebar server.
-    # Arguments
-    * `url_api` - The URL of the Spacebar server's API.
-    * `message` - The [`Message`] that will be sent to the Spacebar server.
-    * `limits_user` - The [`Limits`] of the user.
-    * `limits_instance` - The [`Limits`] of the instance.
-    * `requester` - The [`LimitedRequester`] that will be used to make requests to the Spacebar server.
-    # Errors
-    * [`ChorusLibError`] - If the message cannot be sent.
-     */
     pub async fn send(
         user: &mut UserMeta,
         channel_id: Snowflake,
-        message: &mut MessageSendSchema,
-        files: Option<Vec<PartialDiscordFileAttachment>>,
+        mut message: MessageSendSchema,
     ) -> Result<Message, crate::errors::ChorusError> {
         let url_api = user.belongs_to.borrow().urls.api.clone();
 
-        if files.is_none() {
+        if message.attachments.is_none() {
             let chorus_request = ChorusRequest {
                 request: Client::new()
                     .post(format!("{}/channels/{}/messages/", url_api, channel_id))
                     .bearer_auth(user.token())
-                    .body(to_string(message).unwrap()),
+                    .body(to_string(&message).unwrap()),
                 limit_type: LimitType::Channel(channel_id),
             };
             chorus_request.deserialize_response::<Message>(user).await
@@ -42,12 +30,12 @@ impl Message {
                 attachment.get_mut(index).unwrap().set_id(index as i16);
             }
             let mut form = reqwest::multipart::Form::new();
-            let payload_json = to_string(message).unwrap();
+            let payload_json = to_string(&message).unwrap();
             let payload_field = reqwest::multipart::Part::text(payload_json);
 
             form = form.part("payload_json", payload_field);
 
-            for (index, attachment) in files.unwrap().into_iter().enumerate() {
+            for (index, attachment) in message.attachments.unwrap().into_iter().enumerate() {
                 let (attachment_content, current_attachment) = attachment.move_content();
                 let (attachment_filename, _) = current_attachment.move_filename();
                 let part_name = format!("files[{}]", index);
@@ -78,24 +66,11 @@ impl Message {
 }
 
 impl UserMeta {
-    /// Shorthand call for Message::send()
-    /**
-    Sends a message to the Spacebar server.
-    # Arguments
-    * `url_api` - The URL of the Spacebar server's API.
-    * `message` - The [`Message`] that will be sent to the Spacebar server.
-    * `limits_user` - The [`Limits`] of the user.
-    * `limits_instance` - The [`Limits`] of the instance.
-    * `requester` - The [`LimitedRequester`] that will be used to make requests to the Spacebar server.
-    # Errors
-    * [`ChorusLibError`] - If the message cannot be sent.
-     */
     pub async fn send_message(
         &mut self,
-        message: &mut MessageSendSchema,
+        message: MessageSendSchema,
         channel_id: Snowflake,
-        files: Option<Vec<PartialDiscordFileAttachment>>,
     ) -> Result<Message, crate::errors::ChorusError> {
-        Message::send(self, channel_id, message, files).await
+        Message::send(self, channel_id, message).await
     }
 }
diff --git a/tests/channels.rs b/tests/channels.rs
index 31bc543..e2838be 100644
--- a/tests/channels.rs
+++ b/tests/channels.rs
@@ -89,12 +89,11 @@ async fn get_channel_messages() {
         let _ = bundle
             .user
             .send_message(
-                &mut MessageSendSchema {
+                MessageSendSchema {
                     content: Some("A Message!".to_string()),
                     ..Default::default()
                 },
                 bundle.channel.id,
-                None,
             )
             .await
             .unwrap();
diff --git a/tests/messages.rs b/tests/messages.rs
index 94f3734..af6ee5b 100644
--- a/tests/messages.rs
+++ b/tests/messages.rs
@@ -8,13 +8,13 @@ mod common;
 #[tokio::test]
 async fn send_message() {
     let mut bundle = common::setup().await;
-    let mut message = types::MessageSendSchema {
+    let message = types::MessageSendSchema {
         content: Some("A Message!".to_string()),
         ..Default::default()
     };
     let _ = bundle
         .user
-        .send_message(&mut message, bundle.channel.id, None)
+        .send_message(message, bundle.channel.id)
         .await
         .unwrap();
     common::teardown(bundle).await
@@ -45,7 +45,7 @@ async fn send_message_attachment() {
         content: buffer,
     };
 
-    let mut message = types::MessageSendSchema {
+    let message = types::MessageSendSchema {
         content: Some("trans rights now".to_string()),
         attachments: Some(vec![attachment.clone()]),
         ..Default::default()
@@ -55,11 +55,7 @@ async fn send_message_attachment() {
     let _arg = Some(&vec_attach);
     bundle
         .user
-        .send_message(
-            &mut message,
-            bundle.channel.id,
-            Some(vec![attachment.clone()]),
-        )
+        .send_message(message, bundle.channel.id)
         .await
         .unwrap();
     common::teardown(bundle).await