diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2024-08-01 17:18:53 +0100 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2024-08-01 17:18:53 +0100 |
| commit | 2de11e4099a1f841666eac6a1f68389b01c3398b (patch) | |
| tree | 9b99491f01edc3b32e08a121203312d0a7e8ffda /src | |
| parent | 6cc69fd50ea11a94176734652c0c8753acb1e85b (diff) | |
Revert "refactor: fix `stderr` ~> `stdout`"
This reverts commit 3d2e031294b467be725a4ac5f5e65e029d25699a.
Diffstat (limited to 'src')
| -rw-r--r-- | src/client.rs | 6 | ||||
| -rw-r--r-- | src/login.rs | 6 | ||||
| -rw-r--r-- | src/sub_commands/send.rs | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/client.rs b/src/client.rs index 60b1304..db41f99 100644 --- a/src/client.rs +++ b/src/client.rs | |||
| @@ -642,7 +642,7 @@ fn get_dedup_events(relay_results: Vec<Result<Vec<nostr::Event>>>) -> Vec<Event> | |||
| 642 | 642 | ||
| 643 | pub async fn sign_event(event_builder: EventBuilder, signer: &NostrSigner) -> Result<nostr::Event> { | 643 | pub async fn sign_event(event_builder: EventBuilder, signer: &NostrSigner) -> Result<nostr::Event> { |
| 644 | if signer.r#type().eq(&nostr_signer::NostrSignerType::NIP46) { | 644 | if signer.r#type().eq(&nostr_signer::NostrSignerType::NIP46) { |
| 645 | let term = console::Term::stdout(); | 645 | let term = console::Term::stderr(); |
| 646 | term.write_line("signing event with remote signer...")?; | 646 | term.write_line("signing event with remote signer...")?; |
| 647 | let event = signer | 647 | let event = signer |
| 648 | .sign_event_builder(event_builder) | 648 | .sign_event_builder(event_builder) |
| @@ -659,7 +659,7 @@ pub async fn sign_event(event_builder: EventBuilder, signer: &NostrSigner) -> Re | |||
| 659 | } | 659 | } |
| 660 | 660 | ||
| 661 | pub async fn fetch_public_key(signer: &NostrSigner) -> Result<nostr::PublicKey> { | 661 | pub async fn fetch_public_key(signer: &NostrSigner) -> Result<nostr::PublicKey> { |
| 662 | let term = console::Term::stdout(); | 662 | let term = console::Term::stderr(); |
| 663 | term.write_line("fetching npub from remote signer...")?; | 663 | term.write_line("fetching npub from remote signer...")?; |
| 664 | let public_key = signer | 664 | let public_key = signer |
| 665 | .public_key() | 665 | .public_key() |
| @@ -1462,7 +1462,7 @@ pub async fn fetching_with_report( | |||
| 1462 | #[cfg(not(test))] client: &Client, | 1462 | #[cfg(not(test))] client: &Client, |
| 1463 | repo_coordinates: &HashSet<Coordinate>, | 1463 | repo_coordinates: &HashSet<Coordinate>, |
| 1464 | ) -> Result<FetchReport> { | 1464 | ) -> Result<FetchReport> { |
| 1465 | let term = console::Term::stdout(); | 1465 | let term = console::Term::stderr(); |
| 1466 | term.write_line("fetching updates...")?; | 1466 | term.write_line("fetching updates...")?; |
| 1467 | let (relay_reports, progress_reporter) = client | 1467 | let (relay_reports, progress_reporter) = client |
| 1468 | .fetch_all(git_repo_path, repo_coordinates, &HashSet::new()) | 1468 | .fetch_all(git_repo_path, repo_coordinates, &HashSet::new()) |
diff --git a/src/login.rs b/src/login.rs index fd33ea3..19bb97c 100644 --- a/src/login.rs +++ b/src/login.rs | |||
| @@ -280,7 +280,7 @@ fn get_keys_with_password(git_repo: &Repo, password: &str) -> Result<nostr::Keys | |||
| 280 | } | 280 | } |
| 281 | 281 | ||
| 282 | async fn get_nip46_signer_from_uri_and_key(uri: &str, app_key: &str) -> Result<NostrSigner> { | 282 | async fn get_nip46_signer_from_uri_and_key(uri: &str, app_key: &str) -> Result<NostrSigner> { |
| 283 | let term = console::Term::stdout(); | 283 | let term = console::Term::stderr(); |
| 284 | term.write_line("connecting to remote signer...")?; | 284 | term.write_line("connecting to remote signer...")?; |
| 285 | let uri = NostrConnectURI::parse(uri)?; | 285 | let uri = NostrConnectURI::parse(uri)?; |
| 286 | let signer = NostrSigner::nip46( | 286 | let signer = NostrSigner::nip46( |
| @@ -410,7 +410,7 @@ async fn fresh_login( | |||
| 410 | } | 410 | } |
| 411 | 411 | ||
| 412 | pub async fn fetch_nip46_uri_from_nip05(nip05: &str) -> Result<NostrConnectURI> { | 412 | pub async fn fetch_nip46_uri_from_nip05(nip05: &str) -> Result<NostrConnectURI> { |
| 413 | let term = console::Term::stdout(); | 413 | let term = console::Term::stderr(); |
| 414 | term.write_line("contacting login service provider...")?; | 414 | term.write_line("contacting login service provider...")?; |
| 415 | let res = nip05::profile(&nip05, None).await; | 415 | let res = nip05::profile(&nip05, None).await; |
| 416 | term.clear_last_lines(1)?; | 416 | term.clear_last_lines(1)?; |
| @@ -633,7 +633,7 @@ async fn get_user_details( | |||
| 633 | if cache_only { | 633 | if cache_only { |
| 634 | Ok(empty) | 634 | Ok(empty) |
| 635 | } else if let Some(client) = client { | 635 | } else if let Some(client) = client { |
| 636 | let term = console::Term::stdout(); | 636 | let term = console::Term::stderr(); |
| 637 | term.write_line("searching for profile...")?; | 637 | term.write_line("searching for profile...")?; |
| 638 | let (_, progress_reporter) = client | 638 | let (_, progress_reporter) = client |
| 639 | .fetch_all( | 639 | .fetch_all( |
diff --git a/src/sub_commands/send.rs b/src/sub_commands/send.rs index fa820ce..f10d2d3 100644 --- a/src/sub_commands/send.rs +++ b/src/sub_commands/send.rs | |||
| @@ -463,7 +463,7 @@ fn choose_commits(git_repo: &Repo, proposed_commits: Vec<Sha1Hash>) -> Result<Ve | |||
| 463 | } | 463 | } |
| 464 | } | 464 | } |
| 465 | 465 | ||
| 466 | let term = console::Term::stdout(); | 466 | let term = console::Term::stderr(); |
| 467 | let mut printed_error_line = false; | 467 | let mut printed_error_line = false; |
| 468 | 468 | ||
| 469 | let selected_commits = 'outer: loop { | 469 | let selected_commits = 'outer: loop { |