shockrah/freechat
shockrah/freechat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

create_new_user no longer checks id column when comparing against unix timestamps

Browse Source
This commit is contained in:
shockrah 2020-05-07 22:14:26 -07:00
parent 383fd59eba
commit cd41dc64c3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/users.rs
View File

@ -5,7 +5,7 @@ use diesel::{self, prelude::*};
use diesel::result::Error; use diesel::result::Error;
use crate::rand_utils::new_key; use crate::rand_utils::new_key;
use crate::models::{User, USER_ONLINE, USER_OFFLINE}; use crate::models::{User, USER_OFFLINE};
use crate::{DBConn, schema}; use crate::{DBConn, schema};
pub fn create_new_user(new_name: String) -> User { pub fn create_new_user(new_name: String) -> User {
@ -20,7 +20,7 @@ pub fn create_new_user(new_name: String) -> User {
name: new_name, name: new_name,
secret: new_key(), secret: new_key(),
date: Utc::now().timestamp() as u64, date: Utc::now().timestamp() as u64,
status: USER_ONLINE, status: USER_OFFLINE,
}; };
// insert the nwe user data then return usable user data to the client // insert the nwe user data then return usable user data to the client
let _inserted_user = diesel::insert_into(users) let _inserted_user = diesel::insert_into(users)
@ -28,10 +28,13 @@ pub fn create_new_user(new_name: String) -> User {
.execute(&conn); .execute(&conn);
let new_user_data : Result<User, diesel::result::Error> = users let new_user_data : Result<User, diesel::result::Error> = users
.filter(id.eq(ins.date)) .filter(date.eq(ins.date))
.first(&conn); .first(&conn);
new_user_data.unwrap() match new_user_data {
Ok(data) => data,
Err(_e) => panic!("User could not be found with date of {}", ins.date)
}
} }