From 948fe972eb2bddf187b79f2673a091b6331cfd90 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Tue, 1 Apr 2025 14:31:34 +0100
Subject: chore: bump rust-nostr v0.37 ~> v0.40

and fix all of the breaking changes
---
 src/lib/login/existing.rs       | 2 +-
 src/lib/login/fresh.rs          | 2 +-
 src/lib/login/key_encryption.rs | 2 +-
 src/lib/login/mod.rs            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/lib/login')

diff --git a/src/lib/login/existing.rs b/src/lib/login/existing.rs
index efe187e..e60621d 100644
--- a/src/lib/login/existing.rs
+++ b/src/lib/login/existing.rs
@@ -208,7 +208,7 @@ async fn get_signer(
                 Duration::from_secs(10 * 60),
                 None,
             )?;
-            if let Some(public_key) = npub.clone().and_then(|npub| PublicKey::parse(npub).ok()) {
+            if let Some(public_key) = npub.clone().and_then(|npub| PublicKey::parse(&npub).ok()) {
                 s.non_secure_set_user_public_key(public_key)?;
                 let signer: Arc<dyn NostrSigner> = Arc::new(s);
                 Ok((signer, public_key))
diff --git a/src/lib/login/fresh.rs b/src/lib/login/fresh.rs
index 635c0b3..76998ff 100644
--- a/src/lib/login/fresh.rs
+++ b/src/lib/login/fresh.rs
@@ -372,7 +372,7 @@ pub fn generate_nostr_connect_app(
         client
             .get_fallback_signer_relays()
             .iter()
-            .flat_map(RelayUrl::parse)
+            .flat_map(|s| RelayUrl::parse(s))
             .collect::<Vec<RelayUrl>>()
     } else {
         vec![]
diff --git a/src/lib/login/key_encryption.rs b/src/lib/login/key_encryption.rs
index efb38d1..d57b3b5 100644
--- a/src/lib/login/key_encryption.rs
+++ b/src/lib/login/key_encryption.rs
@@ -7,7 +7,7 @@ pub fn decrypt_key(encrypted_key: &str, password: &str) -> Result<nostr::Keys> {
     if encrypted_key.log_n() > 14 {
         println!("this may take a few seconds...");
     }
-    Ok(nostr::Keys::new(encrypted_key.to_secret_key(password)?))
+    Ok(nostr::Keys::new(encrypted_key.decrypt(password)?))
 }
 
 #[cfg(test)]
diff --git a/src/lib/login/mod.rs b/src/lib/login/mod.rs
index a1c45d5..c37375f 100644
--- a/src/lib/login/mod.rs
+++ b/src/lib/login/mod.rs
@@ -93,7 +93,7 @@ pub async fn get_likely_logged_in_user(git_repo_path: &Path) -> Result<Option<Pu
     let git_repo = Repo::from_path(&git_repo_path.to_path_buf())?;
     Ok(
         if let Some(npub) = git_repo.get_git_config_item("nostr.npub", None)? {
-            if let Ok(pubic_key) = PublicKey::parse(npub) {
+            if let Ok(pubic_key) = PublicKey::parse(&npub) {
                 Some(pubic_key)
             } else {
                 None
@@ -107,7 +107,7 @@ pub async fn get_likely_logged_in_user(git_repo_path: &Path) -> Result<Option<Pu
 pub fn get_curent_user(git_repo: &Repo) -> Result<Option<PublicKey>> {
     Ok(
         if let Some(npub) = git_repo.get_git_config_item("nostr.npub", None)? {
-            if let Ok(public_key) = PublicKey::parse(npub) {
+            if let Ok(public_key) = PublicKey::parse(&npub) {
                 Some(public_key)
             } else {
                 None
-- 
cgit v1.2.3