chore: implement invite join and rauth conf

This commit is contained in:
Paul Makles
2022-02-11 11:28:06 +00:00
parent 1988a9501b
commit 249b1161f9
2 changed files with 37 additions and 10 deletions

View File

@@ -24,11 +24,11 @@ use rauth::{
use revolt_quark::DatabaseInfo; use revolt_quark::DatabaseInfo;
use rocket_cors::AllowedOrigins; use rocket_cors::AllowedOrigins;
use std::str::FromStr; use std::str::FromStr;
/*use util::variables::{ use util::variables::{
APP_URL, HCAPTCHA_KEY, INVITE_ONLY, SMTP_FROM, SMTP_HOST, SMTP_PASSWORD, SMTP_USERNAME, APP_URL, HCAPTCHA_KEY, INVITE_ONLY, SMTP_FROM, SMTP_HOST, SMTP_PASSWORD, SMTP_USERNAME,
USE_EMAIL, USE_HCAPTCHA, USE_EMAIL, USE_HCAPTCHA,
}; };
use crate::util::ratelimit::RatelimitState;*/ // use crate::util::ratelimit::RatelimitState;
#[async_std::main] #[async_std::main]
async fn main() { async fn main() {
@@ -76,8 +76,8 @@ async fn launch_web() {
.to_cors() .to_cors()
.expect("Failed to create CORS."); .expect("Failed to create CORS.");
let config = Config { let mut config = Config {
email_verification: /*if *USE_EMAIL { email_verification: if *USE_EMAIL {
EmailVerification::Enabled { EmailVerification::Enabled {
smtp: SMTPSettings { smtp: SMTPSettings {
from: (*SMTP_FROM).to_string(), from: (*SMTP_FROM).to_string(),
@@ -107,11 +107,11 @@ async fn launch_web() {
} }
} else { } else {
EmailVerification::Disabled EmailVerification::Disabled
},*/ EmailVerification::Disabled, },
..Default::default() ..Default::default()
}; };
/*if *INVITE_ONLY { if *INVITE_ONLY {
config.invite_only = true; config.invite_only = true;
} }
@@ -119,7 +119,7 @@ async fn launch_web() {
config.captcha = Captcha::HCaptcha { config.captcha = Captcha::HCaptcha {
secret: HCAPTCHA_KEY.clone(), secret: HCAPTCHA_KEY.clone(),
}; };
}*/ }
let db = DatabaseInfo::Dummy.connect().await.unwrap(); let db = DatabaseInfo::Dummy.connect().await.unwrap();

View File

@@ -1,8 +1,35 @@
use revolt_quark::{Error, Result}; use revolt_quark::{Error, Result, Ref, models::{User, Invite}, Db};
use rocket::serde::json::Value; use rocket::serde::json::Value;
use crate::util::variables::MAX_SERVER_COUNT;
#[post("/<target>")] #[post("/<target>")]
pub async fn req(/*user: UserRef, target: Ref*/ target: String) -> Result<Value> { pub async fn req(db: &Db, user: User, target: Ref) -> Result<Value> {
todo!() if user.bot.is_some() {
return Err(Error::IsBot)
}
if !user.can_acquire_server(db).await? {
return Err(Error::TooManyServers {
max: *MAX_SERVER_COUNT
})
}
let invite = target.as_invite(db).await?;
match &invite {
Invite::Server { channel, server, .. } => {
let channel = db.fetch_channel(channel).await?;
let server = db.fetch_server(server).await?;
db.insert_member(&server.id, &user.id).await?;
Ok(json!({
"type": "Server",
"channel": channel,
"server": server
}))
}
_ => unreachable!()
}
} }