feat(remote): remove pr id postfix for authors

remove the (<short id>) post fix for remote proposal branches when
the current user is the author

this enables pushing new proposals without having to change the
upstream branch in a way that remote helpers weren't designed to do

2 files changed, 76 insertions, 43 deletions

diff --git a/src/git_remote_helper.rs b/src/git_remote_helper.rs
index be230b1..ff053f6 100644
--- a/src/git_remote_helper.rs
+++ b/src/git_remote_helper.rs
@@ -287,10 +287,19 @@ async fn list(
     state.retain(|k, _| !k.starts_with("refs/heads/prs/"));
 
     let open_proposals = get_open_proposals(git_repo, repo_ref).await?;
-
+    let current_user = get_curent_user(git_repo)?;
     for (_, (proposal, patches)) in open_proposals {
         if let Ok(cl) = event_to_cover_letter(&proposal) {
-            if let Ok(branch_name) = cl.get_branch_name() {
+            if let Ok(mut branch_name) = cl.get_branch_name() {
+                branch_name = if let Some(public_key) = current_user {
+                    if proposal.author().eq(&public_key) {
+                        cl.branch_name.to_string()
+                    } else {
+                        branch_name
+                    }
+                } else {
+                    branch_name
+                };
                 if let Some(patch) = patches.first() {
                     // TODO this isn't resilient because the commit id stated may not be correct
                     // we will need to check whether the commit id exists in the repo or apply the
@@ -435,6 +444,20 @@ async fn get_open_proposals(
     Ok(open_proposals)
 }
 
+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) {
+                Some(public_key)
+            } else {
+                None
+            }
+        } else {
+            None
+        },
+    )
+}
+
 async fn fetch(
     git_repo: &Repo,
     repo_ref: &RepoRef,
@@ -487,32 +510,36 @@ async fn fetch(
         );
     }
 
-    let open_proposals = get_open_proposals(git_repo, repo_ref).await?;
-
     fetch_batch.retain(|refstr, _| refstr.contains("refs/heads/prs/"));
 
-    for (refstr, oid) in fetch_batch {
-        if let Some((_, (_, patches))) =
-            find_proposal_and_patches_by_branch_name(&refstr, &open_proposals)
-        {
-            if !git_repo.does_commit_exist(&oid)? {
-                let mut patches_ancestor_first = patches.clone();
-                patches_ancestor_first.reverse();
-                if git_repo.does_commit_exist(&tag_value(
-                    patches_ancestor_first.first().unwrap(),
-                    "parent-commit",
-                )?)? {
-                    for patch in &patches_ancestor_first {
-                        git_repo.create_commit_from_patch(patch)?;
+    if !fetch_batch.is_empty() {
+        let open_proposals = get_open_proposals(git_repo, repo_ref).await?;
+
+        let current_user = get_curent_user(git_repo)?;
+
+        for (refstr, oid) in fetch_batch {
+            if let Some((_, (_, patches))) =
+                find_proposal_and_patches_by_branch_name(&refstr, &open_proposals, &current_user)
+            {
+                if !git_repo.does_commit_exist(&oid)? {
+                    let mut patches_ancestor_first = patches.clone();
+                    patches_ancestor_first.reverse();
+                    if git_repo.does_commit_exist(&tag_value(
+                        patches_ancestor_first.first().unwrap(),
+                        "parent-commit",
+                    )?)? {
+                        for patch in &patches_ancestor_first {
+                            git_repo.create_commit_from_patch(patch)?;
+                        }
+                    } else {
+                        term.write_line(
+                            format!("WARNING: cannot find parent commit for {refstr}").as_str(),
+                        )?;
                     }
-                } else {
-                    term.write_line(
-                        format!("WARNING: cannot find parent commit for {refstr}").as_str(),
-                    )?;
                 }
+            } else {
+                term.write_line(format!("WARNING: cannot find proposal for {refstr}").as_str())?;
             }
-        } else {
-            term.write_line(format!("WARNING: cannot find proposal for {refstr}").as_str())?;
         }
     }
 
@@ -524,10 +551,20 @@ async fn fetch(
 fn find_proposal_and_patches_by_branch_name<'a>(
     refstr: &'a str,
     open_proposals: &'a HashMap<EventId, (Event, Vec<Event>)>,
+    current_user: &Option<PublicKey>,
 ) -> Option<(&'a EventId, &'a (Event, Vec<Event>))> {
     open_proposals.iter().find(|(_, (proposal, _))| {
         if let Ok(cl) = event_to_cover_letter(proposal) {
-            if let Ok(branch_name) = cl.get_branch_name() {
+            if let Ok(mut branch_name) = cl.get_branch_name() {
+                branch_name = if let Some(public_key) = current_user {
+                    if proposal.author().eq(public_key) {
+                        cl.branch_name.to_string()
+                    } else {
+                        branch_name
+                    }
+                } else {
+                    branch_name
+                };
                 branch_name.eq(&refstr.replace("refs/heads/", ""))
             } else {
                 false
@@ -652,18 +689,19 @@ async fn push(
     let mut rejected_proposal_refspecs = vec![];
     if !proposal_refspecs.is_empty() {
         let open_proposals = get_open_proposals(git_repo, repo_ref).await?;
+        let current_user = get_curent_user(git_repo)?;
 
         for refspec in &proposal_refspecs {
             let (from, to) = refspec_to_from_to(refspec).unwrap();
+            let tip_of_pushed_branch = git_repo.get_commit_or_tip_of_reference(from)?;
 
             if let Some((_, (proposal, patches))) =
-                find_proposal_and_patches_by_branch_name(to, &open_proposals)
+                find_proposal_and_patches_by_branch_name(to, &open_proposals, &current_user)
             {
                 if [repo_ref.maintainers.clone(), vec![proposal.author()]]
                     .concat()
                     .contains(&user_ref.public_key)
                 {
-                    let tip_of_pushed_branch = git_repo.get_commit_or_tip_of_reference(from)?;
                     if refspec.starts_with('+') {
                         // force push
                         let (_, main_tip) = git_repo.get_main_or_master_branch()?;
diff --git a/tests/git_remote_helper.rs b/tests/git_remote_helper.rs
index f768806..7cf6799 100644
--- a/tests/git_remote_helper.rs
+++ b/tests/git_remote_helper.rs
@@ -28,15 +28,20 @@ fn get_nostr_remote_url() -> Result<String> {
 
 fn prep_git_repo() -> Result<GitTestRepo> {
     let test_repo = GitTestRepo::without_repo_in_git_config();
+    set_git_nostr_login_config(&test_repo)?;
+    test_repo.add_remote(NOSTR_REMOTE_NAME, &get_nostr_remote_url()?)?;
+    test_repo.populate()?;
+    Ok(test_repo)
+}
+
+fn set_git_nostr_login_config(test_repo: &GitTestRepo) -> Result<()> {
     let mut config = test_repo
         .git_repo
         .config()
         .context("cannot open git config")?;
-    config.set_str("nostr.nsec", TEST_KEY_1_NSEC)?;
-    config.set_str("nostr.npub", TEST_KEY_1_NPUB)?;
-    test_repo.add_remote(NOSTR_REMOTE_NAME, &get_nostr_remote_url()?)?;
-    test_repo.populate()?;
-    Ok(test_repo)
+    config.set_str("nostr.nsec", TEST_KEY_2_NSEC)?;
+    config.set_str("nostr.npub", TEST_KEY_2_NPUB)?;
+    Ok(())
 }
 
 fn clone_git_repo_with_nostr_url() -> Result<GitTestRepo> {
@@ -45,23 +50,13 @@ fn clone_git_repo_with_nostr_url() -> Result<GitTestRepo> {
     CliTester::new_git_with_remote_helper_from_dir(&path, ["clone", &get_nostr_remote_url()?, "."])
         .expect_end_eventually_and_print()?;
     let test_repo = GitTestRepo::open(&path)?;
-    let mut config = test_repo
-        .git_repo
-        .config()
-        .context("cannot open git config")?;
-    config.set_str("nostr.nsec", TEST_KEY_1_NSEC)?;
-    config.set_str("nostr.npub", TEST_KEY_1_NPUB)?;
+    set_git_nostr_login_config(&test_repo)?;
     Ok(test_repo)
 }
 
 fn prep_git_repo_minus_1_commit() -> Result<GitTestRepo> {
     let test_repo = GitTestRepo::without_repo_in_git_config();
-    let mut config = test_repo
-        .git_repo
-        .config()
-        .context("cannot open git config")?;
-    config.set_str("nostr.nsec", TEST_KEY_1_NSEC)?;
-    config.set_str("nostr.npub", TEST_KEY_1_NPUB)?;
+    set_git_nostr_login_config(&test_repo)?;
     test_repo.add_remote(NOSTR_REMOTE_NAME, &get_nostr_remote_url()?)?;
     test_repo.populate_minus_1()?;
     Ok(test_repo)