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

Change UserMeta::get() to take self instead of Self

This commit is contained in:
bitfl0wer 2023-08-14 00:02:03 +02:00
parent 0f00d5d283
commit 614c7bb2b2
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,8 +21,8 @@ impl UserMeta {
/// # Reference /// # Reference
/// See <https://discord-userdoccers.vercel.app/resources/user#get-user> and /// See <https://discord-userdoccers.vercel.app/resources/user#get-user> and
/// <https://discord-userdoccers.vercel.app/resources/user#get-current-user> /// <https://discord-userdoccers.vercel.app/resources/user#get-current-user>
pub async fn get(user: &mut UserMeta, id: Option<&String>) -> ChorusResult<User> { pub async fn get(&mut self, id: Option<&String>) -> ChorusResult<User> {
User::get(user, id).await User::get(self, id).await
} }
/// Gets the user's settings. /// Gets the user's settings.
@ -56,12 +56,7 @@ impl UserMeta {
request, request,
limit_type: LimitType::default(), limit_type: LimitType::default(),
}; };
let user_updated = chorus_request chorus_request.deserialize_response::<User>(self).await
.deserialize_response::<User>(self)
.await
.unwrap();
self.object = Arc::new(RwLock::new(user_updated.clone()));
Ok(user_updated)
} }
/// Deletes the user from the Instance. /// Deletes the user from the Instance.
@ -104,7 +99,11 @@ impl User {
match chorus_request.send_request(user).await { match chorus_request.send_request(user).await {
Ok(result) => { Ok(result) => {
let result_text = result.text().await.unwrap(); let result_text = result.text().await.unwrap();
Ok(serde_json::from_str::<User>(&result_text).unwrap()) let api_user = serde_json::from_str::<User>(&result_text).unwrap();
user.gateway
.observe(Arc::new(RwLock::new(api_user.clone())))
.await;
Ok(api_user)
} }
Err(e) => Err(e), Err(e) => Err(e),
} }