From 89836449a1318d43921e146041142c5b81c43b88 Mon Sep 17 00:00:00 2001
From: shockrah <alejandros714@protonmail.com>
Date: Sun, 8 Mar 2020 19:50:47 -0700
Subject: [PATCH] createNewUser now returns a User(not payload::NewUser)

---
 server/src/main.rs  |  2 ++
 server/src/users.rs | 13 ++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/server/src/main.rs b/server/src/main.rs
index 5f1c945..583eb5d 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -20,6 +20,8 @@ mod schema;
 mod models;
 mod invites;
 mod payload;
+mod rand_utils;
+mod users;
 
 use invites::*;
 
diff --git a/server/src/users.rs b/server/src/users.rs
index 77837a2..1ff0356 100644
--- a/server/src/users.rs
+++ b/server/src/users.rs
@@ -1,17 +1,16 @@
+use chrono::Utc;
 use crate::rand_utils::{newUserID, newKey};
-use chrono:Utc;
-use payload::NewUserInfo;
-use getrandom::getrandom;
+use crate::models::User;
 
 // Returns a struct of payload::NewUserInfo
-pub fn createNewUser() -> NewUserInfo {
+pub fn createNewUser() -> User {
     let uid = newUserID();
     let uname = format!("User:#{}", uid);
     let rstring = newKey();
-    NewUserInfo {
+    User {
         userid: uid,
         username: uname,
         key: rstring,
-        valid: true,
+        date: Utc::now().timestamp() as u64,
     }
-}
\ No newline at end of file
+}