From 2e54dd09a1a3b42903eee00adf4472d8b679dcb1 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Fri, 19 Jul 2024 13:35:39 +0100 Subject: fix(fetch): error when user profile not present when fetching a user profile from user relays it throw an error when an existing version of the profile wasn't found --- src/client.rs | 16 +++++++++++----- src/login.rs | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/client.rs b/src/client.rs index 0757359..ccd5cfb 100644 --- a/src/client.rs +++ b/src/client.rs @@ -909,11 +909,17 @@ async fn create_relays_request( } let mut map: HashMap = HashMap::new(); for public_key in &user_profiles { - let user_ref = get_user_ref_from_cache(git_repo_path, public_key).await?; - map.insert( - public_key.to_owned(), - (user_ref.metadata.created_at, user_ref.relays.created_at), - ); + if let Ok(user_ref) = get_user_ref_from_cache(git_repo_path, public_key).await { + map.insert( + public_key.to_owned(), + (user_ref.metadata.created_at, user_ref.relays.created_at), + ); + } else { + map.insert( + public_key.to_owned(), + (Timestamp::from(0), Timestamp::from(0)), + ); + } } map }; diff --git a/src/login.rs b/src/login.rs index b746202..9c7ca78 100644 --- a/src/login.rs +++ b/src/login.rs @@ -634,7 +634,7 @@ async fn get_user_details( .await?; if let Ok(user_ref) = get_user_ref_from_cache(git_repo_path, public_key).await { progress_reporter.clear()?; - // term.clear_last_lines(1)?; + // if std::env::var("NGITTEST").is_err() {term.clear_last_lines(1)?;} Ok(user_ref) } else { Ok(empty) -- cgit v1.2.3