jmug/stoatchat
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Expose voso host.

Browse Source
This commit is contained in:
Paul
2021-04-01 15:11:19 +01:00
parent c9bff789de
commit d2bf477fd8
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@@ -2475,7 +2475,7 @@ dependencies = [
[[package]] [[package]]
name = "revolt" name = "revolt"
version = "0.4.0-alpha.1" version = "0.4.0-alpha.2"
dependencies = [ dependencies = [
"async-std", "async-std",
"async-tungstenite", "async-tungstenite",

2
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "revolt" name = "revolt"
version = "0.4.0-alpha.1" version = "0.4.0-alpha.2"
authors = ["Paul Makles <paulmakles@gmail.com>"] authors = ["Paul Makles <paulmakles@gmail.com>"]
edition = "2018" edition = "2018"

10
src/routes/root.rs
View File

@@ -1,6 +1,6 @@
use crate::util::variables::{ use crate::util::variables::{
AUTUMN_URL, DISABLE_REGISTRATION, EXTERNAL_WS_URL, HCAPTCHA_SITEKEY, INVITE_ONLY, USE_AUTUMN, AUTUMN_URL, DISABLE_REGISTRATION, EXTERNAL_WS_URL, HCAPTCHA_SITEKEY, INVITE_ONLY, USE_AUTUMN, APP_URL,
USE_EMAIL, USE_HCAPTCHA, VAPID_PUBLIC_KEY, USE_VOSO, VOSO_URL USE_EMAIL, USE_HCAPTCHA, VAPID_PUBLIC_KEY, USE_VOSO, VOSO_URL, VOSO_WS_HOST
}; };
use mongodb::bson::doc; use mongodb::bson::doc;
@@ -9,7 +9,7 @@ use rocket_contrib::json::JsonValue;
#[get("/")] #[get("/")]
pub async fn root() -> JsonValue { pub async fn root() -> JsonValue {
json!({ json!({
"revolt": "0.4.0-alpha.1", "revolt": "0.4.0-alpha.2",
"features": { "features": {
"registration": !*DISABLE_REGISTRATION, "registration": !*DISABLE_REGISTRATION,
"captcha": { "captcha": {
@@ -24,10 +24,12 @@ pub async fn root() -> JsonValue {
}, },
"voso": { "voso": {
"enabled": *USE_VOSO, "enabled": *USE_VOSO,
"url": *VOSO_URL "url": *VOSO_URL,
"ws": *VOSO_WS_HOST
} }
}, },
"ws": *EXTERNAL_WS_URL, "ws": *EXTERNAL_WS_URL,
"app": *APP_URL,
"vapid": *VAPID_PUBLIC_KEY "vapid": *VAPID_PUBLIC_KEY
}) })
} }

5
src/util/variables.rs
View File

@@ -12,7 +12,7 @@ lazy_static! {
pub static ref PUBLIC_URL: String = pub static ref PUBLIC_URL: String =
env::var("REVOLT_PUBLIC_URL").expect("Missing REVOLT_PUBLIC_URL environment variable."); env::var("REVOLT_PUBLIC_URL").expect("Missing REVOLT_PUBLIC_URL environment variable.");
pub static ref APP_URL: String = pub static ref APP_URL: String =
env::var("REVOLT_APP_URL").unwrap_or_else(|_| "https://app.revolt.chat".to_string()); env::var("REVOLT_APP_URL").expect("Missing REVOLT_APP_URL environment variable.");
pub static ref EXTERNAL_WS_URL: String = pub static ref EXTERNAL_WS_URL: String =
env::var("REVOLT_EXTERNAL_WS_URL").expect("Missing REVOLT_EXTERNAL_WS_URL environment variable."); env::var("REVOLT_EXTERNAL_WS_URL").expect("Missing REVOLT_EXTERNAL_WS_URL environment variable.");
@@ -20,6 +20,8 @@ lazy_static! {
env::var("AUTUMN_PUBLIC_URL").unwrap_or_else(|_| "https://example.com".to_string()); env::var("AUTUMN_PUBLIC_URL").unwrap_or_else(|_| "https://example.com".to_string());
pub static ref VOSO_URL: String = pub static ref VOSO_URL: String =
env::var("VOSO_PUBLIC_URL").unwrap_or_else(|_| "https://example.com".to_string()); env::var("VOSO_PUBLIC_URL").unwrap_or_else(|_| "https://example.com".to_string());
pub static ref VOSO_WS_HOST: String =
env::var("VOSO_WS_HOST").unwrap_or_else(|_| "wss://example.com".to_string());
pub static ref VOSO_MANAGE_TOKEN: String = pub static ref VOSO_MANAGE_TOKEN: String =
env::var("VOSO_MANAGE_TOKEN").unwrap_or_else(|_| "0".to_string()); env::var("VOSO_MANAGE_TOKEN").unwrap_or_else(|_| "0".to_string());
@@ -62,6 +64,7 @@ lazy_static! {
} }
pub fn preflight_checks() { pub fn preflight_checks() {
format!("{}", *APP_URL);
format!("{}", *MONGO_URI); format!("{}", *MONGO_URI);
format!("{}", *PUBLIC_URL); format!("{}", *PUBLIC_URL);
format!("{}", *EXTERNAL_WS_URL); format!("{}", *EXTERNAL_WS_URL);