Use compose, disable major parts of application.

This commit is contained in:
Paul Makles
2020-12-28 14:54:34 +00:00
parent 4a95132ee8
commit a91bae2784
9 changed files with 40 additions and 63 deletions

View File

@@ -28,11 +28,11 @@ pub fn get_collection(collection: &str) -> Collection {
pub mod migrations;
pub mod channel;
pub mod guild;
pub mod message;
pub mod mutual;
pub mod permissions;
pub mod user;
// pub mod channel;
// pub mod guild;
// pub mod message;
// pub mod mutual;
// pub mod permissions;
// pub mod user;
pub use permissions::*;
// pub use permissions::*;

View File

@@ -1,17 +1,16 @@
pub use rocket::http::Status;
pub use rocket::response::Redirect;
use rocket::Rocket;
use rocket_contrib::json::JsonValue;
use crate::database::Permission;
// use crate::database::Permission;
// use rocket_contrib::json::JsonValue;
pub mod account;
pub mod channel;
/* pub mod channel;
pub mod guild;
pub mod user; */
pub mod root;
pub mod user;
#[derive(Responder)]
/* #[derive(Responder)]
pub enum Response {
#[response()]
Result(Status),
@@ -63,22 +62,12 @@ impl<'a> Responder<'a, 'static> for Permission {
.sized_body(body.len(), Cursor::new(body))
.ok()
}
}
} */
pub fn mount(rocket: Rocket) -> Rocket {
rocket
.mount("/", routes![root::root, root::teapot])
.mount(
"/account",
routes![
account::create,
account::verify_email,
account::resend_email,
account::login,
account::token,
],
)
.mount(
/*.mount(
"/users",
routes![
user::me,
@@ -128,5 +117,5 @@ pub fn mount(rocket: Rocket) -> Rocket {
guild::ban_member,
guild::unban_member,
],
)
)*/
}

View File

@@ -1,12 +1,12 @@
use super::Response;
use crate::util::variables::{DISABLE_REGISTRATION, HCAPTCHA_SITEKEY, USE_EMAIL, USE_HCAPTCHA};
use rocket_contrib::json::JsonValue;
use mongodb::bson::doc;
/// root
#[get("/")]
pub async fn root() -> Response {
Response::Success(json!({
pub async fn root() -> JsonValue {
json!({
"revolt": "0.3.0-alpha",
"features": {
"registration": !*DISABLE_REGISTRATION,
@@ -16,14 +16,14 @@ pub async fn root() -> Response {
},
"email": *USE_EMAIL,
}
}))
})
}
/// I'm a teapot.
#[delete("/")]
pub async fn teapot() -> Response {
Response::Teapot(json!({
pub async fn teapot() -> JsonValue {
json!({
"teapot": true,
"can_delete": false
}))
})
}