diff --git a/build.sh b/build.sh deleted file mode 100644 index 55ee6faadfab6ced567b0c1bd803fced46a1e0e4..0000000000000000000000000000000000000000 --- a/build.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -docker build -t revolt --progress plain . \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000000000000000000000000000000000000..316459708f91f9084b109ec73ac5634dc99a8289 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,18 @@ +version: '2' + +services: + database: + image: mongo + restart: always + web: + build: . + environment: + - REVOLT_MONGO_URI=mongodb://localhost + - REVOLT_PUBLIC_URL=https://local.revolt.chat + - REVOLT_USE_EMAIL_VERIFICATION=0 + - REVOLT_UNSAFE_NO_EMAIL=1 + - REVOLT_UNSAFE_NO_CAPTCHA=1 + ports: + - "8000:8000" + - "9999:9999" + restart: unless-stopped diff --git a/monitor.sh b/monitor.sh deleted file mode 100644 index a15e793035972d0ffacb204a1873b216286f8515..0000000000000000000000000000000000000000 --- a/monitor.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -docker logs -f revolt diff --git a/remove.sh b/remove.sh deleted file mode 100644 index 58b9af48509eeddebebc13b585daf595e6e960f6..0000000000000000000000000000000000000000 --- a/remove.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -echo "Removing Revolt container." -docker kill revolt -docker rm revolt diff --git a/run.sh b/run.sh deleted file mode 100644 index 755cc51fb270bdc2e8f0e28a3a870f4b61f1a926..0000000000000000000000000000000000000000 --- a/run.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# Split at \n instead of space. -# https://unix.stackexchange.com/a/39482 -set -f -IFS=' -' - -input=($(egrep -v '^#' .env)) -prepended=(${input[@]/#/-e\"}) -variables=${prepended[@]/%/\"} - -unset IFS -set +f - -echo "Running Revolt in detached mode." -docker run \ - -d \ - --name revolt \ - -p 8000:8000 \ - -p 9000:9000 \ - $variables \ - revolt diff --git a/src/database/mod.rs b/src/database/mod.rs index d894cbd1a45e45849580b21f85db54de852d81d7..118e0fade244359edc445bd56e5f876f7566f966 100644 --- a/src/database/mod.rs +++ b/src/database/mod.rs @@ -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 use permissions::*; +// pub mod channel; +// pub mod guild; +// pub mod message; +// pub mod mutual; +// pub mod permissions; +// pub mod user; + +// pub use permissions::*; diff --git a/src/routes/account.rs b/src/routes/account.disabled.rs similarity index 100% rename from src/routes/account.rs rename to src/routes/account.disabled.rs diff --git a/src/routes/mod.rs b/src/routes/mod.rs index 17e93b4a85010cf31d381e9bd784a55707239d91..07c2b91bb8e1dc8c70daf7bdd80133a2eb748d95 100644 --- a/src/routes/mod.rs +++ b/src/routes/mod.rs @@ -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, ], - ) + )*/ } diff --git a/src/routes/root.rs b/src/routes/root.rs index a6fc7f58956751d422740286e7a67dc5e03f42a1..bcede3cb346436ad0201fa1f8e567a886b27de09 100644 --- a/src/routes/root.rs +++ b/src/routes/root.rs @@ -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 - })) + }) }