From 6ef33c01c758b3b7059f9d78cf9dd138d69a8aa4 Mon Sep 17 00:00:00 2001 From: xystrive Date: Thu, 4 Jul 2024 19:08:38 +0100 Subject: [PATCH] refactor: change `User` object assignements according to changes done in `ChorusUser` --- src/api/auth/login.rs | 2 +- src/api/auth/mod.rs | 2 +- src/api/auth/register.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/auth/login.rs b/src/api/auth/login.rs index 7c58e0e..57c03b7 100644 --- a/src/api/auth/login.rs +++ b/src/api/auth/login.rs @@ -40,7 +40,7 @@ impl Instance { user.settings = login_result.settings; let object = User::get(&mut user, None).await?; - *user.object.write().unwrap() = object; + user.object = Some(Arc::new(RwLock::new(object))); let mut identify = GatewayIdentifyPayload::common(); identify.token = user.token(); diff --git a/src/api/auth/mod.rs b/src/api/auth/mod.rs index 498080e..e8a859c 100644 --- a/src/api/auth/mod.rs +++ b/src/api/auth/mod.rs @@ -29,7 +29,7 @@ impl Instance { let object = User::get(&mut user, None).await?; let settings = User::get_settings(&mut user).await?; - *user.object.write().unwrap() = object; + user.object = Some(Arc::new(RwLock::new(object))); *user.settings.write().unwrap() = settings; let mut identify = GatewayIdentifyPayload::common(); diff --git a/src/api/auth/register.rs b/src/api/auth/register.rs index 6b94a4d..5582b0b 100644 --- a/src/api/auth/register.rs +++ b/src/api/auth/register.rs @@ -49,7 +49,7 @@ impl Instance { let object = User::get(&mut user, None).await?; let settings = User::get_settings(&mut user).await?; - *user.object.write().unwrap() = object; + user.object = Some(Arc::new(RwLock::new(object))); *user.settings.write().unwrap() = settings; let mut identify = GatewayIdentifyPayload::common();