Merge branch 'main' into aumetra/db-restructure

Cargo.toml

@@ -97,3 +97,6 @@ targets = [
 ]
 # Publish jobs to run in CI
 pr-run-mode = "plan"
+
+[patch.crates-io]
+diesel-async = { git = "https://github.com/weiznich/diesel_async.git", rev = "017ebe2fb7a2709ab5db92148dea5ce812a35e09" }

crates/kitsune-activitypub/Cargo.toml

@@ -7,7 +7,7 @@ version.workspace = true
 [dependencies]
 async-trait = "0.1.77"
 autometrics = { version = "1.0.0", default-features = false }
-base64-simd = { version = "0.8.0", features = ["unstable"] }
+base64-simd = "0.8.0"
 diesel = "2.1.4"
 diesel-async = "0.4.1"
 futures-util = "0.3.30"
@@ -33,7 +33,7 @@ rsa = "0.9.6"
 scoped-futures = "0.1.3"
 serde = "1.0.195"
 sha2 = "0.10.8"
-simd-json = { version = "0.13.7", features = ["hints"] }
+simd-json = "0.13.8"
 speedy-uuid = { path = "../../lib/speedy-uuid" }
 thiserror = "1.0.56"
 tracing = "0.1.40"

crates/kitsune-cache/Cargo.toml

@@ -10,7 +10,7 @@ enum_dispatch = "0.3.12"
 moka = { version = "0.12.3", features = ["sync"] }
 redis = "0.24.0"
 serde = "1.0.195"
-simd-json = "0.13.7"
+simd-json = "0.13.8"
 thiserror = "1.0.56"
 tracing = "0.1.40"
 typed-builder = "0.18.1"

crates/kitsune-captcha/Cargo.toml

@@ -10,7 +10,7 @@ http = "1.0.0"
 kitsune-http-client = { path = "../kitsune-http-client" }
 serde = { version = "1.0.195", features = ["derive"] }
 serde_urlencoded = "0.7.1"
-simd-json = "0.13.7"
+simd-json = "0.13.8"
 strum = { version = "0.25.0", features = ["derive"] }
 thiserror = "1.0.56"
 typed-builder = "0.18.1"

crates/kitsune-config/src/database.rs

@@ -6,4 +6,6 @@ use smol_str::SmolStr;
 pub struct Configuration {
     pub url: SmolStr,
     pub max_connections: u32,
+    #[serde(default)]
+    pub use_tls: bool,
 }

crates/kitsune-db/Cargo.toml

@@ -6,7 +6,7 @@ edition.workspace = true
 build = "build.rs"
 
 [dependencies]
-diesel = { version = "2.1.4", features = ["nightly-error-messages", "uuid"] }
+diesel = { version = "2.1.4", features = ["uuid"] }
 diesel-async = { version = "0.4.1", features = [
     "async-connection-wrapper",
     "deadpool",
@@ -15,17 +15,27 @@ diesel-async = { version = "0.4.1", features = [
 ] }
 diesel_full_text_search = { version = "2.1.1", default-features = false }
 diesel_migrations = "2.1.0"
+futures-util = { version = "0.3.30", default-features = false, features = [
+    "alloc",
+] }
 iso8601-timestamp = { version = "0.2.16", features = ["diesel-pg"] }
 kitsune-blocking = { path = "../kitsune-blocking" }
+kitsune-config = { path = "../kitsune-config" }
 kitsune-language = { path = "../kitsune-language" }
 kitsune-type = { path = "../kitsune-type" }
 miette = "5.10.0"
 num-derive = "0.4.1"
 num-traits = "0.2.17"
+rustls = "0.22.2"
+rustls-native-certs = "0.7.0"
 serde = { version = "1.0.195", features = ["derive"] }
-simd-json = "0.13.7"
+simd-json = "0.13.8"
 speedy-uuid = { path = "../../lib/speedy-uuid", features = ["diesel"] }
 thiserror = "1.0.56"
+tokio = { version = "1.35.1", features = ["rt"] }
+tokio-postgres = "0.7.10"
+tokio-postgres-rustls = "0.11.1"
+tracing = "0.1.40"
 tracing-log = "0.2.0"
 typed-builder = "0.18.1"