From 0379a7ad4c1c6876c32286adb1cf090e3afdc5ea Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Wed, 17 Jul 2024 17:33:29 +0100
Subject: fix(fetch): get profile with nsec cli parameter

only the profile from the saved user was being fetched.

tests are using cli login parameters and expecting to see the
user's name but it was only showing the npub.

fixed by allowing the explicit request of specfic user profiles.
---
 src/client.rs             | 19 ++++++++++++++-----
 src/login.rs              |  6 +++++-
 src/repo_ref.rs           |  4 ++--
 src/sub_commands/fetch.rs |  2 +-
 4 files changed, 22 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/client.rs b/src/client.rs
index b6e93d6..7947a02 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -78,6 +78,7 @@ pub trait Connect {
         &self,
         git_repo_path: &Path,
         repo_coordinates: &HashSet<Coordinate>,
+        user_profiles: &HashSet<PublicKey>,
     ) -> Result<(Vec<Result<FetchReport>>, MultiProgress)>;
     async fn fetch_all_from_relay(
         &self,
@@ -288,6 +289,7 @@ impl Connect for Client {
         &self,
         git_repo_path: &Path,
         repo_coordinates: &HashSet<Coordinate>,
+        user_profiles: &HashSet<PublicKey>,
     ) -> Result<(Vec<Result<FetchReport>>, MultiProgress)> {
         let fallback_relays = &self
             .fallback_relays
@@ -295,8 +297,13 @@ impl Connect for Client {
             .filter_map(|r| Url::parse(r).ok())
             .collect::<HashSet<Url>>();
 
-        let mut request =
-            create_relays_request(git_repo_path, repo_coordinates, fallback_relays.clone()).await?;
+        let mut request = create_relays_request(
+            git_repo_path,
+            repo_coordinates,
+            user_profiles,
+            fallback_relays.clone(),
+        )
+        .await?;
 
         let progress_reporter = MultiProgress::new();
 
@@ -666,7 +673,7 @@ async fn get_global_cache_database(git_repo_path: &Path) -> Result<SQLiteDatabas
     .context("cannot open ngit global nostr cache database")
 }
 
-pub async fn get_event_from_cache(
+pub async fn get_events_from_cache(
     git_repo_path: &Path,
     filters: Vec<nostr::Filter>,
 ) -> Result<Vec<nostr::Event>> {
@@ -725,7 +732,7 @@ pub async fn get_repo_ref_from_cache(
 
         let events = [
             get_event_from_global_cache(git_repo_path, vec![filter.clone()]).await?,
-            get_event_from_cache(git_repo_path, vec![filter]).await?,
+            get_events_from_cache(git_repo_path, vec![filter]).await?,
         ]
         .concat();
         for e in events {
@@ -778,6 +785,7 @@ pub async fn get_repo_ref_from_cache(
 async fn create_relays_request(
     git_repo_path: &Path,
     repo_coordinates: &HashSet<Coordinate>,
+    user_profiles: &HashSet<PublicKey>,
     fallback_relays: HashSet<Url>,
 ) -> Result<FetchRequest> {
     let repo_ref = get_repo_ref_from_cache(git_repo_path, repo_coordinates).await;
@@ -799,7 +807,7 @@ async fn create_relays_request(
             }
         }
 
-        for event in &get_event_from_cache(
+        for event in &get_events_from_cache(
             git_repo_path,
             vec![
                 nostr::Filter::default()
@@ -843,6 +851,7 @@ async fn create_relays_request(
     if let Some(current_user) = current_user {
         missing_contributor_profiles.insert(current_user);
     }
+    missing_contributor_profiles.extend(user_profiles);
 
     let existing_events: HashSet<EventId> = {
         let mut existing_events: HashSet<EventId> = HashSet::new();
diff --git a/src/login.rs b/src/login.rs
index 0a20a90..6c3acfa 100644
--- a/src/login.rs
+++ b/src/login.rs
@@ -628,7 +628,11 @@ async fn get_user_details(
             let term = console::Term::stderr();
             term.write_line("searching for profile...")?;
             let (_, progress_reporter) = client
-                .fetch_all(git_repo.get_path()?, &HashSet::new())
+                .fetch_all(
+                    git_repo.get_path()?,
+                    &HashSet::new(),
+                    &HashSet::from_iter(vec![*public_key]),
+                )
                 .await?;
             events = get_event_from_global_cache(git_repo.get_path()?, filters).await?;
             if !events.is_empty() {
diff --git a/src/repo_ref.rs b/src/repo_ref.rs
index 4952b16..0e91cc4 100644
--- a/src/repo_ref.rs
+++ b/src/repo_ref.rs
@@ -19,7 +19,7 @@ use crate::client::Client;
 use crate::client::MockConnect;
 use crate::{
     cli_interactor::{Interactor, InteractorPrompt, PromptInputParms},
-    client::{get_event_from_cache, get_event_from_global_cache, sign_event, Connect},
+    client::{get_event_from_global_cache, get_events_from_cache, sign_event, Connect},
     git::{Repo, RepoActions},
 };
 
@@ -261,7 +261,7 @@ pub async fn get_repo_coordinates(
                     .reference(git_repo.get_root_commit()?.to_string())
                     .authors(maintainers.clone());
                 let mut events =
-                    get_event_from_cache(git_repo.get_path()?, vec![filter.clone()]).await?;
+                    get_events_from_cache(git_repo.get_path()?, vec![filter.clone()]).await?;
                 if events.is_empty() {
                     events =
                         get_event_from_global_cache(git_repo.get_path()?, vec![filter.clone()])
diff --git a/src/sub_commands/fetch.rs b/src/sub_commands/fetch.rs
index 5a6850c..28eb960 100644
--- a/src/sub_commands/fetch.rs
+++ b/src/sub_commands/fetch.rs
@@ -40,7 +40,7 @@ pub async fn launch(args: &Cli, command_args: &SubCommandArgs) -> Result<()> {
     };
     println!("fetching updates...");
     let (relay_reports, _) = client
-        .fetch_all(git_repo.get_path()?, &repo_coordinates)
+        .fetch_all(git_repo.get_path()?, &repo_coordinates, &HashSet::new())
         .await?;
     let report = consolidate_fetch_reports(relay_reports);
     if report.to_string().is_empty() {
-- 
cgit v1.2.3