jerry/buzz
1
0
Fork 0
mirror of https://github.com/block/buzz.git synced 2026-11-04 00:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: fix rustfmt formatting in sprout-cli

Browse Source 
Reformat long method chains and closure expressions that rustfmt
flagged during CI. No logic changes.
This commit is contained in:
Will Pfleger
2026-05-20 14:16:29 -04:00
parent 0cf0d106e7
commit c950d60454
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/sprout-cli/src/commands/channels.rs
View File

@@ -1,6 +1,8 @@
use uuid::Uuid;
use crate::client::{extract_d_tag, extract_p_tags, normalize_write_response, print_create_response, SproutClient};
use crate::client::{
extract_d_tag, extract_p_tags, normalize_write_response, print_create_response, SproutClient,
};
use crate::error::CliError;
use crate::validate::{parse_uuid, read_or_stdin, validate_hex64, validate_uuid};
@@ -103,7 +105,8 @@ pub async fn cmd_get_channel(client: &SproutClient, channel_id: &str) -> Result<
let events: Vec<serde_json::Value> = serde_json::from_str(&resp).unwrap_or_default();
if let Some(e) = events.first() {
let mut normalized = extract_channel_metadata(e);
normalized["pubkey"] = serde_json::json!(e.get("pubkey").and_then(|v| v.as_str()).unwrap_or(""));
normalized["pubkey"] =
serde_json::json!(e.get("pubkey").and_then(|v| v.as_str()).unwrap_or(""));
println!("{normalized}");
} else {
println!("null");
@@ -123,10 +126,7 @@ pub async fn cmd_list_channel_members(
});
let resp = client.query(&filter).await?;
let events: Vec<serde_json::Value> = serde_json::from_str(&resp).unwrap_or_default();
let members = events
.first()
.map(extract_p_tags)
.unwrap_or_default();
let members = events.first().map(extract_p_tags).unwrap_or_default();
let output = serde_json::to_string(&members).unwrap_or_default();
println!("{output}");
Ok(())
@@ -140,7 +140,11 @@ pub async fn cmd_get_canvas(client: &SproutClient, channel_id: &str) -> Result<(
});
let resp = client.query(&filter).await?;
let events: Vec<serde_json::Value> = serde_json::from_str(&resp).unwrap_or_default();
if let Some(content) = events.first().and_then(|e| e.get("content")).and_then(|c| c.as_str()) {
if let Some(content) = events
.first()
.and_then(|e| e.get("content"))
.and_then(|c| c.as_str())
{
println!("{content}");
} else {
println!("null");

6
crates/sprout-cli/src/commands/dms.rs
View File

@@ -63,11 +63,9 @@ pub async fn cmd_open_dm(client: &SproutClient, pubkeys: &[String]) -> Result<()
use nostr::{EventBuilder, Kind, Tag};
let mut tags: Vec<Tag> = refs
.iter()
.map(|pk| Tag::parse(&["p", pk])
.map_err(|e| CliError::Other(format!("tag error: {e}"))))
.map(|pk| Tag::parse(&["p", pk]).map_err(|e| CliError::Other(format!("tag error: {e}"))))
.collect::<Result<Vec<_>, _>>()?;
tags.push(Tag::parse(&["d", &dm_id])
.map_err(|e| CliError::Other(format!("tag error: {e}")))?);
tags.push(Tag::parse(&["d", &dm_id]).map_err(|e| CliError::Other(format!("tag error: {e}")))?);
let builder = EventBuilder::new(Kind::Custom(41010), "", tags);
let event = client.sign_event(builder)?;

4
crates/sprout-cli/src/commands/reactions.rs
View File

@@ -107,7 +107,9 @@ pub async fn cmd_get_reactions(client: &SproutClient, event_id: &str) -> Result<
})
.collect();
reactions.sort_by(|a, b| {
a.get("emoji").and_then(|v| v.as_str()).unwrap_or("")
a.get("emoji")
.and_then(|v| v.as_str())
.unwrap_or("")
.cmp(b.get("emoji").and_then(|v| v.as_str()).unwrap_or(""))
});