From b3eef2a048396295cd770710e4d68ff1e03a40f6 Mon Sep 17 00:00:00 2001 From: reya Date: Wed, 4 Mar 2026 08:34:37 +0700 Subject: [PATCH] only send events to specific relays --- Cargo.lock | 181 ++++++++++++++++++++++------------------ crates/state/src/lib.rs | 35 +++++++- 2 files changed, 133 insertions(+), 83 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 61b4f7a..b783c08 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -220,14 +220,14 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0848bedd08067dca1c02c31cbb371a94ad4f2f8a61a82f2c43d96ec36a395244" +checksum = "e21900ac91937e4d9a51391f3569cd92fc38caea1a2a671d56b39797f3ece61f" dependencies = [ "enumflags2", "futures-channel", "futures-util", - "getrandom 0.4.1", + "getrandom 0.4.2", "serde", "serde_repr", "wayland-backend", @@ -602,9 +602,9 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.16.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9a7b350e3bb1767102698302bc37256cbd48422809984b98d292c40e2579aa9" +checksum = "94bffc006df10ac2a68c83692d734a465f8ee6c5b384d8545a636f81d858f4bf" dependencies = [ "aws-lc-sys", "zeroize", @@ -612,9 +612,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.37.1" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b092fe214090261288111db7a2b2c2118e5a7f30dc2569f1732c4069a6840549" +checksum = "4321e568ed89bb5a7d291a7f37997c2c0df89809d7b6d12062c81ddb54aa782e" dependencies = [ "cc", "cmake", @@ -1200,7 +1200,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "indexmap", "rustc-hash 2.1.1", @@ -1647,7 +1647,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "proc-macro2", "quote", @@ -1921,9 +1921,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "erased-serde" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e8918065695684b2b0702da20382d5ae6065cf3327bc2d6436bd49a71ce9f3" +checksum = "d2add8a07dd6a8d93ff627029c51de145e12686fbc36ecb298ac22e74cf02dec" dependencies = [ "serde", "serde_core", @@ -2477,20 +2477,20 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "r-efi", + "r-efi 5.3.0", "wasip2", "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec" +checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" dependencies = [ "cfg-if", "libc", - "r-efi", + "r-efi 6.0.0", "wasip2", "wasip3", ] @@ -2611,7 +2611,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "anyhow", "async-channel 2.5.0", @@ -2649,7 +2649,7 @@ dependencies = [ "mach2", "media", "metal", - "naga", + "naga 28.0.0", "num_cpus", "objc", "parking", @@ -2690,7 +2690,7 @@ dependencies = [ [[package]] name = "gpui_linux" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -2738,7 +2738,7 @@ dependencies = [ [[package]] name = "gpui_macos" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "anyhow", "async-task", @@ -2780,7 +2780,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -2791,7 +2791,7 @@ dependencies = [ [[package]] name = "gpui_platform" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "console_error_panic_hook", "gpui", @@ -2804,7 +2804,7 @@ dependencies = [ [[package]] name = "gpui_tokio" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "anyhow", "gpui", @@ -2815,7 +2815,7 @@ dependencies = [ [[package]] name = "gpui_util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "anyhow", "log", @@ -2824,13 +2824,14 @@ dependencies = [ [[package]] name = "gpui_web" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "anyhow", "console_error_panic_hook", "futures", "gpui", "gpui_wgpu", + "http_client", "js-sys", "log", "parking_lot", @@ -2847,7 +2848,7 @@ dependencies = [ [[package]] name = "gpui_wgpu" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "anyhow", "bytemuck", @@ -2875,7 +2876,7 @@ dependencies = [ [[package]] name = "gpui_windows" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "anyhow", "collections", @@ -3119,7 +3120,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "anyhow", "async-compression", @@ -3144,7 +3145,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "rustls", "rustls-platform-verifier", @@ -3471,9 +3472,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" +checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" [[package]] name = "iri-string" @@ -3915,7 +3916,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "anyhow", "bindgen", @@ -4033,6 +4034,30 @@ name = "naga" version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "618f667225063219ddfc61251087db8a9aec3c3f0950c916b614e403486f1135" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags 2.11.0", + "cfg-if", + "cfg_aliases", + "codespan-reporting", + "half", + "hashbrown 0.16.1", + "hexf-parse", + "indexmap", + "libm", + "log", + "num-traits", + "once_cell", + "rustc-hash 1.1.0", + "thiserror 2.0.18", + "unicode-ident", +] + +[[package]] +name = "naga" +version = "28.0.1" +source = "git+https://github.com/zed-industries/wgpu?rev=e0f83a6cedc5e0b97da1ebe2d638ad103672e0a2#e0f83a6cedc5e0b97da1ebe2d638ad103672e0a2" dependencies = [ "arrayvec", "bit-set", @@ -4478,7 +4503,7 @@ dependencies = [ "endi", "futures-lite 2.6.1", "futures-util", - "getrandom 0.4.1", + "getrandom 0.4.2", "hkdf", "hmac", "md-5", @@ -4659,7 +4684,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "perf" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "collections", "serde", @@ -5017,12 +5042,9 @@ checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" [[package]] name = "pxfm" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7186d3822593aa4393561d186d1393b3923e9d6163d3fbfd6e825e3e6cf3e6a8" -dependencies = [ - "num-traits", -] +checksum = "b5a041e753da8b807c9255f28de81879c78c876392ff2469cde94799b2896b9d" [[package]] name = "qoi" @@ -5123,9 +5145,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.44" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] @@ -5136,6 +5158,12 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + [[package]] name = "rand" version = "0.8.5" @@ -5365,7 +5393,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "derive_refineable", ] @@ -5464,7 +5492,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "anyhow", "bytes", @@ -5519,7 +5547,7 @@ dependencies = [ [[package]] name = "rope" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "arrayvec", "log", @@ -5781,7 +5809,7 @@ dependencies = [ [[package]] name = "scheduler" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "async-task", "backtrace", @@ -6375,7 +6403,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "arrayvec", "log", @@ -6610,7 +6638,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0" dependencies = [ "fastrand 2.3.0", - "getrandom 0.4.1", + "getrandom 0.4.2", "once_cell", "rustix 1.1.4", "windows-sys 0.61.2", @@ -6792,9 +6820,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.49.0" +version = "1.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" +checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" dependencies = [ "bytes", "libc", @@ -6807,9 +6835,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" +checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c" dependencies = [ "proc-macro2", "quote", @@ -7318,7 +7346,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "anyhow", "async-fs", @@ -7357,7 +7385,7 @@ dependencies = [ [[package]] name = "util_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "perf", "quote", @@ -7370,7 +7398,7 @@ version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b672338555252d43fd2240c714dc444b8c6fb0a5c5335e65a07bba7742735ddb" dependencies = [ - "getrandom 0.4.1", + "getrandom 0.4.2", "js-sys", "serde_core", "sha1_smol", @@ -7807,9 +7835,8 @@ checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" [[package]] name = "wgpu" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cb534d5ffd109c7d1135f34cdae29e60eab94855a625dcfe1705f8bc7ad79f" +version = "28.0.1" +source = "git+https://github.com/zed-industries/wgpu?rev=e0f83a6cedc5e0b97da1ebe2d638ad103672e0a2#e0f83a6cedc5e0b97da1ebe2d638ad103672e0a2" dependencies = [ "arrayvec", "bitflags 2.11.0", @@ -7820,7 +7847,7 @@ dependencies = [ "hashbrown 0.16.1", "js-sys", "log", - "naga", + "naga 28.0.1", "parking_lot", "portable-atomic", "profiling", @@ -7837,9 +7864,8 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb4c8b5db5f00e56f1f08869d870a0dff7c8bc7ebc01091fec140b0cf0211a9" +version = "28.0.1" +source = "git+https://github.com/zed-industries/wgpu?rev=e0f83a6cedc5e0b97da1ebe2d638ad103672e0a2#e0f83a6cedc5e0b97da1ebe2d638ad103672e0a2" dependencies = [ "arrayvec", "bit-set", @@ -7851,7 +7877,7 @@ dependencies = [ "hashbrown 0.16.1", "indexmap", "log", - "naga", + "naga 28.0.1", "once_cell", "parking_lot", "portable-atomic", @@ -7869,36 +7895,32 @@ dependencies = [ [[package]] name = "wgpu-core-deps-apple" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87b7b696b918f337c486bf93142454080a32a37832ba8a31e4f48221890047da" +version = "28.0.1" +source = "git+https://github.com/zed-industries/wgpu?rev=e0f83a6cedc5e0b97da1ebe2d638ad103672e0a2#e0f83a6cedc5e0b97da1ebe2d638ad103672e0a2" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-emscripten" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34b251c331f84feac147de3c4aa3aa45112622a95dd7ee1b74384fa0458dbd79" +version = "28.0.1" +source = "git+https://github.com/zed-industries/wgpu?rev=e0f83a6cedc5e0b97da1ebe2d638ad103672e0a2#e0f83a6cedc5e0b97da1ebe2d638ad103672e0a2" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-windows-linux-android" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ca976e72b2c9964eb243e281f6ce7f14a514e409920920dcda12ae40febaae" +version = "28.0.1" +source = "git+https://github.com/zed-industries/wgpu?rev=e0f83a6cedc5e0b97da1ebe2d638ad103672e0a2#e0f83a6cedc5e0b97da1ebe2d638ad103672e0a2" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-hal" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "293080d77fdd14d6b08a67c5487dfddbf874534bb7921526db56a7b75d7e3bef" +version = "28.0.1" +source = "git+https://github.com/zed-industries/wgpu?rev=e0f83a6cedc5e0b97da1ebe2d638ad103672e0a2#e0f83a6cedc5e0b97da1ebe2d638ad103672e0a2" dependencies = [ "android_system_properties", "arrayvec", @@ -7921,7 +7943,7 @@ dependencies = [ "libloading", "log", "metal", - "naga", + "naga 28.0.1", "ndk-sys", "objc", "once_cell", @@ -7944,9 +7966,8 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e18308757e594ed2cd27dddbb16a139c42a683819d32a2e0b1b0167552f5840c" +version = "28.0.1" +source = "git+https://github.com/zed-industries/wgpu?rev=e0f83a6cedc5e0b97da1ebe2d638ad103672e0a2#e0f83a6cedc5e0b97da1ebe2d638ad103672e0a2" dependencies = [ "bitflags 2.11.0", "bytemuck", @@ -9160,7 +9181,7 @@ dependencies = [ [[package]] name = "zlog" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "anyhow", "chrono", @@ -9177,7 +9198,7 @@ checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" [[package]] name = "ztracing" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" dependencies = [ "tracing", "tracing-subscriber", @@ -9188,7 +9209,7 @@ dependencies = [ [[package]] name = "ztracing_macro" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#4668aeb7284780cca830ba1173c4d3eb8bd11e2b" +source = "git+https://github.com/zed-industries/zed#9c9337a8021f74511625517c3f4fa021106609eb" [[package]] name = "zune-core" diff --git a/crates/state/src/lib.rs b/crates/state/src/lib.rs index ff42195..0c376b2 100644 --- a/crates/state/src/lib.rs +++ b/crates/state/src/lib.rs @@ -3,7 +3,7 @@ use std::os::unix::fs::PermissionsExt; use std::sync::Arc; use std::time::Duration; -use anyhow::{anyhow, Context as AnyhowContext, Error}; +use anyhow::{Context as AnyhowContext, Error, anyhow}; use common::config_dir; use gpui::{App, AppContext, Context, Entity, EventEmitter, Global, SharedString, Task, Window}; use nostr_connect::prelude::*; @@ -311,13 +311,34 @@ impl NostrRegistry { // Get default relay list let relay_list = default_relay_list(); + // Extract write relays + let write_urls: Vec = relay_list + .iter() + .filter_map(|(url, metadata)| { + if metadata.is_none() || metadata == &Some(RelayMetadata::Write) { + Some(url) + } else { + None + } + }) + .cloned() + .collect(); + + // Ensure connected to all relays + for (url, _metadata) in relay_list.iter() { + client.add_relay(url).and_connect().await?; + } + // Publish relay list event let event = EventBuilder::relay_list(relay_list).sign(&signer).await?; - client + let output = client .send_event(&event) + .to(BOOTSTRAP_RELAYS) .ok_timeout(Duration::from_secs(TIMEOUT)) .await?; + log::info!("Sent gossip relay list: {output:?}"); + // Construct the default metadata let name = petname::petname(2, "-").unwrap_or("Cooper".to_string()); let avatar = Url::parse(&format!("https://avatar.vercel.sh/{name}")).unwrap(); @@ -327,6 +348,7 @@ impl NostrRegistry { let event = EventBuilder::metadata(&metadata).sign(&signer).await?; client .send_event(&event) + .to(&write_urls) .ack_policy(AckPolicy::none()) .await?; @@ -337,16 +359,23 @@ impl NostrRegistry { let event = EventBuilder::contact_list(contacts).sign(&signer).await?; client .send_event(&event) + .to(&write_urls) .ack_policy(AckPolicy::none()) .await?; // Construct the default messaging relay list let relays = default_messaging_relays(); + // Ensure connected to all relays + for url in relays.iter() { + client.add_relay(url).and_connect().await?; + } + // Publish messaging relay list event let event = EventBuilder::nip17_relay_list(relays).sign(&signer).await?; client .send_event(&event) + .to(&write_urls) .ack_policy(AckPolicy::none()) .await?; @@ -958,7 +987,7 @@ async fn get_events_for_room(client: &Client, nip65: &Event) -> Result<(), Error fn default_relay_list() -> Vec<(RelayUrl, Option)> { vec![ ( - RelayUrl::parse("wss://relay.gulugulu.moe").unwrap(), + RelayUrl::parse("wss://relay.nostr.net").unwrap(), Some(RelayMetadata::Write), ), (