From 99aa44daa8b737990df38139d22632fce582c32a Mon Sep 17 00:00:00 2001
From: Flori Weber <florian@pro-weber.com>
Date: Sun, 11 Jun 2023 17:40:44 +0200
Subject: [PATCH] Refactor to use api common, return Message instead

---
 src/api/channels/messages.rs | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/api/channels/messages.rs b/src/api/channels/messages.rs
index d511e24..53e53f2 100644
--- a/src/api/channels/messages.rs
+++ b/src/api/channels/messages.rs
@@ -3,6 +3,7 @@ use http::HeaderMap;
 use reqwest::{multipart, Client};
 use serde_json::to_string;
 
+use crate::api::deserialize_response;
 use crate::instance::UserMeta;
 use crate::limit::LimitedRequester;
 use crate::types::{Message, MessageSendSchema, PartialDiscordFileAttachment};
@@ -24,23 +25,17 @@ impl Message {
         channel_id: String,
         message: &mut MessageSendSchema,
         files: Option<Vec<PartialDiscordFileAttachment>>,
-    ) -> Result<reqwest::Response, crate::errors::ChorusLibError> {
-        let mut belongs_to = user.belongs_to.borrow_mut();
-        let url_api = belongs_to.urls.get_api();
-        let mut requester = LimitedRequester::new().await;
+    ) -> Result<Message, crate::errors::ChorusLibError> {
+        let belongs_to = user.belongs_to.borrow_mut();
+        let url_api = belongs_to.urls.get_api().to_string();
+        drop(belongs_to);
 
         if files.is_none() {
-            let message_request = Client::new()
+            let request = Client::new()
                 .post(format!("{}/channels/{}/messages/", url_api, channel_id))
                 .bearer_auth(user.token())
                 .body(to_string(message).unwrap());
-            requester
-                .send_request(
-                    message_request,
-                    crate::api::limits::LimitType::Channel,
-                    &mut belongs_to.limits,
-                    &mut user.limits,
-                )
+            deserialize_response::<Message>(request, user, crate::api::limits::LimitType::Channel)
                 .await
         } else {
             for (index, attachment) in message.attachments.iter_mut().enumerate() {
@@ -70,19 +65,12 @@ impl Message {
                 form = form.part(part_name, part);
             }
 
-            let message_request = Client::new()
+            let request = Client::new()
                 .post(format!("{}/channels/{}/messages/", url_api, channel_id))
                 .bearer_auth(user.token())
                 .multipart(form);
 
-            requester
-                .send_request(
-                    message_request,
-                    crate::api::limits::LimitType::Channel,
-                    &mut belongs_to.limits,
-                    &mut user.limits,
-                )
-                .await
+            deserialize_response(request, user, crate::api::limits::LimitType::Channel).await
         }
     }
 }
@@ -105,7 +93,7 @@ impl UserMeta {
         message: &mut MessageSendSchema,
         channel_id: String,
         files: Option<Vec<PartialDiscordFileAttachment>>,
-    ) -> Result<reqwest::Response, crate::errors::ChorusLibError> {
+    ) -> Result<Message, crate::errors::ChorusLibError> {
         Message::send(self, channel_id, message, files).await
     }
 }