Merge branch 'upgrade-dependancies'

1 files changed, 76 insertions, 59 deletions

diff --git a/src/lib/client.rs b/src/lib/client.rs
index 445bf77..9253022 100644
--- a/src/lib/client.rs
+++ b/src/lib/client.rs
@@ -794,8 +794,7 @@ pub async fn sign_event(
     if signer.backend() == SignerBackend::NostrConnect {
         let term = console::Term::stderr();
         term.write_line(&format!(
-            "signing event ({}) with remote signer...",
-            description
+            "signing event ({description}) with remote signer..."
         ))?;
         let event = signer
             .sign_event(event_builder.build(signer.get_public_key().await?))
@@ -1104,16 +1103,18 @@ pub async fn get_state_from_cache(
 ) -> Result<RepoState> {
     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?,
         )
     }
@@ -1179,17 +1180,20 @@ 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_tags(
-                        SingleLetterTag::lowercase(nostr_sdk::Alphabet::A),
-                        repo_coordinates_without_relays
-                            .iter()
-                            .map(|c| c.coordinate.to_string())
-                            .collect::<Vec<String>>(),
-                    ),
-            ])
+            for event in &get_events_from_local_cache(
+                git_repo_path,
+                vec![
+                    nostr::Filter::default()
+                        .kinds(vec![Kind::GitPatch])
+                        .custom_tags(
+                            SingleLetterTag::lowercase(nostr_sdk::Alphabet::A),
+                            repo_coordinates_without_relays
+                                .iter()
+                                .map(|c| c.coordinate.to_string())
+                                .collect::<Vec<String>>(),
+                        ),
+                ],
+            )
             .await?
             {
                 if event_is_patch_set_root(event) || event_is_revision_root(event) {
@@ -1199,11 +1203,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()
@@ -1769,17 +1773,20 @@ pub async fn get_proposals_and_revisions_from_cache(
     git_repo_path: &Path,
     repo_coordinates: HashSet<Nip19Coordinate>,
 ) -> Result<Vec<nostr::Event>> {
-    let mut proposals = get_events_from_local_cache(git_repo_path, vec![
-        nostr::Filter::default()
-            .kind(nostr::Kind::GitPatch)
-            .custom_tags(
-                nostr::SingleLetterTag::lowercase(nostr_sdk::Alphabet::A),
-                repo_coordinates
-                    .iter()
-                    .map(|c| c.coordinate.to_string())
-                    .collect::<Vec<String>>(),
-            ),
-    ])
+    let mut proposals = get_events_from_local_cache(
+        git_repo_path,
+        vec![
+            nostr::Filter::default()
+                .kind(nostr::Kind::GitPatch)
+                .custom_tags(
+                    nostr::SingleLetterTag::lowercase(nostr_sdk::Alphabet::A),
+                    repo_coordinates
+                        .iter()
+                        .map(|c| c.coordinate.to_string())
+                        .collect::<Vec<String>>(),
+                ),
+        ],
+    )
     .await?
     .iter()
     .filter(|e| event_is_patch_set_root(e))
@@ -1795,23 +1802,29 @@ pub async fn get_all_proposal_patch_events_from_cache(
     repo_ref: &RepoRef,
     proposal_id: &nostr::EventId,
 ) -> Result<Vec<nostr::Event>> {
-    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<PublicKey> = [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<PublicKey> = [
+        repo_ref.maintainers.clone(),
+        vec![
+            commit_events
+                .iter()
+                .find(|e| e.id.eq(proposal_id))
+                .context("proposal not in cache")?
+                .pubkey,
+        ],
+    ]
     .concat()
     .iter()
     .copied()
@@ -1825,12 +1838,15 @@ 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);
@@ -1845,9 +1861,10 @@ 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<Event> {
-    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")?