switch out askama

kitsune-soc · Nov 29, 2024 · 86b61da · 86b61da
1 parent 5becbfe
commit 86b61da
Show file tree

Hide file tree

Showing 47 changed files with 390 additions and 321 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -116,6 +116,7 @@ hickory-resolver = { version = "0.25.0-alpha.4", default-features = false, featu
 ] }
 iso8601-timestamp = "0.3.1"
 itertools = { version = "0.13.0", default-features = false }
+minijinja = { version = "2.5.0", features = ["loader"] }
 moka = { version = "=0.12.7", features = ["sync"] }
 simdutf8 = { version = "0.1.5", features = ["aarch64_neon"] }
 sonic-rs = "=0.3.14"

diff --git a/crates/kitsune-activitypub/Cargo.toml b/crates/kitsune-activitypub/Cargo.toml
@@ -8,35 +8,35 @@ license.workspace = true
 [dependencies]
 async-trait = "0.1.83"
 base64-simd = "0.8.0"
-diesel = { workspace = true }
-diesel-async = { workspace = true }
+diesel.workspace = true
+diesel-async.workspace = true
 futures-util = "0.3.31"
 headers = "0.4.0"
 http = "1.1.0"
-iso8601-timestamp = { workspace = true }
-kitsune-cache = { workspace = true }
-kitsune-config = { workspace = true }
-kitsune-core = { workspace = true }
-kitsune-db = { workspace = true }
-kitsune-embed = { workspace = true }
-kitsune-error = { workspace = true }
-kitsune-federation-filter = { workspace = true }
-kitsune-http-client = { workspace = true }
-kitsune-language = { workspace = true }
-kitsune-search = { workspace = true }
-kitsune-service = { workspace = true }
-kitsune-type = { workspace = true }
-kitsune-url = { workspace = true }
-kitsune-util = { workspace = true }
-kitsune-wasm-mrf = { workspace = true }
+iso8601-timestamp.workspace = true
+kitsune-cache.workspace = true
+kitsune-config.workspace = true
+kitsune-core.workspace = true
+kitsune-db.workspace = true
+kitsune-embed.workspace = true
+kitsune-error.workspace = true
+kitsune-federation-filter.workspace = true
+kitsune-http-client.workspace = true
+kitsune-language.workspace = true
+kitsune-search.workspace = true
+kitsune-service.workspace = true
+kitsune-type.workspace = true
+kitsune-url.workspace = true
+kitsune-util.workspace = true
+kitsune-wasm-mrf.workspace = true
 mime = "0.3.17"
 mime_guess = { version = "2.0.5", default-features = false }
 serde = "1.0.215"
 sha2 = "0.10.8"
-sonic-rs = { workspace = true }
-speedy-uuid = { workspace = true }
+sonic-rs.workspace = true
+speedy-uuid.workspace = true
 tracing = "0.1.41"
-triomphe = { workspace = true }
+triomphe.workspace = true
 typed-builder = "0.20.0"
 url = "2.5.4"
 
@@ -46,9 +46,9 @@ sha2 = { version = "0.10.8", features = ["asm"] }
 [dev-dependencies]
 http-body-util = "0.1.2"
 hyper = "1.5.1"
-kitsune-config = { workspace = true }
-kitsune-test = { workspace = true }
-kitsune-webfinger = { workspace = true }
+kitsune-config.workspace = true
+kitsune-test.workspace = true
+kitsune-webfinger.workspace = true
 pretty_assertions = "1.4.1"
 tokio = { workspace = true, features = ["macros"] }
 tower = { version = "0.5.1", default-features = false, features = ["util"] }

diff --git a/crates/kitsune-cache/Cargo.toml b/crates/kitsune-cache/Cargo.toml
@@ -7,13 +7,13 @@ license.workspace = true
 
 [dependencies]
 enum_dispatch = "0.3.13"
-fred = { workspace = true }
-kitsune-error = { workspace = true }
-moka = { workspace = true }
+fred.workspace = true
+kitsune-error.workspace = true
+moka.workspace = true
 serde = "1.0.215"
-sonic-rs = { workspace = true }
+sonic-rs.workspace = true
 tracing = "0.1.41"
-triomphe = { workspace = true }
+triomphe.workspace = true
 typed-builder = "0.20.0"
 
 [dev-dependencies]

diff --git a/crates/kitsune-captcha/Cargo.toml b/crates/kitsune-captcha/Cargo.toml
@@ -8,11 +8,11 @@ license.workspace = true
 [dependencies]
 enum_dispatch = "0.3.13"
 http = "1.1.0"
-kitsune-error = { workspace = true }
-kitsune-http-client = { workspace = true }
+kitsune-error.workspace = true
+kitsune-http-client.workspace = true
 serde = { version = "1.0.215", features = ["derive"] }
 serde_urlencoded = "0.7.1"
-sonic-rs = { workspace = true }
+sonic-rs.workspace = true
 strum = { version = "0.26.3", features = ["derive"] }
 typed-builder = "0.20.0"
 

diff --git a/crates/kitsune-core/Cargo.toml b/crates/kitsune-core/Cargo.toml
@@ -9,11 +9,11 @@ license.workspace = true
 async-trait = "0.1.83"
 const_format = "0.2.33"
 git-version = "0.3.9"
-kitsune-db = { workspace = true }
-kitsune-error = { workspace = true }
+kitsune-db.workspace = true
+kitsune-error.workspace = true
 paste = "1.0.15"
 serde = { version = "1.0.215", features = ["derive"] }
-triomphe = { workspace = true }
+triomphe.workspace = true
 typed-builder = "0.20.0"
 unsize = "1.1.0"
 

diff --git a/crates/kitsune-db/Cargo.toml b/crates/kitsune-db/Cargo.toml
@@ -8,18 +8,18 @@ build = "build.rs"
 
 [dependencies]
 blowocking = { workspace = true, features = ["io"] }
-diesel = { workspace = true }
-diesel-async = { workspace = true }
-diesel_full_text_search = { workspace = true }
+diesel.workspace = true
+diesel-async.workspace = true
+diesel_full_text_search.workspace = true
 diesel_migrations = "2.2.0"
 futures-util = { version = "0.3.31", default-features = false, features = [
     "alloc",
 ] }
 iso8601-timestamp = { workspace = true, features = ["diesel-pg"] }
-kitsune-config = { workspace = true }
-kitsune-error = { workspace = true }
-kitsune-language = { workspace = true }
-kitsune-type = { workspace = true }
+kitsune-config.workspace = true
+kitsune-error.workspace = true
+kitsune-language.workspace = true
+kitsune-type.workspace = true
 num-derive = "0.4.2"
 num-traits = "0.2.19"
 rustls = { version = "0.23.19", default-features = false, features = [
@@ -30,18 +30,18 @@ rustls = { version = "0.23.19", default-features = false, features = [
 ] }
 rustls-native-certs = "0.8.1"
 serde = { version = "1.0.215", features = ["derive"] }
-sonic-rs = { workspace = true }
+sonic-rs.workspace = true
 speedy-uuid = { workspace = true, features = ["diesel"] }
 tokio = { workspace = true, features = ["rt"] }
 tokio-postgres = "0.7.12"
 tokio-postgres-rustls = "0.13.0"
 tracing = "0.1.41"
 tracing-log = "0.2.0"
-trials = { workspace = true }
+trials.workspace = true
 typed-builder = "0.20.0"
 
 [dev-dependencies]
-kitsune-test = { workspace = true }
+kitsune-test.workspace = true
 tokio = { workspace = true, features = ["macros"] }
 
 [lints]

diff --git a/crates/kitsune-derive/Cargo.toml b/crates/kitsune-derive/Cargo.toml
@@ -7,7 +7,7 @@ license.workspace = true
 
 [dependencies]
 kitsune-derive-impl = { path = "impl" }
-triomphe = { workspace = true }
+triomphe.workspace = true
 typed-builder = "0.20.0"
 
 [lints]

diff --git a/crates/kitsune-email/Cargo.toml b/crates/kitsune-email/Cargo.toml
@@ -9,14 +9,14 @@ license.workspace = true
 ignored = ["askama_axum"] # See reason below.
 
 [dependencies]
-askama = { workspace = true }
+askama.workspace = true
 askama_axum = "0.4.0" # Damn it, cargo. Because "kitsune" uses "askama" with the axum feature, we have to have the crate available here as well..
-diesel = { workspace = true }
-diesel-async = { workspace = true }
-kitsune-db = { workspace = true }
-kitsune-derive = { workspace = true }
-kitsune-error = { workspace = true }
-kitsune-url = { workspace = true }
+diesel.workspace = true
+diesel-async.workspace = true
+kitsune-db.workspace = true
+kitsune-derive.workspace = true
+kitsune-error.workspace = true
+kitsune-url.workspace = true
 lettre = { version = "0.11.10", default-features = false, features = [
     "builder",
     "hostname",
@@ -30,8 +30,8 @@ mrml = { version = "4.0.1", default-features = false, features = [
     "parse",
     "render",
 ] }
-speedy-uuid = { workspace = true }
-triomphe = { workspace = true }
+speedy-uuid.workspace = true
+triomphe.workspace = true
 typed-builder = "0.20.0"
 
 [lints]

diff --git a/crates/kitsune-embed/Cargo.toml b/crates/kitsune-embed/Cargo.toml
@@ -6,16 +6,16 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
-diesel = { workspace = true }
-diesel-async = { workspace = true }
+diesel.workspace = true
+diesel-async.workspace = true
 http = "1.1.0"
-iso8601-timestamp = { workspace = true }
-kitsune-db = { workspace = true }
-kitsune-derive = { workspace = true }
-kitsune-error = { workspace = true }
-kitsune-http-client = { workspace = true }
+iso8601-timestamp.workspace = true
+kitsune-db.workspace = true
+kitsune-derive.workspace = true
+kitsune-error.workspace = true
+kitsune-http-client.workspace = true
 lantern-client-sdk = { package = "client-sdk", git = "https://github.com/Lantern-chat/client-sdk-rs.git", rev = "efb4288d9b107b48609802193d57b29f7ae395a1", default-features = false }
-schaber = { workspace = true }
+schaber.workspace = true
 smol_str = "0.3.2"
 
 [lints]

diff --git a/crates/kitsune-error/Cargo.toml b/crates/kitsune-error/Cargo.toml
@@ -8,9 +8,9 @@ license.workspace = true
 [dependencies]
 axum-core = "0.4.5"
 eyre = "0.6.12"
-garde = { workspace = true }
+garde.workspace = true
 http = "1.1.0"
-sonic-rs = { workspace = true }
+sonic-rs.workspace = true
 sync_wrapper = "1.0.2"
 tracing = "0.1.41"
 

diff --git a/crates/kitsune-federation-filter/Cargo.toml b/crates/kitsune-federation-filter/Cargo.toml
@@ -7,10 +7,10 @@ license.workspace = true
 
 [dependencies]
 globset = "0.4.15"
-kitsune-config = { workspace = true }
-kitsune-derive = { workspace = true }
-kitsune-error = { workspace = true }
-kitsune-type = { workspace = true }
+kitsune-config.workspace = true
+kitsune-derive.workspace = true
+kitsune-error.workspace = true
+kitsune-type.workspace = true
 url = "2.5.4"
 
 [lints]

diff --git a/crates/kitsune-federation/Cargo.toml b/crates/kitsune-federation/Cargo.toml
@@ -6,20 +6,20 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
-kitsune-activitypub = { workspace = true }
-kitsune-cache = { workspace = true }
-kitsune-config = { workspace = true }
-kitsune-core = { workspace = true }
-kitsune-db = { workspace = true }
-kitsune-embed = { workspace = true }
-kitsune-federation-filter = { workspace = true }
+kitsune-activitypub.workspace = true
+kitsune-cache.workspace = true
+kitsune-config.workspace = true
+kitsune-core.workspace = true
+kitsune-db.workspace = true
+kitsune-embed.workspace = true
+kitsune-federation-filter.workspace = true
 kitsune-http-client.workspace = true
-kitsune-search = { workspace = true }
-kitsune-service = { workspace = true }
-kitsune-url = { workspace = true }
-kitsune-wasm-mrf = { workspace = true }
-kitsune-webfinger = { workspace = true }
-triomphe = { workspace = true }
+kitsune-search.workspace = true
+kitsune-service.workspace = true
+kitsune-url.workspace = true
+kitsune-wasm-mrf.workspace = true
+kitsune-webfinger.workspace = true
+triomphe.workspace = true
 typed-builder = "0.20.0"
 
 [lints]