chore: remove quark dependency from delta 🎉

closes #283

fix: allow setting port and use_tls from config
closes #143

crates/core/config/Cargo.toml

@@ -14,6 +14,7 @@ default = ["test"]
 
 [dependencies]
 # Utility
+dotenv = "0.15.0"
 config = "0.13.3"
 cached = "0.44.0"
 once_cell = "1.18.0"
@@ -24,3 +25,10 @@ serde = { version = "1", features = ["derive"] }
 # Async
 futures-locks = "0.7.1"
 async-std = { version = "1.8.0", features = ["attributes"], optional = true }
+
+# Logging
+log = "0.4.14"
+pretty_env_logger = "0.4.0"
+
+# Sentry
+sentry = "0.31.5"

crates/core/config/Revolt.toml

@@ -1,3 +1,5 @@
+sentry_dsn = ""
+
 [database]
 mongodb = "mongodb://database"
 redis = "redis://redis/"
@@ -33,6 +35,7 @@ api_key = ""
 [api.security]
 authifier_shield_key = ""
 voso_legacy_token = ""
+trust_cloudflare = false
 
 [api.security.captcha]
 hcaptcha_key = ""
@@ -42,6 +45,7 @@ hcaptcha_sitekey = ""
 max_concurrent_connections = 50
 
 [features]
+webhooks_enabled = false
 
 [features.limits]
 

crates/core/config/src/lib.rs

@@ -56,6 +56,9 @@ pub struct ApiSmtp {
     pub username: String,
     pub password: String,
     pub from_address: String,
+    pub reply_to: Option<String>,
+    pub port: Option<i32>,
+    pub use_tls: Option<bool>,
 }
 
 #[derive(Deserialize, Debug, Clone)]
@@ -80,6 +83,7 @@ pub struct ApiSecurity {
     pub authifier_shield_key: String,
     pub voso_legacy_token: String,
     pub captcha: ApiSecurityCaptcha,
+    pub trust_cloudflare: bool,
 }
 
 #[derive(Deserialize, Debug, Clone)]
@@ -131,6 +135,7 @@ pub struct FeaturesLimitsCollection {
 #[derive(Deserialize, Debug, Clone)]
 pub struct Features {
     pub limits: FeaturesLimitsCollection,
+    pub webhooks_enabled: bool,
 }
 
 #[derive(Deserialize, Debug, Clone)]
@@ -139,6 +144,31 @@ pub struct Settings {
     pub hosts: Hosts,
     pub api: Api,
     pub features: Features,
+    pub sentry_dsn: String,
+}
+
+impl Settings {
+    pub fn preflight_checks(&self) {
+        if self.api.smtp.host.is_empty() {
+            #[cfg(not(debug_assertions))]
+            if !env::var("REVOLT_UNSAFE_NO_EMAIL").map_or(false, |v| v == *"1") {
+                panic!("Running in production without email is not recommended, set REVOLT_UNSAFE_NO_EMAIL=1 to override.");
+            }
+
+            #[cfg(debug_assertions)]
+            log::warn!("No SMTP settings specified! Remember to configure email.");
+        }
+
+        if self.api.security.captcha.hcaptcha_key.is_empty() {
+            #[cfg(not(debug_assertions))]
+            if !env::var("REVOLT_UNSAFE_NO_CAPTCHA").map_or(false, |v| v == *"1") {
+                panic!("Running in production without CAPTCHA is not recommended, set REVOLT_UNSAFE_NO_CAPTCHA=1 to override.");
+            }
+
+            #[cfg(debug_assertions)]
+            log::warn!("No Captcha key specified! Remember to add hCaptcha key.");
+        }
+    }
 }
 
 pub async fn init() {
@@ -157,6 +187,47 @@ pub async fn config() -> Settings {
     read().await.try_deserialize::<Settings>().unwrap()
 }
 
+/// Configure logging and common Rust variables
+pub async fn setup_logging(release: &'static str) -> Option<sentry::ClientInitGuard> {
+    dotenv::dotenv().ok();
+
+    if std::env::var("RUST_LOG").is_err() {
+        std::env::set_var("RUST_LOG", "info");
+    }
+
+    if std::env::var("ROCKET_ADDRESS").is_err() {
+        std::env::set_var("ROCKET_ADDRESS", "0.0.0.0");
+    }
+
+    pretty_env_logger::init();
+    log::info!("Starting {release}");
+
+    let config = config().await;
+    if config.sentry_dsn.is_empty() {
+        None
+    } else {
+        Some(sentry::init((
+            config.sentry_dsn,
+            sentry::ClientOptions {
+                release: Some(release.into()),
+                ..Default::default()
+            },
+        )))
+    }
+}
+
+#[macro_export]
+macro_rules! configure {
+    () => {
+        let _sentry = $crate::setup_logging(concat!(
+            env!("CARGO_PKG_NAME"),
+            "@",
+            env!("CARGO_PKG_VERSION")
+        ))
+        .await;
+    };
+}
+
 #[cfg(feature = "test")]
 #[cfg(test)]
 mod tests {

crates/core/database/src/models/users/model.rs

@@ -7,7 +7,7 @@ use rand::seq::SliceRandom;
 use revolt_config::config;
 use revolt_models::v0;
 use revolt_presence::filter_online;
-use revolt_result::{create_error, Error, ErrorType, Result};
+use revolt_result::{create_error, Result};
 use ulid::Ulid;
 
 auto_derived_partial!(