2 files changed, 42 insertions, 163 deletions

diff --git a/src/bin/git_remote_nostr/fetch.rs b/src/bin/git_remote_nostr/fetch.rs
index 221d964..2cc87da 100644
--- a/src/bin/git_remote_nostr/fetch.rs
+++ b/src/bin/git_remote_nostr/fetch.rs
@@ -18,7 +18,7 @@ use ngit::{
     },
     git_events::{KIND_PULL_REQUEST, KIND_PULL_REQUEST_UPDATE, tag_value},
     login::get_curent_user,
-    repo_ref::{RepoRef, is_grasp_server},
+    repo_ref::{RepoRef, is_grasp_server_in_list},
     utils::{
         Direction, find_proposal_and_patches_by_branch_name, get_oids_from_fetch_batch,
         get_open_or_draft_proposals, get_read_protocols_to_try, join_with_and,
@@ -96,7 +96,7 @@ pub async fn run_fetch(
             git_server_url,
             &repo_ref.to_nostr_git_url(&None),
             &term,
-            is_grasp_server(git_server_url, &repo_ref.grasp_servers()),
+            is_grasp_server_in_list(git_server_url, &repo_ref.grasp_servers()),
         ) {
             errors.push(error);
         }
diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs
index d0cf923..1738790 100644
--- a/src/bin/git_remote_nostr/push.rs
+++ b/src/bin/git_remote_nostr/push.rs
@@ -10,25 +10,24 @@ use client::{get_events_from_local_cache, get_state_from_cache, send_events, sig
 use console::Term;
 use git::{RepoActions, sha1_to_oid};
 use git_events::{
-    generate_cover_letter_and_patch_events, generate_patch_event,
-    generate_unsigned_pr_or_update_event, get_commit_id_from_patch,
+    generate_cover_letter_and_patch_events, generate_patch_event, get_commit_id_from_patch,
 };
 use git2::{Oid, Repository};
 use ngit::{
-    client::{self, get_event_from_cache_by_id, sign_draft_event},
+    client::{self, get_event_from_cache_by_id},
     git::{self, nostr_url::NostrUrlDecoded},
     git_events::{self, KIND_PULL_REQUEST, event_to_cover_letter, get_event_root},
     list::list_from_remotes,
     login::{self, user::UserRef},
-    push::{push_to_remote, push_to_remote_url},
-    repo_ref::{self, get_repo_config_from_yaml, is_grasp_server, normalize_grasp_server_url},
+    push::{push_refs_and_generate_pr_or_pr_update_event, push_to_remote},
+    repo_ref::{self, get_repo_config_from_yaml, is_grasp_server_in_list},
     repo_state,
     utils::{
         find_proposal_and_patches_by_branch_name, get_all_proposals, get_remote_name_by_url,
         get_short_git_server_name, read_line,
     },
 };
-use nostr::{event::UnsignedEvent, nips::nip10::Marker};
+use nostr::nips::nip10::Marker;
 use nostr_sdk::{
     Event, EventBuilder, EventId, Kind, NostrSigner, PublicKey, RelayUrl, Tag, TagStandard,
     hashes::sha1::Hash as Sha1Hash,
@@ -154,7 +153,7 @@ pub async fn run_push(
                         &repo_ref.to_nostr_git_url(&None),
                         &remote_refspecs,
                         &term,
-                        is_grasp_server(&git_server_url, &repo_ref.grasp_servers()),
+                        is_grasp_server_in_list(&git_server_url, &repo_ref.grasp_servers()),
                     );
                 }
             }
@@ -357,7 +356,7 @@ async fn process_proposal_refspecs(
                             );
                         }
                         if proposal.kind.eq(&KIND_PULL_REQUEST)
-                            || are_commits_too_big_for_patches(git_repo, &ahead)
+                            || git_repo.are_commits_too_big_for_patches(&ahead)
                         {
                             for event in generate_patches_or_pr_event_or_pr_updates(
                                 git_repo,
@@ -441,19 +440,6 @@ async fn process_proposal_refspecs(
     Ok((events, rejected_proposal_refspecs))
 }
 
-fn are_commits_too_big_for_patches(git_repo: &Repo, commits: &[Sha1Hash]) -> bool {
-    commits.iter().any(|commit| {
-        if let Ok(patch) = git_repo.make_patch_from_commit(commit, &None) {
-            patch.len()
-                > ((65 // max recomended patch event size specified in nip34 in kb
-            // allownace for nostr event wrapper (id, pubkey, tags, sig)
-            - 1) * 1024)
-        } else {
-            true
-        }
-    })
-}
-
 #[allow(clippy::too_many_lines)]
 async fn generate_patches_or_pr_event_or_pr_updates(
     git_repo: &Repo,
@@ -464,96 +450,50 @@ async fn generate_patches_or_pr_event_or_pr_updates(
     signer: &Arc<dyn NostrSigner>,
     term: &Term,
 ) -> Result<Vec<Event>> {
-    let mut events: Vec<Event> = vec![];
-    let use_pr = root_proposal.is_some_and(|proposal| proposal.kind.eq(&KIND_PULL_REQUEST))
-        || are_commits_too_big_for_patches(git_repo, ahead);
+    let parent_is_pr = root_proposal.is_some_and(|proposal| proposal.kind.eq(&KIND_PULL_REQUEST));
+    let use_pr = parent_is_pr || git_repo.are_commits_too_big_for_patches(ahead);
 
     if use_pr {
         let repo_grasps = repo_ref.grasp_servers();
-        let repo_grasp_clone_urls = repo_ref
+        let repo_grasp_clone_urls: Vec<String> = repo_ref
             .git_server
             .iter()
-            .filter(|s| is_grasp_server(s, &repo_grasps));
-
-        let mut unsigned_pr_event: Option<UnsignedEvent> = None;
-        let mut failed_clone_urls = vec![];
-        for clone_url in repo_grasp_clone_urls {
-            let mut draft_pr_event = if let Some(ref unsigned_pr_event) = unsigned_pr_event {
-                unsigned_pr_event.clone()
-            } else {
-                generate_unsigned_pr_or_update_event(
-                    git_repo,
-                    repo_ref,
-                    &user_ref.public_key,
-                    root_proposal,
-                    ahead.first().context("no commits to push")?,
-                    &[clone_url],
-                    &[],
-                )?
-            };
-
-            let refspec = format!(
-                "{}:refs/nostr/{}",
-                ahead.first().unwrap(),
-                draft_pr_event.id()
-            );
-
-            if let Err(error) = push_to_remote_url(git_repo, clone_url, &[refspec], term) {
-                failed_clone_urls.push(clone_url);
-                term.write_line(
-                    format!(
-                        "push: error sending commit data to {}: {error}",
-                        normalize_grasp_server_url(clone_url)?
-                    )
-                    .as_str(),
-                )?;
-            } else {
-                term.write_line(
-                    format!(
-                        "push: commit data sent to {}",
-                        normalize_grasp_server_url(clone_url)?
-                    )
-                    .as_str(),
-                )?;
-                unsigned_pr_event = Some(draft_pr_event);
-            }
-        }
-        if unsigned_pr_event.is_none() {
-            bail!(
-                "a commit in your proposal is too big for a nostr patch. The repository doesnt list a grasp server which would otherwise be used to submit your proposal as nostr Pull Request. Soon ngit will support pushing your changes to a different git / grasp git server."
-            );
+            .filter(|s| is_grasp_server_in_list(s, &repo_grasps))
+            .cloned()
+            .collect();
 
+        if repo_grasp_clone_urls.is_empty() {
             // TODO get grasp_default_set servers that aren't in repo_grasps
             // cycle through until one succeeds TODO create
             // personal-fork announcement with grasp servers and
             // push, after a few seconds push ref/nostr/eventid. if
             // one success break out of for loop and continue
+
+            bail!(
+                "The repository doesnt list a grasp server which would otherwise be used to submit your proposal as nostr Pull Request. Soon ngit will support pushing your changes to a different git / grasp git server."
+            );
         }
-        if let Some(unsigned_pr_event) = unsigned_pr_event {
-            let pr_event = sign_draft_event(
-                unsigned_pr_event,
-                signer,
-                if root_proposal.is_some_and(|proposal| proposal.kind.eq(&Kind::GitPatch)) {
-                    "Pull Request Replacing Original Patch"
-                } else if root_proposal.is_some() {
-                    "Pull Request Update"
-                } else {
-                    "Pull Request"
-                }
-                .to_string(),
-            )
-            .await?;
-            events.push(pr_event);
-            if root_proposal.is_some_and(|proposal| proposal.kind.eq(&Kind::GitPatch)) {
-                events.push(
-                    create_close_status_for_original_patch(
-                        signer,
-                        repo_ref,
-                        root_proposal.unwrap(),
-                    )
-                    .await?,
-                );
+
+        if let (Some(events), _) = push_refs_and_generate_pr_or_pr_update_event(
+            git_repo,
+            repo_ref,
+            ahead.first().context("no commits to push")?,
+            user_ref,
+            root_proposal,
+            &None,
+            &repo_grasp_clone_urls,
+            None,
+            signer,
+            term,
+        )
+        .await.context(
+            if parent_is_pr {
+                "couldn't generate PR update event"
+            } else {
+                "a commit in your proposal is too big for a nostr patch so we tried to create it as a nostr PR instead. Unfortunately this failed."
             }
+        )? {
+            Ok(events)
         } else {
             bail!(
                 "a commit in your proposal is too big for a nostr patch. tried to use submit as a nostr Pull Request but could not find a grasp server that would accept your changes"
@@ -562,7 +502,7 @@ async fn generate_patches_or_pr_event_or_pr_updates(
             // url to push to once that feature is added
         }
     } else {
-        for patch in generate_cover_letter_and_patch_events(
+        generate_cover_letter_and_patch_events(
             None,
             git_repo,
             ahead,
@@ -571,13 +511,8 @@ async fn generate_patches_or_pr_event_or_pr_updates(
             &root_proposal.map(|proposal| proposal.id.to_string()),
             &[],
         )
-        .await?
-        {
-            events.push(patch);
-        }
+        .await
     }
-
-    Ok(events)
 }
 
 type HashMapUrlRefspecs = HashMap<String, Vec<String>>;
@@ -1272,62 +1207,6 @@ async fn create_merge_status(
     .await
 }
 
-async fn create_close_status_for_original_patch(
-    signer: &Arc<dyn NostrSigner>,
-    repo_ref: &RepoRef,
-    proposal: &Event,
-) -> Result<Event> {
-    let mut public_keys = repo_ref
-        .maintainers
-        .iter()
-        .copied()
-        .collect::<HashSet<PublicKey>>();
-    public_keys.insert(proposal.pubkey);
-
-    sign_event(
-        EventBuilder::new(nostr::event::Kind::GitStatusClosed, String::new()).tags(
-            [
-                vec![
-                    Tag::custom(
-                        nostr::TagKind::Custom(std::borrow::Cow::Borrowed("alt")),
-                        vec![
-                            "Git patch closed as forthcoming update is too large. Replacing with Pull Request"
-                                .to_string(),
-                        ],
-                    ),
-                    Tag::from_standardized(nostr::TagStandard::Event {
-                        event_id: proposal.id,
-                        relay_url: repo_ref.relays.first().cloned(),
-                        marker: Some(Marker::Root),
-                        public_key: None,
-                        uppercase: false,
-                    }),
-                ],
-                public_keys.iter().map(|pk| Tag::public_key(*pk)).collect(),
-                repo_ref
-                    .coordinates()
-                    .iter()
-                    .map(|c| {
-                        Tag::from_standardized(TagStandard::Coordinate {
-                            coordinate: c.coordinate.clone(),
-                            relay_url: c.relays.first().cloned(),
-                            uppercase: false,
-                        })
-                    })
-                    .collect::<Vec<Tag>>(),
-                vec![
-                    Tag::from_standardized(nostr::TagStandard::Reference(
-                        repo_ref.root_commit.to_string(),
-                    )),
-                ],
-            ]
-            .concat(),
-        ),
-        signer,
-        "close status for original patch".to_string(),
-    )
-    .await
-}
 async fn get_proposal_and_revision_root_from_patch(
     git_repo: &Repo,
     patch: &Event,