From fb7d667db5bc7583e9ca871f0bd2e5e752cbbaac Mon Sep 17 00:00:00 2001 From: Bailey Townsend Date: Tue, 21 Apr 2026 15:10:37 -0500 Subject: [PATCH] moved back to crates.io releases of jacqaurd --- Cargo.lock | 23 ++++++++++++++++++++--- Cargo.toml | 23 ++++++++++++----------- src/main.rs | 4 +++- src/state.rs | 4 ---- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 26d5d41..9109de1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1886,6 +1886,8 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "jacquard" version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e4bb22329646c06eb07eb63ae6d33320e8f52ae8b5a5444257f27c3d68d44ae" dependencies = [ "bytes", "getrandom 0.2.17", @@ -1913,7 +1915,9 @@ dependencies = [ [[package]] name = "jacquard-api" -version = "0.11.0" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4bba022e9c632f737de481d7c894b5736dd1a503362876ca4da49b9255a7e61" dependencies = [ "jacquard-common", "jacquard-derive", @@ -1926,6 +1930,8 @@ dependencies = [ [[package]] name = "jacquard-axum" version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707649f378c7aaac47a267e1eb95dbcf595fca3b0c949e0e7aa742dec7093cde" dependencies = [ "axum", "bytes", @@ -1938,7 +1944,6 @@ dependencies = [ "serde", "serde_html_form", "serde_json", - "smol_str", "thiserror 2.0.18", "tokio", "tower-http", @@ -1948,6 +1953,8 @@ dependencies = [ [[package]] name = "jacquard-common" version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9631f08f1e65d19e204bc6774d00b4e0b69fb649d7d7ac59ccf97797bd9a196e" dependencies = [ "base64 0.22.1", "bon", @@ -1999,6 +2006,8 @@ dependencies = [ [[package]] name = "jacquard-derive" version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22904bd0f9a959591e14ee9e1dab91a9110209cb8b292930e584134f96a83ece" dependencies = [ "heck 0.5.0", "jacquard-lexicon", @@ -2010,6 +2019,8 @@ dependencies = [ [[package]] name = "jacquard-identity" version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84a9302ea9dd39c49d748a8eba21faf365570088571ff327ebb00117dbd65b8" dependencies = [ "bon", "bytes", @@ -2031,7 +2042,9 @@ dependencies = [ [[package]] name = "jacquard-lexicon" -version = "0.11.0" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd7863d4f56a49f07391b5f775e82be12e6381156642ee83574f481ca73e8b0e" dependencies = [ "cid", "dashmap", @@ -2058,6 +2071,8 @@ dependencies = [ [[package]] name = "jacquard-oauth" version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0b3a8b765b3d3f1890233f9f62dda1b1524d1dc9967c310e5b009b93443776" dependencies = [ "base64 0.22.1", "bytes", @@ -2438,6 +2453,8 @@ dependencies = [ [[package]] name = "mini-moka-wasm" version = "0.10.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0102b9a2ad50fa47ca89eead2316c8222285ecfbd3f69ce99564fbe4253866e8" dependencies = [ "crossbeam-channel", "crossbeam-utils", diff --git a/Cargo.toml b/Cargo.toml index 2899b81..89e62ab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,17 +10,18 @@ dotenvy = "0.15.7" env_logger = "0.11.10" fjall = "3.1.4" futures = "0.3" -# jacquard = "0.11.0" -jacquard = { path = "../jacquard/crates/jacquard" } -# jacquard-api = { version = "0.11.1", features = ["default", "app_bsky"] } -jacquard-api = { path = "../jacquard/crates/jacquard-api", features = ["default", "app_bsky", "streaming"] } -# jacquard-axum = "0.11.0" -jacquard-axum = { path = "../jacquard/crates/jacquard-axum" } -# jacquard-common = "0.11.0" -jacquard-common = { path = "../jacquard/crates/jacquard-common", features = ["websocket", "streaming", "reqwest-client"] } -jacquard-derive = { path = "../jacquard/crates/jacquard-derive" } -# jacquard-identity = { version = "0.11.0", features = ["cache", "dns"] } -jacquard-identity = { path = "../jacquard/crates/jacquard-identity", features = ["cache", "dns"] } +jacquard = "0.11.0" +# jacquard = { path = "../jacquard/crates/jacquard" } +jacquard-api = { version = "0.11.1", features = ["default", "app_bsky", "streaming"] } +# jacquard-api = { path = "../jacquard/crates/jacquard-api", features = ["default", "app_bsky", "streaming"] } +jacquard-axum = "0.11.0" +# jacquard-axum = { path = "../jacquard/crates/jacquard-axum" } +jacquard-common = { version = "0.11.0", features = ["websocket", "streaming", "reqwest-client"] } +# jacquard-common = { path = "../jacquard/crates/jacquard-common", features = ["websocket", "streaming", "reqwest-client"] } +jacquard-derive = "0.11.0" +# jacquard-derive = { path = "../jacquard/crates/jacquard-derive" } +jacquard-identity = { version = "0.11.0", features = ["cache", "dns"] } +# jacquard-identity = { path = "../jacquard/crates/jacquard-identity", features = ["cache", "dns"] } log = "0.4.29" postcard = { version = "1", features = ["alloc"] } reqwest = { version = "0.12.23", features = ["stream", "json"] } diff --git a/src/main.rs b/src/main.rs index 30ac722..375fb3a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -67,7 +67,9 @@ async fn run() -> Result<()> { let app_view_domain = env::var("APP_VIEW_DOMAIN").expect("APP_VIEW_DOMAIN is not set"); let service_did = Did::new_owned(format!("did:web:{app_view_domain}")) .expect("APP_VIEW_DOMAIN produced an invalid did:web"); - let service_auth = ServiceAuthConfig::new(service_did, &["bsky_appview"], resolver.clone()); + // Will need this after the new proposal + // let service_auth = ServiceAuthConfig::new(service_did, &["bsky_appview"], resolver.clone()); + let service_auth = ServiceAuthConfig::new(service_did, resolver.clone()); let data_dir = env::var("CERES_DATA_DIRECTORY").unwrap_or_else(|_| ".ceres_data".to_string()); let db = storage::open(Path::new(&data_dir))?; diff --git a/src/state.rs b/src/state.rs index 235dc3a..74122ea 100644 --- a/src/state.rs +++ b/src/state.rs @@ -34,8 +34,4 @@ impl ServiceAuth for AppState { fn require_lxm(&self) -> bool { ServiceAuth::require_lxm(&self.service_auth) } - - fn allowed_services(&self) -> &[jacquard::deps::smol_str::SmolStr] { - ServiceAuth::allowed_services(&self.service_auth) - } } -- 2.51.2