From 4ee83e2fe5335a8afd78439c35f029c4a472e797 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Mon, 16 Dec 2024 09:00:46 +0000 Subject: chore: bump nix flake rust nightly `fmt` overlay update the rust nightly `fmt` overlay which needs to be pinned to a specific version (this case by date) update formatting in main files via `cargo fmt` --- src/lib/client.rs | 140 ++++++++++++++++++++++++------------------------------ 1 file changed, 61 insertions(+), 79 deletions(-) (limited to 'src/lib/client.rs') diff --git a/src/lib/client.rs b/src/lib/client.rs index 32f5bd7..59ec583 100644 --- a/src/lib/client.rs +++ b/src/lib/client.rs @@ -19,7 +19,7 @@ use std::{ time::Duration, }; -use anyhow::{bail, Context, Result}; +use anyhow::{Context, Result, bail}; use async_trait::async_trait; use console::Style; use futures::{ @@ -29,12 +29,12 @@ use futures::{ use indicatif::{MultiProgress, ProgressBar, ProgressDrawTarget, ProgressState, ProgressStyle}; #[cfg(test)] use mockall::*; -use nostr::{nips::nip01::Coordinate, signer::SignerBackend, Event}; +use nostr::{Event, nips::nip01::Coordinate, signer::SignerBackend}; use nostr_database::NostrEventsDatabase; use nostr_lmdb::NostrLMDB; use nostr_sdk::{ - prelude::RelayLimits, EventBuilder, EventId, Kind, NostrSigner, Options, PublicKey, RelayUrl, - SingleLetterTag, Timestamp, + EventBuilder, EventId, Kind, NostrSigner, Options, PublicKey, RelayUrl, SingleLetterTag, + Timestamp, prelude::RelayLimits, }; use crate::{ @@ -894,18 +894,16 @@ pub async fn get_state_from_cache( ) -> Result { if let Some(git_repo_path) = git_repo_path { RepoState::try_from( - get_events_from_local_cache( - git_repo_path, - vec![get_filter_state_events(&repo_ref.coordinates())], - ) + get_events_from_local_cache(git_repo_path, vec![get_filter_state_events( + &repo_ref.coordinates(), + )]) .await?, ) } else { RepoState::try_from( - get_event_from_global_cache( - git_repo_path, - vec![get_filter_state_events(&repo_ref.coordinates())], - ) + get_event_from_global_cache(git_repo_path, vec![get_filter_state_events( + &repo_ref.coordinates(), + )]) .await?, ) } @@ -975,20 +973,17 @@ async fn create_relays_request( } if let Some(git_repo_path) = git_repo_path { - for event in &get_events_from_local_cache( - git_repo_path, - vec![ - nostr::Filter::default() - .kinds(vec![Kind::GitPatch]) - .custom_tag( - SingleLetterTag::lowercase(nostr_sdk::Alphabet::A), - repo_coordinates_without_relays - .iter() - .map(std::string::ToString::to_string) - .collect::>(), - ), - ], - ) + for event in &get_events_from_local_cache(git_repo_path, vec![ + nostr::Filter::default() + .kinds(vec![Kind::GitPatch]) + .custom_tag( + SingleLetterTag::lowercase(nostr_sdk::Alphabet::A), + repo_coordinates_without_relays + .iter() + .map(std::string::ToString::to_string) + .collect::>(), + ), + ]) .await? { if event_is_patch_set_root(event) || event_is_revision_root(event) { @@ -998,11 +993,11 @@ async fn create_relays_request( } } - let profile_events = get_event_from_global_cache( - git_repo_path, - vec![get_filter_contributor_profiles(contributors.clone())], - ) - .await?; + let profile_events = + get_event_from_global_cache(git_repo_path, vec![get_filter_contributor_profiles( + contributors.clone(), + )]) + .await?; for c in &contributors { if let Some(event) = profile_events .iter() @@ -1564,20 +1559,17 @@ pub async fn get_proposals_and_revisions_from_cache( git_repo_path: &Path, repo_coordinates: HashSet, ) -> Result> { - let mut proposals = get_events_from_local_cache( - git_repo_path, - vec![ - nostr::Filter::default() - .kind(nostr::Kind::GitPatch) - .custom_tag( - nostr::SingleLetterTag::lowercase(nostr_sdk::Alphabet::A), - repo_coordinates - .iter() - .map(std::string::ToString::to_string) - .collect::>(), - ), - ], - ) + let mut proposals = get_events_from_local_cache(git_repo_path, vec![ + nostr::Filter::default() + .kind(nostr::Kind::GitPatch) + .custom_tag( + nostr::SingleLetterTag::lowercase(nostr_sdk::Alphabet::A), + repo_coordinates + .iter() + .map(std::string::ToString::to_string) + .collect::>(), + ), + ]) .await? .iter() .filter(|e| event_is_patch_set_root(e)) @@ -1593,29 +1585,23 @@ pub async fn get_all_proposal_patch_events_from_cache( repo_ref: &RepoRef, proposal_id: &nostr::EventId, ) -> Result> { - let mut commit_events = get_events_from_local_cache( - git_repo_path, - vec![ - nostr::Filter::default() - .kind(nostr::Kind::GitPatch) - .event(*proposal_id), - nostr::Filter::default() - .kind(nostr::Kind::GitPatch) - .id(*proposal_id), - ], - ) + let mut commit_events = get_events_from_local_cache(git_repo_path, vec![ + nostr::Filter::default() + .kind(nostr::Kind::GitPatch) + .event(*proposal_id), + nostr::Filter::default() + .kind(nostr::Kind::GitPatch) + .id(*proposal_id), + ]) .await?; - let permissioned_users: HashSet = [ - repo_ref.maintainers.clone(), - vec![ - commit_events - .iter() - .find(|e| e.id.eq(proposal_id)) - .context("proposal not in cache")? - .pubkey, - ], - ] + let permissioned_users: HashSet = [repo_ref.maintainers.clone(), vec![ + commit_events + .iter() + .find(|e| e.id.eq(proposal_id)) + .context("proposal not in cache")? + .pubkey, + ]] .concat() .iter() .copied() @@ -1629,15 +1615,12 @@ pub async fn get_all_proposal_patch_events_from_cache( .collect(); if !revision_roots.is_empty() { - for event in get_events_from_local_cache( - git_repo_path, - vec![ - nostr::Filter::default() - .kind(nostr::Kind::GitPatch) - .events(revision_roots) - .authors(permissioned_users.clone()), - ], - ) + for event in get_events_from_local_cache(git_repo_path, vec![ + nostr::Filter::default() + .kind(nostr::Kind::GitPatch) + .events(revision_roots) + .authors(permissioned_users.clone()), + ]) .await? { commit_events.push(event); @@ -1652,10 +1635,9 @@ pub async fn get_all_proposal_patch_events_from_cache( } pub async fn get_event_from_cache_by_id(git_repo: &Repo, event_id: &EventId) -> Result { - Ok(get_events_from_local_cache( - git_repo.get_path()?, - vec![nostr::Filter::default().id(*event_id)], - ) + Ok(get_events_from_local_cache(git_repo.get_path()?, vec![ + nostr::Filter::default().id(*event_id), + ]) .await? .first() .context("failed to find event in cache")? -- cgit v1.2.3