diff --git a/server-api/src/invites.rs b/server-api/src/invites.rs index 98a0d9a..226d3e6 100644 --- a/server-api/src/invites.rs +++ b/server-api/src/invites.rs @@ -12,7 +12,8 @@ use chrono::Utc; use db::{UBigInt, BigInt}; use db::common::FromDB; -use crate::members::{self, Member}; +use db::member::Member; + #[derive(Serialize)] struct Invite { @@ -60,15 +61,24 @@ async fn use_invite(pool: &Pool, code: Option) -> Option{ /* * Attempts to change the state of the current invite being provided */ + use crate::auth; use crate::perms::GENERAL_NEW; let id = match code { Some(id) => id, None => 0 }; + // some random comment if valid_invite(pool, id).await { - match members::insert_new_member(pool, "Anonymous".into(), GENERAL_NEW).await { - Ok(member) => return Some(member), + let secret = auth::generate_secret(); + return match db::member::Member::add(pool, "Anonymous".into(), &secret, GENERAL_NEW).await { + Ok(response) => { + match response { + db::Response::Row(member) => Some(member), + _ => None, + } + }, + // TODO: logggin or something idk Err(_) => return None } } @@ -85,7 +95,6 @@ pub async fn join(pool: &Pool, response: &mut Response, params: Value) { Some(val) => val.as_i64(), None => None }; - match use_invite(&pool, code).await { Some(new_account) => *response.body_mut() = Body::from(serde_json::to_string(&new_account).unwrap()), None => {