3 files changed, 46 insertions, 3 deletions

diff --git a/src/lib/git_events.rs b/src/lib/git_events.rs
index 79f5772..bbfcbea 100644
--- a/src/lib/git_events.rs
+++ b/src/lib/git_events.rs
@@ -376,11 +376,13 @@ pub fn event_tag_from_nip19_or_hex(
     }
 }
 
+#[allow(clippy::too_many_arguments)]
 pub fn generate_unsigned_pr_or_update_event(
     git_repo: &Repo,
     repo_ref: &RepoRef,
     signing_public_key: &PublicKey,
     root_proposal: Option<&Event>,
+    title_description_overide: &Option<(String, String)>,
     commit: &Sha1Hash,
     clone_url_hint: &[&str],
     mentions: &[nostr::Tag],
@@ -395,13 +397,17 @@ pub fn generate_unsigned_pr_or_update_event(
         None
     };
 
-    let title = if let Some(cl) = &root_patch_cover_letter {
+    let title = if let Some((title, _)) = &title_description_overide {
+        title.clone()
+    } else if let Some(cl) = &root_patch_cover_letter {
         cl.title.clone()
     } else {
         git_repo.get_commit_message_summary(commit)?
     };
 
-    let description = if let Some(cl) = &root_patch_cover_letter {
+    let description = if let Some((_, description)) = &title_description_overide {
+        description.clone()
+    } else if let Some(cl) = &root_patch_cover_letter {
         cl.description.clone()
     } else {
         let mut description = git_repo.get_commit_message(commit)?.trim().to_string();
diff --git a/src/lib/push.rs b/src/lib/push.rs
index 1c09555..bcd368b 100644
--- a/src/lib/push.rs
+++ b/src/lib/push.rs
@@ -321,12 +321,14 @@ impl<'a> PushReporter<'a> {
     }
 }
 
+#[allow(clippy::too_many_arguments)]
 pub async fn push_refs_and_generate_pr_or_pr_update_event(
     git_repo: &Repo,
     repo_ref: &RepoRef,
     tip: &Sha1Hash,
     user_ref: &UserRef,
     root_proposal: Option<&Event>,
+    title_description_overide: &Option<(String, String)>,
     signer: &Arc<dyn NostrSigner>,
     term: &Term,
 ) -> Result<Vec<Event>> {
@@ -348,6 +350,7 @@ pub async fn push_refs_and_generate_pr_or_pr_update_event(
                 repo_ref,
                 &user_ref.public_key,
                 root_proposal,
+                title_description_overide,
                 tip,
                 &[clone_url],
                 &[],
diff --git a/src/lib/utils.rs b/src/lib/utils.rs
index 431757f..431a14f 100644
--- a/src/lib/utils.rs
+++ b/src/lib/utils.rs
@@ -3,11 +3,13 @@ use std::{
     collections::HashMap,
     fmt,
     io::{self, Stdin},
+    path::Path,
     str::FromStr,
 };
 
 use anyhow::{Context, Result, bail};
 use git2::Repository;
+use nostr::nips::nip19::ToBech32;
 use nostr_sdk::{Event, EventId, Kind, PublicKey, Url};
 
 use crate::{
@@ -20,7 +22,8 @@ use crate::{
         nostr_url::{CloneUrl, NostrUrlDecoded, ServerProtocol},
     },
     git_events::{
-        event_is_revision_root, get_pr_tip_event_or_most_recent_patch_with_ancestors, get_status,
+        KIND_PULL_REQUEST, KIND_PULL_REQUEST_UPDATE, event_is_revision_root,
+        get_pr_tip_event_or_most_recent_patch_with_ancestors, get_status,
         is_event_proposal_root_for_branch, status_kinds,
     },
     repo_ref::RepoRef,
@@ -187,6 +190,37 @@ pub async fn get_all_proposals(
     Ok(all_proposals)
 }
 
+pub async fn proposal_tip_is_pr_or_pr_update(
+    git_repo_path: &Path,
+    repo_ref: &RepoRef,
+    proposal_id: &EventId,
+) -> Result<bool> {
+    let commits_events =
+        get_all_proposal_patch_pr_pr_update_events_from_cache(git_repo_path, repo_ref, proposal_id)
+            .await
+            .context(format!(
+                "cannot get existing proposal events for {}",
+                proposal_id.to_bech32()?
+            ))?;
+    let most_recent_proposal_patch_chain = get_pr_tip_event_or_most_recent_patch_with_ancestors(
+        commits_events.clone(),
+    )
+    .context(format!(
+        "cannot find tip from proposal events for {}",
+        proposal_id.to_bech32()?,
+    ))?;
+
+    Ok([KIND_PULL_REQUEST, KIND_PULL_REQUEST_UPDATE].contains(
+        &most_recent_proposal_patch_chain
+            .first()
+            .context(format!(
+                "cannot find any proposal events for {}",
+                proposal_id.to_bech32()?
+            ))?
+            .kind,
+    ))
+}
+
 pub fn find_proposal_and_patches_by_branch_name<'a>(
     refstr: &'a str,
     proposals: &'a HashMap<EventId, (Event, Vec<Event>)>,