From c01b8b8c90fa762f25bf52437611643e3ca16e5a Mon Sep 17 00:00:00 2001
From: Tyler Murphy <tylermurphy534@gmail.com>
Date: Sat, 28 Jan 2023 02:51:34 -0500
Subject: fix rerendering logout button, console page

---
 src/types/user.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/types/user.rs')

diff --git a/src/types/user.rs b/src/types/user.rs
index 1213a75..56ef467 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -22,7 +22,7 @@ impl User {
 
     pub fn from_user_id(user_id: u64, hide_password: bool) -> Result<Self> {
         let Ok(Some(user)) = database::users::get_user_by_id(user_id, hide_password) else {
-            return Err(ResponseCode::BadRequest.msg("User does not exist"))
+            return Err(ResponseCode::BadRequest.text("User does not exist"))
         };
 
         Ok(user)
@@ -39,14 +39,14 @@ impl User {
 
     pub fn from_user_page(page: u64) -> Result<Vec<Self>> {
         let Ok(users) = database::users::get_user_page(page, true) else {
-            return Err(ResponseCode::BadRequest.msg("Failed to fetch users"))
+            return Err(ResponseCode::BadRequest.text("Failed to fetch users"))
         };
         Ok(users)
     }
 
     pub fn from_email(email: &str) -> Result<Self> {
         let Ok(Some(user)) = database::users::get_user_by_email(email, false) else {
-            return Err(ResponseCode::BadRequest.msg("User does not exist"))
+            return Err(ResponseCode::BadRequest.text("User does not exist"))
         };
 
         Ok(user)
@@ -54,7 +54,7 @@ impl User {
 
     pub fn from_password(password: &str) -> Result<Self> {
         let Ok(Some(user)) = database::users::get_user_by_password(password, true) else {
-            return Err(ResponseCode::BadRequest.msg("User does not exist"))
+            return Err(ResponseCode::BadRequest.text("User does not exist"))
         };
 
         Ok(user)
@@ -62,15 +62,15 @@ impl User {
 
     pub fn new(firstname: String, lastname: String, email: String, password: String, gender: String, day: u8, month: u8, year: u32) -> Result<Self> {
         if let Ok(_) = User::from_email(&email) {
-            return Err(ResponseCode::BadRequest.msg(&format!("Email is already in use by {}", &email)))
+            return Err(ResponseCode::BadRequest.text(&format!("Email is already in use by {}", &email)))
         }
 
         if let Ok(user) = User::from_password(&password) {
-            return Err(ResponseCode::BadRequest.msg(&format!("Password is already in use by {}", user.email)))
+            return Err(ResponseCode::BadRequest.text(&format!("Password is already in use by {}", user.email)))
         }
         
         let Ok(user) = database::users::add_user(&firstname, &lastname, &email, &password, &gender, day, month, year) else {
-            return Err(ResponseCode::InternalServerError.msg("Failed to create new uesr"))
+            return Err(ResponseCode::InternalServerError.text("Failed to create new uesr"))
         };
 
         Ok(user)
-- 
cgit v1.2.3-freya