createNewUser now returns a User(not payload::NewUser)

server/src/main.rs

@@ -20,6 +20,8 @@ mod schema;
 mod models;
 mod invites;
 mod payload;
+mod rand_utils;
+mod users;
 
 use invites::*;
 

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,
     }
-}
+}