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

chore: Move the write relays definition to the end of the commands

Browse Source 
To make it clear, we can review exactly what was collected instead of
having it spread throughout the body of the command.

Signed-off-by: Awiteb <a@4rs.nl>
This commit is contained in:
Awiteb
2025-05-27 19:20:42 +00:00
parent f670859b92
commit 24e8522268
4 changed files with 78 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/cli/commands/repo/announce.rs
View File

@@ -84,28 +84,11 @@ impl CommandRunner for AnnounceArgs {
let client = NostrClient::init(&options).await;
let user_pubk = options.pubkey().await?;
let relays_list = client.user_relays_list(user_pubk).await?;
let mut write_relays = [
options.relays.clone(),
utils::add_write_relays(relays_list.as_ref()),
]
.concat();
if !self.maintainers.contains(&user_pubk) {
self.maintainers.insert(0, user_pubk);
}
// Include read relays for each maintainer (if found)
write_relays.extend(
future::join_all(
self.maintainers
.iter()
.map(|pkey| client.read_relays_from_user(*pkey)),
)
.await
.into_iter()
.flatten(),
);
let naddr = utils::repo_naddr(&self.repo_id, user_pubk, &options.relays)?;
let event = EventBuilder::new_git_repo(
self.repo_id,
@@ -114,7 +97,7 @@ impl CommandRunner for AnnounceArgs {
self.web,
self.clone,
options.relays.clone(),
self.maintainers,
self.maintainers.clone(),
self.label.into_iter().map(utils::str_trim).collect(),
self.force_id,
)?
@@ -122,7 +105,6 @@ impl CommandRunner for AnnounceArgs {
.pow(options.pow)
.build(user_pubk);
let nevent = utils::new_nevent(event.id.expect("There is an id"), &write_relays)?;
if self.address_file {
let address_path = std::env::current_dir()?.join(NOSTR_ADDRESS_FILE);
@@ -142,6 +124,23 @@ impl CommandRunner for AnnounceArgs {
tracing::info!("Successfully wrote naddr to address file");
}
let write_relays = [
options.relays.clone(),
utils::add_write_relays(relays_list.as_ref()),
// Include read relays for each maintainer (if found)
future::join_all(
self.maintainers
.iter()
.map(|pkey| client.read_relays_from_user(*pkey)),
)
.await
.into_iter()
.flatten()
.collect(),
]
.concat();
let nevent = utils::new_nevent(event.id.expect("There is an id"), &write_relays)?;
client
.send_event_to(event, relays_list.as_ref(), &write_relays)
.await?;