From 4bac730e141d423b96fe8b9256d1b96cf5ed0665 Mon Sep 17 00:00:00 2001
From: bitfl0wer <florian@pro-weber.com>
Date: Mon, 29 May 2023 17:25:34 +0200
Subject: [PATCH] Implement User methods on User instead of UserMeta

---
 src/api/users/users.rs | 101 ++++++++++++++++++++++++-----------------
 1 file changed, 60 insertions(+), 41 deletions(-)

diff --git a/src/api/users/users.rs b/src/api/users/users.rs
index 098a92f..dacff1f 100644
--- a/src/api/users/users.rs
+++ b/src/api/users/users.rs
@@ -26,30 +26,7 @@ impl UserMeta {
         id: Option<&String>,
         instance_limits: &mut Limits,
     ) -> Result<User, InstanceServerError> {
-        let url: String;
-        if id.is_none() {
-            url = format!("{}/users/@me/", url_api);
-        } else {
-            url = format!("{}/users/{}", url_api, id.unwrap());
-        }
-        let request = reqwest::Client::new().get(url).bearer_auth(token);
-        let mut requester = crate::limit::LimitedRequester::new().await;
-        let mut cloned_limits = instance_limits.clone();
-        match requester
-            .send_request(
-                request,
-                crate::api::limits::LimitType::Ip,
-                instance_limits,
-                &mut cloned_limits,
-            )
-            .await
-        {
-            Ok(result) => {
-                let result_text = result.text().await.unwrap();
-                Ok(serde_json::from_str::<User>(&result_text).unwrap())
-            }
-            Err(e) => Err(e),
-        }
+        User::get(token, url_api, id, instance_limits).await
     }
 
     pub async fn get_settings(
@@ -57,23 +34,7 @@ impl UserMeta {
         url_api: &String,
         instance_limits: &mut Limits,
     ) -> Result<UserSettings, InstanceServerError> {
-        let request: reqwest::RequestBuilder = Client::new()
-            .get(format!("{}/users/@me/settings/", url_api))
-            .bearer_auth(token);
-        let mut cloned_limits = instance_limits.clone();
-        let mut requester = crate::limit::LimitedRequester::new().await;
-        match requester
-            .send_request(
-                request,
-                crate::api::limits::LimitType::Ip,
-                instance_limits,
-                &mut cloned_limits,
-            )
-            .await
-        {
-            Ok(result) => Ok(serde_json::from_str(&result.text().await.unwrap()).unwrap()),
-            Err(e) => Err(e),
-        }
+        User::get_settings(token, url_api, instance_limits).await
     }
 
     /// Modify the current user's `UserObject`.
@@ -153,6 +114,64 @@ impl UserMeta {
     }
 }
 
+impl User {
+    pub async fn get(
+        token: &String,
+        url_api: &String,
+        id: Option<&String>,
+        instance_limits: &mut Limits,
+    ) -> Result<User, InstanceServerError> {
+        let url: String;
+        if id.is_none() {
+            url = format!("{}/users/@me/", url_api);
+        } else {
+            url = format!("{}/users/{}", url_api, id.unwrap());
+        }
+        let request = reqwest::Client::new().get(url).bearer_auth(token);
+        let mut requester = crate::limit::LimitedRequester::new().await;
+        let mut cloned_limits = instance_limits.clone();
+        match requester
+            .send_request(
+                request,
+                crate::api::limits::LimitType::Ip,
+                instance_limits,
+                &mut cloned_limits,
+            )
+            .await
+        {
+            Ok(result) => {
+                let result_text = result.text().await.unwrap();
+                Ok(serde_json::from_str::<User>(&result_text).unwrap())
+            }
+            Err(e) => Err(e),
+        }
+    }
+
+    pub async fn get_settings(
+        token: &String,
+        url_api: &String,
+        instance_limits: &mut Limits,
+    ) -> Result<UserSettings, InstanceServerError> {
+        let request: reqwest::RequestBuilder = Client::new()
+            .get(format!("{}/users/@me/settings/", url_api))
+            .bearer_auth(token);
+        let mut cloned_limits = instance_limits.clone();
+        let mut requester = crate::limit::LimitedRequester::new().await;
+        match requester
+            .send_request(
+                request,
+                crate::api::limits::LimitType::Ip,
+                instance_limits,
+                &mut cloned_limits,
+            )
+            .await
+        {
+            Ok(result) => Ok(serde_json::from_str(&result.text().await.unwrap()).unwrap()),
+            Err(e) => Err(e),
+        }
+    }
+}
+
 impl Instance {
     /**
     Get a user object by id, or get the current user.