From 5ddae637f60b33f2ae78e1fb2a0dcd2e54016a78 Mon Sep 17 00:00:00 2001 From: Ren Amamiya Date: Tue, 28 Jul 2026 16:28:05 +0700 Subject: [PATCH] . --- Cargo.lock | 51 ++++++++++++++++++++--------------------- crates/state/src/lib.rs | 5 ++++ desktop/src/main.rs | 2 +- 3 files changed, 31 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 38bb576..10828e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1228,7 +1228,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "gpui_util", "indexmap", @@ -1710,7 +1710,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "proc-macro2", "quote", @@ -2605,7 +2605,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "accesskit", "anyhow", @@ -2687,7 +2687,7 @@ dependencies = [ [[package]] name = "gpui_linux" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "accesskit", "accesskit_unix", @@ -2739,7 +2739,7 @@ dependencies = [ [[package]] name = "gpui_macos" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "accesskit", "accesskit_macos", @@ -2788,7 +2788,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -2799,7 +2799,7 @@ dependencies = [ [[package]] name = "gpui_platform" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "console_error_panic_hook", "gpui", @@ -2812,7 +2812,7 @@ dependencies = [ [[package]] name = "gpui_shared_string" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "schemars", "serde", @@ -2822,7 +2822,7 @@ dependencies = [ [[package]] name = "gpui_tokio" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "anyhow", "gpui", @@ -2833,7 +2833,7 @@ dependencies = [ [[package]] name = "gpui_util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "anyhow", "log", @@ -2843,7 +2843,7 @@ dependencies = [ [[package]] name = "gpui_web" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "anyhow", "console_error_panic_hook", @@ -2855,7 +2855,6 @@ dependencies = [ "log", "parking_lot", "raw-window-handle", - "smallvec", "uuid", "wasm-bindgen", "wasm-bindgen-futures", @@ -2867,7 +2866,7 @@ dependencies = [ [[package]] name = "gpui_wgpu" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "anyhow", "bytemuck", @@ -2897,7 +2896,7 @@ dependencies = [ [[package]] name = "gpui_windows" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "accesskit", "accesskit_windows", @@ -3187,7 +3186,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "anyhow", "async-compression", @@ -3207,7 +3206,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "rustls", "rustls-platform-verifier", @@ -4002,7 +4001,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "anyhow", "bindgen", @@ -4905,7 +4904,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "perf" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "collections", "serde", @@ -5716,7 +5715,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "derive_refineable", ] @@ -5798,7 +5797,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "anyhow", "bytes", @@ -6113,7 +6112,7 @@ dependencies = [ [[package]] name = "scheduler" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "async-task", "backtrace", @@ -6736,7 +6735,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "heapless 0.9.3", "log", @@ -7736,7 +7735,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "util_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "perf", "quote", @@ -9469,7 +9468,7 @@ dependencies = [ [[package]] name = "zlog" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "anyhow", "chrono", @@ -9486,7 +9485,7 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "ztracing" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" dependencies = [ "tracing", "tracing-subscriber", @@ -9497,7 +9496,7 @@ dependencies = [ [[package]] name = "ztracing_macro" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de" +source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54" [[package]] name = "zune-core" diff --git a/crates/state/src/lib.rs b/crates/state/src/lib.rs index 28c3f04..9064300 100644 --- a/crates/state/src/lib.rs +++ b/crates/state/src/lib.rs @@ -222,6 +222,7 @@ impl NostrRegistry { } /// Check the user's credential and set the signer if valid + #[cfg(not(target_arch = "wasm32"))] fn get_user_credential(&mut self, cx: &mut Context) { let user_keyring = cx.read_credentials(USER_KEYRING); let master_keyring = self.get_master_key(cx); @@ -269,6 +270,10 @@ impl NostrRegistry { /// Get the master key that used for Nostr Connect pub fn get_master_key(&self, cx: &App) -> Task { + if cfg!(target_arch = "wasm32") { + return cx.background_spawn(async move { Keys::generate() }); + } + let task = cx.read_credentials(MASTER_KEYRING); cx.spawn(async move |cx| { diff --git a/desktop/src/main.rs b/desktop/src/main.rs index 05c6af5..5b6a5d5 100644 --- a/desktop/src/main.rs +++ b/desktop/src/main.rs @@ -43,7 +43,7 @@ fn main() { }]); // Set up the window bounds - let bounds = Bounds::centered(None, size(px(920.0), px(700.0)), cx); + let bounds = Bounds::centered(None, size(px(960.0), px(720.0)), cx); // Set up the window options let opts = WindowOptions {