feat(delta): test harness for web server

crates/core/config/src/lib.rs

@@ -8,14 +8,16 @@ use serde::Deserialize;
 
 static CONFIG_BUILDER: Lazy<RwLock<Config>> = Lazy::new(|| {
     RwLock::new({
-        Config::builder()
-            .add_source(File::from_str(
-                include_str!("../Revolt.toml"),
-                FileFormat::Toml,
-            ))
-            .add_source(File::new("revolt.toml", FileFormat::Toml))
-            .build()
-            .unwrap()
+        let mut builder = Config::builder().add_source(File::from_str(
+            include_str!("../Revolt.toml"),
+            FileFormat::Toml,
+        ));
+
+        if std::path::Path::new("revolt.toml").exists() {
+            builder = builder.add_source(File::new("revolt.toml", FileFormat::Toml));
+        }
+
+        builder.build().unwrap()
     })
 });
 

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

@@ -134,7 +134,7 @@ mod tests {
                 id: webhook_id.to_string(),
                 name: "Webhook Name".to_string(),
                 channel_id: channel_id.to_string(),
-                avatar: Some(Default::default()),
+                avatar: None,
                 ..Default::default()
             };
 

crates/core/database/src/tasks/web_push.rs

@@ -2,12 +2,12 @@ use std::collections::HashSet;
 
 use authifier::Database;
 use base64::{
-    alphabet,
     engine::{self},
     Engine as _,
 };
 use deadqueue::limited::Queue;
 use once_cell::sync::Lazy;
+use revolt_config::config;
 use revolt_presence::filter_online;
 use web_push::{
     ContentEncoding, IsahcWebPushClient, SubscriptionInfo, SubscriptionKeys, VapidSignatureBuilder,
@@ -47,9 +47,10 @@ pub async fn queue(recipients: Vec<String>, payload: String) {
 
 /// Start a new worker
 pub async fn worker(db: Database) {
+    let config = config().await;
     let client = IsahcWebPushClient::new().unwrap();
-    let key = engine::GeneralPurpose::new(&alphabet::URL_SAFE, engine::general_purpose::NO_PAD)
-        .decode(std::env::var("REVOLT_VAPID_PRIVATE_KEY").unwrap())
+    let key = engine::general_purpose::URL_SAFE_NO_PAD
+        .decode(config.api.vapid.private_key)
         .expect("valid `VAPID_PRIVATE_KEY`");
 
     loop {