upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/login/mod.rs23
-rw-r--r--src/lib/login/user.rs15
2 files changed, 24 insertions, 14 deletions
diff --git a/src/lib/login/mod.rs b/src/lib/login/mod.rs
index b484fea..47847c3 100644
--- a/src/lib/login/mod.rs
+++ b/src/lib/login/mod.rs
@@ -9,7 +9,10 @@ use nostr_sdk::{NostrSigner, Timestamp, ToBech32};
9use crate::client::Client; 9use crate::client::Client;
10#[cfg(test)] 10#[cfg(test)]
11use crate::client::MockConnect; 11use crate::client::MockConnect;
12use crate::git::{Repo, RepoActions}; 12use crate::{
13 client::is_verbose,
14 git::{Repo, RepoActions},
15};
13 16
14pub mod existing; 17pub mod existing;
15mod key_encryption; 18mod key_encryption;
@@ -70,14 +73,16 @@ fn print_logged_in_as(
70 offline_mode: bool, 73 offline_mode: bool,
71 source: &SignerInfoSource, 74 source: &SignerInfoSource,
72) -> Result<()> { 75) -> Result<()> {
73 if !offline_mode && user_ref.metadata.created_at.eq(&Timestamp::from(0)) { 76 if is_verbose() {
74 eprintln!("failed to find profile..."); 77 if !offline_mode && user_ref.metadata.created_at.eq(&Timestamp::from(0)) {
75 } else if !offline_mode && user_ref.metadata.name.eq(&user_ref.public_key.to_bech32()?) { 78 eprintln!("failed to find profile...");
76 eprintln!("failed to extract account name from account metadata..."); 79 } else if !offline_mode && user_ref.metadata.name.eq(&user_ref.public_key.to_bech32()?) {
77 } else if !offline_mode && user_ref.relays.created_at.eq(&Timestamp::from(0)) { 80 eprintln!("failed to extract account name from account metadata...");
78 eprintln!( 81 } else if !offline_mode && user_ref.relays.created_at.eq(&Timestamp::from(0)) {
79 "failed to find your relay list. consider using another nostr client to create one to enhance your nostr experience." 82 eprintln!(
80 ); 83 "failed to find your relay list. consider using another nostr client to create one to enhance your nostr experience."
84 );
85 }
81 } 86 }
82 eprintln!( 87 eprintln!(
83 "logged in as {}{}", 88 "logged in as {}{}",
diff --git a/src/lib/login/user.rs b/src/lib/login/user.rs
index b273363..a51a510 100644
--- a/src/lib/login/user.rs
+++ b/src/lib/login/user.rs
@@ -10,7 +10,7 @@ use crate::client::Client;
10#[cfg(test)] 10#[cfg(test)]
11use crate::client::MockConnect; 11use crate::client::MockConnect;
12use crate::{ 12use crate::{
13 client::{Connect, get_event_from_global_cache, sign_event}, 13 client::{Connect, get_event_from_global_cache, is_verbose, sign_event},
14 git_events::KIND_USER_GRASP_LIST, 14 git_events::KIND_USER_GRASP_LIST,
15}; 15};
16 16
@@ -100,13 +100,17 @@ pub async fn get_user_details(
100 if fetch_profile_updates { 100 if fetch_profile_updates {
101 if let Some(client) = client { 101 if let Some(client) = client {
102 let term = console::Term::stderr(); 102 let term = console::Term::stderr();
103 term.write_line("searching for profile updates...")?; 103 if is_verbose() {
104 term.write_line("searching for profile updates...")?;
105 }
104 let (reports, progress_reporter) = client 106 let (reports, progress_reporter) = client
105 .fetch_all(git_repo_path, None, &HashSet::from_iter(vec![*public_key])) 107 .fetch_all(git_repo_path, None, &HashSet::from_iter(vec![*public_key]))
106 .await?; 108 .await?;
107 if !reports.iter().any(|r| r.is_err()) { 109 if !reports.iter().any(|r| r.is_err()) {
108 progress_reporter.clear()?; 110 progress_reporter.clear()?;
109 term.clear_last_lines(1)?; 111 if is_verbose() {
112 term.clear_last_lines(1)?;
113 }
110 } 114 }
111 return get_user_ref_from_cache(git_repo_path, public_key).await; 115 return get_user_ref_from_cache(git_repo_path, public_key).await;
112 } 116 }
@@ -125,13 +129,14 @@ pub async fn get_user_details(
125 Ok(empty) 129 Ok(empty)
126 } else if let Some(client) = client { 130 } else if let Some(client) = client {
127 let term = console::Term::stderr(); 131 let term = console::Term::stderr();
128 term.write_line("searching for profile...")?; 132 if is_verbose() {
133 term.write_line("searching for profile...")?;
134 }
129 let (_, progress_reporter) = client 135 let (_, progress_reporter) = client
130 .fetch_all(git_repo_path, None, &HashSet::from_iter(vec![*public_key])) 136 .fetch_all(git_repo_path, None, &HashSet::from_iter(vec![*public_key]))
131 .await?; 137 .await?;
132 if let Ok(user_ref) = get_user_ref_from_cache(git_repo_path, public_key).await { 138 if let Ok(user_ref) = get_user_ref_from_cache(git_repo_path, public_key).await {
133 progress_reporter.clear()?; 139 progress_reporter.clear()?;
134 // if std::env::var("NGITTEST").is_err() {term.clear_last_lines(1)?;}
135 Ok(user_ref) 140 Ok(user_ref)
136 } else { 141 } else {
137 Ok(empty) 142 Ok(empty)