upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bin/git_remote_nostr/push.rs8
-rw-r--r--src/lib/client.rs6
-rw-r--r--src/lib/git_events.rs10
-rw-r--r--src/lib/repo_ref.rs1
4 files changed, 22 insertions, 3 deletions
diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs
index 3e2282a..6113c0a 100644
--- a/src/bin/git_remote_nostr/push.rs
+++ b/src/bin/git_remote_nostr/push.rs
@@ -1348,6 +1348,7 @@ async fn create_merge_status(
1348 .concat(), 1348 .concat(),
1349 ), 1349 ),
1350 signer, 1350 signer,
1351 "PR merge".to_string(),
1351 ) 1352 )
1352 .await 1353 .await
1353} 1354}
@@ -1536,7 +1537,12 @@ impl BuildRepoState for RepoState {
1536 value.clone(), 1537 value.clone(),
1537 ])); 1538 ]));
1538 } 1539 }
1539 let event = sign_event(EventBuilder::new(STATE_KIND, "").tags(tags), signer).await?; 1540 let event = sign_event(
1541 EventBuilder::new(STATE_KIND, "").tags(tags),
1542 signer,
1543 "git state".to_string(),
1544 )
1545 .await?;
1540 Ok(RepoState { 1546 Ok(RepoState {
1541 identifier, 1547 identifier,
1542 state, 1548 state,
diff --git a/src/lib/client.rs b/src/lib/client.rs
index b06ae2e..478a16a 100644
--- a/src/lib/client.rs
+++ b/src/lib/client.rs
@@ -675,10 +675,14 @@ fn get_dedup_events(relay_results: Vec<Result<Vec<nostr::Event>>>) -> Vec<Event>
675pub async fn sign_event( 675pub async fn sign_event(
676 event_builder: EventBuilder, 676 event_builder: EventBuilder,
677 signer: &Arc<dyn NostrSigner>, 677 signer: &Arc<dyn NostrSigner>,
678 description: String,
678) -> Result<nostr::Event> { 679) -> Result<nostr::Event> {
679 if signer.backend() == SignerBackend::NostrConnect { 680 if signer.backend() == SignerBackend::NostrConnect {
680 let term = console::Term::stderr(); 681 let term = console::Term::stderr();
681 term.write_line("signing event with remote signer...")?; 682 term.write_line(&format!(
683 "signing event ({}) with remote signer...",
684 description
685 ))?;
682 let event = signer 686 let event = signer
683 .sign_event(event_builder.build(signer.get_public_key().await?)) 687 .sign_event(event_builder.build(signer.get_public_key().await?))
684 .await 688 .await
diff --git a/src/lib/git_events.rs b/src/lib/git_events.rs
index 2b3df42..3ce7637 100644
--- a/src/lib/git_events.rs
+++ b/src/lib/git_events.rs
@@ -241,6 +241,11 @@ pub async fn generate_patch_event(
241 .concat(), 241 .concat(),
242 ), 242 ),
243 signer, 243 signer,
244 if let Some((n, total)) = series_count {
245 format!("commit {n}/{total}")
246 } else {
247 "commit 1/1".to_string()
248 },
244 ) 249 )
245 .await 250 .await
246 .context("failed to sign event") 251 .context("failed to sign event")
@@ -407,7 +412,10 @@ pub async fn generate_cover_letter_and_patch_events(
407 .map(|pk| Tag::public_key(*pk)) 412 .map(|pk| Tag::public_key(*pk))
408 .collect(), 413 .collect(),
409 ].concat(), 414 ].concat(),
410 ), signer).await 415 ),
416 signer,
417 format!("commit 0/{}",commits.len()),
418).await
411 .context("failed to create cover-letter event")?); 419 .context("failed to create cover-letter event")?);
412 } 420 }
413 421
diff --git a/src/lib/repo_ref.rs b/src/lib/repo_ref.rs
index b21a911..d37d7a9 100644
--- a/src/lib/repo_ref.rs
+++ b/src/lib/repo_ref.rs
@@ -195,6 +195,7 @@ impl RepoRef {
195 .concat(), 195 .concat(),
196 ), 196 ),
197 signer, 197 signer,
198 "repo announcement".to_string(),
198 ) 199 )
199 .await 200 .await
200 .context("failed to create repository reference event") 201 .context("failed to create repository reference event")