reya/n34
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Add the relays for read and write

Browse Source 
Signed-off-by: Awiteb <a@4rs.nl>
This commit is contained in:
Awiteb
2025-05-06 12:15:12 +00:00
parent c0a5e47793
commit 93c8743dc7
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cli/repo/announce.rs
View File

@@ -72,6 +72,8 @@ impl CommandRunner for AnnounceArgs {
let mut write_relays = options.relays.clone(); let mut write_relays = options.relays.clone();
let mut maintainers = vec![user_pubk]; let mut maintainers = vec![user_pubk];
write_relays.sort_unstable();
write_relays.dedup();
maintainers.extend(self.maintainers); maintainers.extend(self.maintainers);
if let Some(event) = relays_list.clone() { if let Some(event) = relays_list.clone() {
@@ -99,7 +101,7 @@ impl CommandRunner for AnnounceArgs {
let result = client let result = client
.send_event_to(event, relays_list.as_ref(), write_relays) .send_event_to(event, relays_list.as_ref(), &write_relays)
.await?; .await?;
for relay in &result.success { for relay in &result.success {

2
src/cli/repo/view.rs
View File

@@ -37,7 +37,7 @@ impl CommandRunner for ViewArgs {
async fn run(self, options: CliOptions) -> N34Result<()> { async fn run(self, options: CliOptions) -> N34Result<()> {
let client = NostrClient::init(&options).await; let client = NostrClient::init(&options).await;
if !self.naddr.relays.is_empty() { if !self.naddr.relays.is_empty() {
client.add_read_relays(&self.naddr.relays).await; client.add_relays(&self.naddr.relays).await;
} }
let repo = client.fetch_repo(&self.naddr).await?; let repo = client.fetch_repo(&self.naddr).await?;

18
src/nostr_utils/mod.rs
View File

@@ -65,15 +65,15 @@ impl NostrClient {
.build(), .build(),
); );
client.add_read_relays(&options.relays).await; client.add_relays(&options.relays).await;
client client
} }
/// Add read relays and connect to them /// Add relays and connect to them
pub async fn add_read_relays(&self, relays: &[RelayUrl]) { pub async fn add_relays(&self, relays: &[RelayUrl]) {
for relay in relays { for relay in relays {
self.client self.client
.add_read_relay(relay) .add_relay(relay)
.await .await
.expect("It's a valid relay url"); .expect("It's a valid relay url");
if let Err(err) = self.client.try_connect_relay(relay, CLIENT_TIMEOUT).await { if let Err(err) = self.client.try_connect_relay(relay, CLIENT_TIMEOUT).await {
@@ -87,16 +87,12 @@ impl NostrClient {
&self, &self,
event: UnsignedEvent, event: UnsignedEvent,
relays_list: Option<&Event>, relays_list: Option<&Event>,
mut relays: Vec<RelayUrl>, relays: &[RelayUrl],
) -> N34Result<Output<EventId>> { ) -> N34Result<Output<EventId>> {
relays.sort_unstable(); self.add_relays(relays).await;
relays.dedup();
for relay in &relays {
let _ = self.client.add_write_relay(relay).await;
}
if let Some(event) = relays_list { if let Some(event) = relays_list {
let _ = self.client.send_event_to(&relays, event).await; let _ = self.client.send_event_to(relays, event).await;
} }
self.client self.client
.send_event_to(relays, &event.sign(&self.client.signer().await?).await?) .send_event_to(relays, &event.sign(&self.client.signer().await?).await?)