kozabrada123/chorus
kozabrada123
/
chorus
mirror of https://github.com/polyphony-chat/chorus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor users.rs to use api::common

This commit is contained in:
Flori Weber 2023-06-11 21:40:03 +02:00
parent 43e62359ae
commit 1910649ac4
No known key found for this signature in database
GPG Key ID: 0ACD574FCF5226CF
1 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/api/users/users.rs
View File

@ -2,7 +2,7 @@ use reqwest::Client;
use serde_json::{from_str, to_string}; use serde_json::{from_str, to_string};
use crate::{ use crate::{
api::limits::Limits, api::{deserialize_response, handle_request_as_option, limits::Limits},
errors::ChorusLibError, errors::ChorusLibError,
instance::{Instance, UserMeta}, instance::{Instance, UserMeta},
limit::LimitedRequester, limit::LimitedRequester,
@ -58,20 +58,10 @@ impl UserMeta {
)) ))
.body(to_string(&modify_schema).unwrap()) .body(to_string(&modify_schema).unwrap())
.bearer_auth(self.token()); .bearer_auth(self.token());
let result = match LimitedRequester::new() let user_updated =
deserialize_response::<User>(request, self, crate::api::limits::LimitType::Ip)
.await .await
.send_request( .unwrap();
request,
crate::api::limits::LimitType::Global,
&mut self.belongs_to.borrow_mut().limits,
&mut self.limits,
)
.await
{
Ok(response) => response,
Err(e) => return Err(e),
};
let user_updated: User = from_str(&result.text().await.unwrap()).unwrap();
let _ = std::mem::replace(&mut self.object, user_updated.clone()); let _ = std::mem::replace(&mut self.object, user_updated.clone());
Ok(user_updated) Ok(user_updated)
} }
@ -86,23 +76,12 @@ impl UserMeta {
/// ///
/// Returns `None` if the user was successfully deleted, or an `ChorusLibError` if an error occurred. /// Returns `None` if the user was successfully deleted, or an `ChorusLibError` if an error occurred.
pub async fn delete(mut self) -> Option<ChorusLibError> { pub async fn delete(mut self) -> Option<ChorusLibError> {
let mut belongs_to = self.belongs_to.borrow_mut(); let belongs_to = self.belongs_to.borrow();
let request = Client::new() let request = Client::new()
.post(format!("{}/users/@me/delete/", belongs_to.urls.get_api())) .post(format!("{}/users/@me/delete/", belongs_to.urls.get_api()))
.bearer_auth(self.token); .bearer_auth(self.token());
match LimitedRequester::new() drop(belongs_to);
.await handle_request_as_option(request, &mut self, crate::api::limits::LimitType::Ip).await
.send_request(
request,
crate::api::limits::LimitType::Global,
&mut belongs_to.limits,
&mut self.limits,
)
.await
{
Ok(_) => None,
Err(e) => Some(e),
}
} }
} }