From 3112576195aef212622d27ad9164336796c1953e Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Tue, 13 Feb 2024 06:27:34 +0000
Subject: feat(prs-create)!: pr to nip34-like cover letter

up the pr event type to a nip34-like cover letter format

this sets the building blocks in place to enable simplier clients to
use the 'cover letter' feature in `git format-patch` to create the
experience as a pr event
---
 src/sub_commands/push.rs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/sub_commands/push.rs')

diff --git a/src/sub_commands/push.rs b/src/sub_commands/push.rs
index 037d512..61d5d46 100644
--- a/src/sub_commands/push.rs
+++ b/src/sub_commands/push.rs
@@ -9,7 +9,7 @@ use crate::{
     client::Connect,
     git::{str_to_sha1, Repo, RepoActions},
     login,
-    repo_ref::{self, RepoRef},
+    repo_ref::{self, RepoRef, REPO_REF_KIND},
     sub_commands::prs::{
         create::{generate_patch_event, send_events, PATCH_KIND, PR_KIND},
         list::{get_most_recent_patch_with_ancestors, tag_value},
@@ -106,7 +106,7 @@ pub async fn launch(cli_args: &Cli) -> Result<()> {
                 &git_repo,
                 &root_commit,
                 commit,
-                pr_event.id,
+                Some(pr_event.id),
                 &keys,
                 &repo_ref,
                 patch_events.last().map(nostr::Event::id),
@@ -146,7 +146,12 @@ async fn fetch_pr_and_most_recent_patch_chain(
             vec![
                 nostr::Filter::default()
                     .kind(nostr::Kind::Custom(PR_KIND))
-                    .reference(format!("r-{root_commit}")),
+                    .identifiers(
+                        repo_ref
+                            .maintainers
+                            .iter()
+                            .map(|m| format!("{REPO_REF_KIND}:{m}:{}", repo_ref.identifier)),
+                    ),
             ],
         )
         .await?
@@ -155,7 +160,7 @@ async fn fetch_pr_and_most_recent_patch_chain(
             e.kind.as_u64() == PR_KIND
                 && e.tags
                     .iter()
-                    .any(|t| t.as_vec().len() > 1 && t.as_vec()[1].eq(&format!("r-{root_commit}")))
+                    .any(|t| t.as_vec().len() > 1 && t.as_vec()[1].eq(&format!("{root_commit}")))
                 && tag_value(e, "branch-name")
                     .unwrap_or_default()
                     .eq(branch_name)
-- 
cgit v1.2.3