1 files changed, 25 insertions, 9 deletions

diff --git a/src/lib/repo_ref.rs b/src/lib/repo_ref.rs
index da76182..5d6f4eb 100644
--- a/src/lib/repo_ref.rs
+++ b/src/lib/repo_ref.rs
@@ -19,7 +19,10 @@ use crate::{
         Interactor, InteractorPrompt, PromptChoiceParms, PromptConfirmParms, PromptInputParms,
     },
     client::{consolidate_fetch_reports, get_repo_ref_from_cache, sign_event, Connect},
-    git::{nostr_url::NostrUrlDecoded, Repo, RepoActions},
+    git::{
+        nostr_url::{use_nip05_git_config_cache_to_find_nip05_from_public_key, NostrUrlDecoded},
+        Repo, RepoActions,
+    },
     login::user::get_user_details,
 };
 
@@ -41,6 +44,7 @@ impl TryFrom<(nostr::Event, Option<PublicKey>)> for RepoRef {
     type Error = anyhow::Error;
 
     fn try_from((event, trusted_maintainer): (nostr::Event, Option<PublicKey>)) -> Result<Self> {
+        // TODO: turn trusted maintainer into NostrUrlDecoded
         if !event.kind.eq(&Kind::GitRepoAnnouncement) {
             bail!("incorrect kind");
         }
@@ -231,12 +235,18 @@ impl RepoRef {
             .collect::<Vec<(Coordinate, Option<Timestamp>)>>()
     }
 
-    pub fn to_nostr_git_url(&self) -> String {
+    pub fn to_nostr_git_url(&self, git_repo: &Option<&Repo>) -> String {
+        let c = self.coordinate_with_hint();
         format!(
             "{}",
             NostrUrlDecoded {
                 original_string: String::new(),
-                coordinate: self.coordinate_with_hint(),
+                nip05: use_nip05_git_config_cache_to_find_nip05_from_public_key(
+                    &c.public_key,
+                    git_repo,
+                )
+                .unwrap_or_default(),
+                coordinate: c,
                 protocol: None,
                 user: None,
             }
@@ -259,7 +269,7 @@ pub async fn get_repo_coordinates_when_remote_unknown(
 pub async fn try_and_get_repo_coordinates_when_remote_unknown(
     git_repo: &Repo,
 ) -> Result<Coordinate> {
-    let remote_coordinates = get_repo_coordinates_from_nostr_remotes(git_repo)?;
+    let remote_coordinates = get_repo_coordinates_from_nostr_remotes(git_repo).await?;
     if remote_coordinates.is_empty() {
         if let Ok(c) = get_repo_coordinates_from_git_config(git_repo) {
             Ok(c)
@@ -327,11 +337,15 @@ fn get_repo_coordinates_from_git_config(git_repo: &Repo) -> Result<Coordinate> {
     .context("git config item \"nostr.repo\" is not an naddr")
 }
 
-fn get_repo_coordinates_from_nostr_remotes(git_repo: &Repo) -> Result<HashMap<String, Coordinate>> {
+async fn get_repo_coordinates_from_nostr_remotes(
+    git_repo: &Repo,
+) -> Result<HashMap<String, Coordinate>> {
     let mut repo_coordinates = HashMap::new();
     for remote_name in git_repo.git_repo.remotes()?.iter().flatten() {
         if let Some(remote_url) = git_repo.git_repo.find_remote(remote_name)?.url() {
-            if let Ok(nostr_url_decoded) = NostrUrlDecoded::from_str(remote_url) {
+            if let Ok(nostr_url_decoded) =
+                NostrUrlDecoded::parse_and_resolve(remote_url, &Some(git_repo)).await
+            {
                 repo_coordinates.insert(remote_name.to_string(), nostr_url_decoded.coordinate);
             }
         }
@@ -383,7 +397,9 @@ async fn get_repo_coordinate_from_user_prompt(
                 .input(PromptInputParms::default().with_prompt("nostr repository"))?;
             let coordinate = if let Ok(c) = Coordinate::parse(&input) {
                 c
-            } else if let Ok(nostr_url) = NostrUrlDecoded::from_str(&input) {
+            } else if let Ok(nostr_url) =
+                NostrUrlDecoded::parse_and_resolve(&input, &Some(git_repo)).await
+            {
                 nostr_url.coordinate
             } else {
                 eprintln!("not a valid naddr or git nostr remote URL starting nostr://");
@@ -438,10 +454,10 @@ fn set_or_create_git_remote_with_nostr_url(
     repo_ref: &RepoRef,
     git_repo: &Repo,
 ) -> Result<()> {
-    let url = repo_ref.to_nostr_git_url();
+    let url = repo_ref.to_nostr_git_url(&Some(git_repo));
     if git_repo
         .git_repo
-        .remote_set_url(name, &repo_ref.to_nostr_git_url())
+        .remote_set_url(name, &repo_ref.to_nostr_git_url(&Some(git_repo)))
         .is_err()
     {
         git_repo.git_repo.remote(name, &url)?;