From 96ace34137a04fb94ce43e36e8e825418a516a18 Mon Sep 17 00:00:00 2001
From: bitfl0wer <florian@pro-weber.com>
Date: Mon, 29 May 2023 23:46:43 +0200
Subject: [PATCH] Refactor create() and get()

---
 src/api/guilds/guilds.rs | 32 ++++++++++++++++++++++----------
 tests/common/mod.rs      |  4 +---
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/api/guilds/guilds.rs b/src/api/guilds/guilds.rs
index e153f09..02bf58d 100644
--- a/src/api/guilds/guilds.rs
+++ b/src/api/guilds/guilds.rs
@@ -29,10 +29,8 @@ impl Guild {
         user: &mut UserMeta,
         guild_create_schema: GuildCreateSchema,
     ) -> Result<Guild, crate::errors::InstanceServerError> {
-        let belongs_to = user.belongs_to.borrow_mut();
+        let mut belongs_to = user.belongs_to.borrow_mut();
         let url = format!("{}/guilds/", belongs_to.urls.get_api());
-        let mut limits_user = user.limits.get_as_mut();
-        let mut limits_instance = &mut user.belongs_to.borrow_mut().limits;
         let request = reqwest::Client::new()
             .post(url.clone())
             .bearer_auth(user.token.clone())
@@ -42,8 +40,8 @@ impl Guild {
             .send_request(
                 request,
                 crate::api::limits::LimitType::Guild,
-                limits_instance,
-                limits_user,
+                &mut belongs_to.limits,
+                &mut user.limits,
             )
             .await
         {
@@ -51,12 +49,12 @@ impl Guild {
             Err(e) => return Err(e),
         };
         let id: GuildCreateResponse = from_str(&result.text().await.unwrap()).unwrap();
-        let guild = Guild::get(
-            belongs_to.urls.get_api(),
+        let guild = Guild::_get(
+            belongs_to.clone().urls.get_api(),
             &id.id,
             &user.token,
-            &mut limits_user,
-            &mut limits_instance,
+            &mut user.limits,
+            &mut belongs_to.limits,
         )
         .await
         .unwrap();
@@ -210,7 +208,21 @@ impl Guild {
     /// * `limits_user` - A mutable reference to a `Limits` struct containing the user's rate limits.
     /// * `limits_instance` - A mutable reference to a `Limits` struct containing the instance's rate limits.
     ///
-    pub async fn get(
+    pub async fn get(user: &mut UserMeta, guild_id: &str) -> Result<Guild, InstanceServerError> {
+        let mut belongs_to = user.belongs_to.borrow_mut();
+        Guild::_get(
+            &format!("{}", belongs_to.urls.get_api()),
+            guild_id,
+            &user.token,
+            &mut user.limits,
+            &mut belongs_to.limits,
+        )
+        .await
+    }
+
+    /// For internal use. Does the same as the public get method, but does not require a second, mutable
+    /// borrow of `UserMeta::belongs_to`, when used in conjunction with other methods, which borrow `UserMeta::belongs_to`.
+    async fn _get(
         url_api: &str,
         guild_id: &str,
         token: &str,
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index 61fb2fc..2bb0883 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -65,9 +65,7 @@ pub async fn setup() -> TestBundle {
         video_quality_mode: None,
     };
     let mut user = instance.register_account(&reg).await.unwrap();
-    let guild = Guild::create(&mut user, urls.get_api(), guild_create_schema)
-        .await
-        .unwrap();
+    let guild = Guild::create(&mut user, guild_create_schema).await.unwrap();
     let channel = Channel::create(
         &user.token,
         urls.get_api(),