Merge branch 'main' into svelte5-frontend

kitsune-soc · May 23, 2024 · 54ed269 · 54ed269
2 parents 9065a47 + ef0ed29
commit 54ed269
Show file tree

Hide file tree

Showing 99 changed files with 747 additions and 1,274 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -75,12 +75,91 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
+askama = { version = "0.12.1", default-features = false, features = [
+    "with-axum",
+] }
+clap = { version = "4.5.4", features = ["derive", "wrap_help"] }
+diesel = { version = "2.1.6", default-features = false, features = [
+    "32-column-tables",
+    "with-deprecated",
+] }
+diesel-async = { version = "0.4.1", features = [
+    "async-connection-wrapper",
+    "bb8",
+    "postgres",
+    "tokio",
+] }
+diesel_full_text_search = { version = "2.1.1", default-features = false }
 fred = { version = "9.0.3", features = [
     "enable-rustls-ring",
+    "full-tracing",
     "i-scripts",
-    "partial-tracing",
     "sha-1",
 ] }
+garde = { version = "0.18.0", default-features = false, features = [
+    "derive",
+    "email",
+    "email-idna",
+    "regex",
+    "serde",
+] }
+itertools = { version = "0.13.0", default-features = false }
+moka = { version = "0.12.7", features = ["sync"] }
+simd-json = "0.13.10"
+simdutf8 = { version = "0.1.4", features = ["aarch64_neon"] }
+triomphe = { version = "0.1.11", default-features = false, features = [
+    "unsize",
+] }
+
+# Local workspace dependencies (crate directory)
+kitsune-activitypub = { path = "crates/kitsune-activitypub" }
+kitsune-cache = { path = "crates/kitsune-cache" }
+kitsune-captcha = { path = "crates/kitsune-captcha" }
+kitsune-config = { path = "crates/kitsune-config" }
+kitsune-core = { path = "crates/kitsune-core" }
+kitsune-db = { path = "crates/kitsune-db" }
+kitsune-derive = { path = "crates/kitsune-derive" }
+kitsune-email = { path = "crates/kitsune-email" }
+kitsune-embed = { path = "crates/kitsune-embed" }
+kitsune-error = { path = "crates/kitsune-error" }
+kitsune-federation = { path = "crates/kitsune-federation" }
+kitsune-federation-filter = { path = "crates/kitsune-federation-filter" }
+kitsune-http-client = { path = "crates/kitsune-http-client" }
+kitsune-jobs = { path = "crates/kitsune-jobs" }
+kitsune-language = { path = "crates/kitsune-language" }
+kitsune-mastodon = { path = "crates/kitsune-mastodon" }
+kitsune-observability = { path = "crates/kitsune-observability" }
+kitsune-oidc = { path = "crates/kitsune-oidc" }
+kitsune-s3 = { path = "crates/kitsune-s3" }
+kitsune-scss-compiler = { path = "crates/kitsune-scss-compiler" }
+kitsune-search = { path = "crates/kitsune-search" }
+kitsune-service = { path = "crates/kitsune-service" }
+kitsune-storage = { path = "crates/kitsune-storage" }
+kitsune-test = { path = "crates/kitsune-test" }
+kitsune-type = { path = "crates/kitsune-type" }
+kitsune-url = { path = "crates/kitsune-url" }
+kitsune-util = { path = "crates/kitsune-util" }
+kitsune-wasm-mrf = { path = "crates/kitsune-wasm-mrf" }
+kitsune-webfinger = { path = "crates/kitsune-webfinger" }
+kitsune = { path = "kitsune" }
+kitsune-job-runner = { path = "kitsune-job-runner" }
+
+# Local workspace dependences (lib directory)
+athena = { path = "lib/athena", features = ["redis"] }
+blowocking = { path = "lib/blowocking" }
+cursiv = { path = "lib/cursiv" }
+geomjeungja = { path = "lib/geomjeungja" }
+http-signatures = { path = "lib/http-signatures" }
+just-retry = { path = "lib/just-retry" }
+masto-id-convert = { path = "lib/masto-id-convert" }
+mrf-manifest = { path = "lib/mrf-manifest" }
+post-process = { path = "lib/post-process" }
+speedy-uuid = { path = "lib/speedy-uuid", features = ["serde"] }
+tick-tock-mock = { path = "lib/tick-tock-mock" }
+tower-http-digest = { path = "lib/tower-http-digest" }
+tower-stop-using-brave = { path = "lib/tower-stop-using-brave" }
+tower-x-clacks-overhead = { path = "lib/tower-x-clacks-overhead" }
+trials = { path = "lib/trials" }
 
 [workspace.lints.clippy]
 all = "warn"
@@ -133,6 +212,10 @@ diesel-async = { git = "https://github.com/weiznich/diesel_async.git", rev = "d0
 scraper = { git = "https://github.com/causal-agent/scraper.git", rev = "d67111f5cc0b7da6e6ff10e4549d87cf09ba3e5b" }
 tokio-postgres-rustls = { git = "https://github.com/jbg/tokio-postgres-rustls.git", rev = "b16c1bc0f5d4f91324174fd1bd839d743a70f86a" }
 
+# TCP nodelay for `axum::serve`
+axum = { git = "https://github.com/tokio-rs/axum.git", rev = "8d0c5c05eb75eb779591c8000705e785123868a0" }
+axum-core = { git = "https://github.com/tokio-rs/axum.git", rev = "8d0c5c05eb75eb779591c8000705e785123868a0" }
+
 # Patch to make OpenTelemetry with with hyper 1
 opentelemetry = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "40fb924215c84d6e3818351b2c0e3d2ba01a7db9" }
 opentelemetry-http = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "40fb924215c84d6e3818351b2c0e3d2ba01a7db9" }

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.80"
 base64-simd = "0.8.0"
-diesel = "2.1.6"
-diesel-async = "0.4.1"
+diesel = { workspace = true }
+diesel-async = { workspace = true }
 futures-util = "0.3.30"
 headers = "0.4.0"
 http = "1.1.0"
 iso8601-timestamp = "0.2.17"
-kitsune-cache = { path = "../kitsune-cache" }
-kitsune-config = { path = "../kitsune-config" }
-kitsune-core = { path = "../kitsune-core" }
-kitsune-db = { path = "../kitsune-db" }
-kitsune-embed = { path = "../kitsune-embed" }
-kitsune-error = { path = "../kitsune-error" }
-kitsune-federation-filter = { path = "../kitsune-federation-filter" }
-kitsune-http-client = { path = "../kitsune-http-client" }
-kitsune-language = { path = "../kitsune-language" }
-kitsune-search = { path = "../kitsune-search" }
-kitsune-service = { path = "../kitsune-service" }
-kitsune-type = { path = "../kitsune-type" }
-kitsune-url = { path = "../kitsune-url" }
-kitsune-util = { path = "../kitsune-util" }
-kitsune-wasm-mrf = { path = "../kitsune-wasm-mrf" }
+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.4", default-features = false }
 serde = "1.0.202"
 sha2 = "0.10.8"
-simd-json = "0.13.10"
-speedy-uuid = { path = "../../lib/speedy-uuid" }
+simd-json = { workspace = true }
+speedy-uuid = { workspace = true }
 tracing = "0.1.40"
-triomphe = "0.1.11"
+triomphe = { workspace = true }
 typed-builder = "0.18.2"
 url = "2.5.0"
 
@@ -46,9 +46,9 @@ sha2 = { version = "0.10.8", features = ["asm"] }
 [dev-dependencies]
 http-body-util = "0.1.1"
 hyper = "1.3.1"
-kitsune-config = { path = "../kitsune-config" }
-kitsune-test = { path = "../kitsune-test" }
-kitsune-webfinger = { path = "../kitsune-webfinger" }
+kitsune-config = { workspace = true }
+kitsune-test = { workspace = true }
+kitsune-webfinger = { workspace = true }
 pretty_assertions = "1.4.0"
 tokio = { version = "1.37.0", features = ["macros"] }
 tower = { version = "0.4.13", default-features = false, features = ["util"] }

diff --git a/crates/kitsune-cache/Cargo.toml b/crates/kitsune-cache/Cargo.toml
@@ -8,12 +8,12 @@ license.workspace = true
 [dependencies]
 enum_dispatch = "0.3.13"
 fred = { workspace = true }
-kitsune-error = { path = "../kitsune-error" }
-moka = { version = "0.12.7", features = ["sync"] }
+kitsune-error = { workspace = true }
+moka = { workspace = true }
 serde = "1.0.202"
-simd-json = "0.13.10"
+simd-json = { workspace = true }
 tracing = "0.1.40"
-triomphe = "0.1.11"
+triomphe = { workspace = true }
 typed-builder = "0.18.2"
 
 [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 = { path = "../kitsune-error" }
-kitsune-http-client = { path = "../kitsune-http-client" }
+kitsune-error = { workspace = true }
+kitsune-http-client = { workspace = true }
 serde = { version = "1.0.202", features = ["derive"] }
 serde_urlencoded = "0.7.1"
-simd-json = "0.13.10"
+simd-json = { workspace = true }
 strum = { version = "0.26.2", features = ["derive"] }
 typed-builder = "0.18.2"
 

diff --git a/crates/kitsune-core/Cargo.toml b/crates/kitsune-core/Cargo.toml
@@ -9,11 +9,11 @@ build = "build.rs"
 [dependencies]
 async-trait = "0.1.80"
 const_format = "0.2.32"
-kitsune-db = { path = "../kitsune-db" }
-kitsune-error = { path = "../kitsune-error" }
+kitsune-db = { workspace = true }
+kitsune-error = { workspace = true }
 paste = "1.0.15"
 serde = { version = "1.0.202", features = ["derive"] }
-triomphe = { version = "0.1.11", features = ["unsize"] }
+triomphe = { workspace = true }
 typed-builder = "0.18.2"
 unsize = "1.1.0"
 

diff --git a/crates/kitsune-db/Cargo.toml b/crates/kitsune-db/Cargo.toml
@@ -7,24 +7,19 @@ license.workspace = true
 build = "build.rs"
 
 [dependencies]
-blowocking = { path = "../../lib/blowocking" }
-diesel = { version = "2.1.6", features = ["uuid"] }
-diesel-async = { version = "0.4.1", features = [
-    "async-connection-wrapper",
-    "bb8",
-    "postgres",
-    "tokio",
-] }
-diesel_full_text_search = { version = "2.1.1", default-features = false }
+blowocking = { workspace = true }
+diesel = { workspace = true }
+diesel-async = { workspace = true }
+diesel_full_text_search = { workspace = true }
 diesel_migrations = "2.1.0"
 futures-util = { version = "0.3.30", default-features = false, features = [
     "alloc",
 ] }
 iso8601-timestamp = { version = "0.2.17", features = ["diesel-pg"] }
-kitsune-config = { path = "../kitsune-config" }
-kitsune-error = { path = "../kitsune-error" }
-kitsune-language = { path = "../kitsune-language" }
-kitsune-type = { path = "../kitsune-type" }
+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.7", default-features = false, features = [
@@ -35,18 +30,18 @@ rustls = { version = "0.23.7", default-features = false, features = [
 ] }
 rustls-native-certs = "0.7.0"
 serde = { version = "1.0.202", features = ["derive"] }
-simd-json = "0.13.10"
-speedy-uuid = { path = "../../lib/speedy-uuid", features = ["diesel"] }
+simd-json = { workspace = true }
+speedy-uuid = { workspace = true, features = ["diesel"] }
 tokio = { version = "1.37.0", features = ["rt"] }
 tokio-postgres = "0.7.10"
 tokio-postgres-rustls = "0.12.0"
 tracing = "0.1.40"
 tracing-log = "0.2.0"
-trials = { path = "../../lib/trials" }
+trials = { workspace = true }
 typed-builder = "0.18.2"
 
 [dev-dependencies]
-kitsune-test = { path = "../kitsune-test" }
+kitsune-test = { workspace = true }
 tokio = { version = "1.37.0", 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 = "0.1.11"
+triomphe = { workspace = true }
 typed-builder = "0.18.2"
 
 [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 = "0.12.1"
+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 = "2.1.6"
-diesel-async = "0.4.1"
-kitsune-db = { path = "../kitsune-db" }
-kitsune-derive = { path = "../kitsune-derive" }
-kitsune-error = { path = "../kitsune-error" }
-kitsune-url = { path = "../kitsune-url" }
+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.7", default-features = false, features = [
     "builder",
     "hostname",
@@ -31,8 +31,8 @@ mrml = { version = "3.1.5", default-features = false, features = [
     "parse",
     "render",
 ] }
-speedy-uuid = { path = "../../lib/speedy-uuid" }
-triomphe = "0.1.11"
+speedy-uuid = { workspace = true }
+triomphe = { workspace = true }
 typed-builder = "0.18.2"
 
 [lints]

diff --git a/crates/kitsune-embed/Cargo.toml b/crates/kitsune-embed/Cargo.toml
@@ -6,15 +6,15 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
-diesel = "2.1.6"
-diesel-async = "0.4.1"
+diesel = { workspace = true }
+diesel-async = { workspace = true }
 embed-sdk = { git = "https://github.com/Lantern-chat/embed-service.git", rev = "f46ea95ca89775a6c35d0d5cef9172cbc931258a" }
 http = "1.1.0"
 iso8601-timestamp = "0.2.17"
-kitsune-db = { path = "../kitsune-db" }
-kitsune-derive = { path = "../kitsune-derive" }
-kitsune-error = { path = "../kitsune-error" }
-kitsune-http-client = { path = "../kitsune-http-client" }
+kitsune-db = { workspace = true }
+kitsune-derive = { workspace = true }
+kitsune-error = { workspace = true }
+kitsune-http-client = { workspace = true }
 once_cell = "1.19.0"
 scraper = { version = "0.19.0", default-features = false }
 smol_str = "0.2.2"

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.3"
 eyre = "0.6.12"
-garde = { version = "0.18.0", default-features = false, features = ["serde"] }
+garde = { workspace = true }
 http = "1.1.0"
-simd-json = "0.13.10"
+simd-json = { workspace = true }
 sync_wrapper = "1.0.1"
 tracing = "0.1.40"
 

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.14"
-kitsune-config = { path = "../kitsune-config" }
-kitsune-derive = { path = "../kitsune-derive" }
-kitsune-error = { path = "../kitsune-error" }
-kitsune-type = { path = "../kitsune-type" }
+kitsune-config = { workspace = true }
+kitsune-derive = { workspace = true }
+kitsune-error = { workspace = true }
+kitsune-type = { workspace = true }
 url = "2.5.0"
 
 [lints]

diff --git a/crates/kitsune-federation/Cargo.toml b/crates/kitsune-federation/Cargo.toml
@@ -6,19 +6,19 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
-kitsune-activitypub = { path = "../kitsune-activitypub" }
-kitsune-cache = { path = "../kitsune-cache" }
-kitsune-config = { path = "../kitsune-config" }
-kitsune-core = { path = "../kitsune-core" }
-kitsune-db = { path = "../kitsune-db" }
-kitsune-embed = { path = "../kitsune-embed" }
-kitsune-federation-filter = { path = "../kitsune-federation-filter" }
-kitsune-search = { path = "../kitsune-search" }
-kitsune-service = { path = "../kitsune-service" }
-kitsune-url = { path = "../kitsune-url" }
-kitsune-wasm-mrf = { path = "../kitsune-wasm-mrf" }
-kitsune-webfinger = { path = "../kitsune-webfinger" }
-triomphe = "0.1.11"
+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-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.18.2"
 
 [lints]