upleb.uk

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

summaryrefslogtreecommitdiff
path: root/src/bin/git_remote_nostr
diff options
context:
space:
mode:
authorDanConwayDev <DanConwayDev@protonmail.com>2024-11-27 17:08:25 +0000
committerDanConwayDev <DanConwayDev@protonmail.com>2024-11-27 17:08:25 +0000
commit83448a99aaf18c7a045a081c5de0c22bc4a83de1 (patch)
tree28076a33b40e63937d79a8fe8d54b58d42db092c /src/bin/git_remote_nostr
parent5478aa74cc26452809e499a461067ca9744cb7ce (diff)
chore: bump rust-nosrt v0.37.0
use RelayUrl in repo_ref which I had resisted as it mutates relay urls when printed to append a slash
Diffstat (limited to 'src/bin/git_remote_nostr')
-rw-r--r--src/bin/git_remote_nostr/push.rs15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs
index 381a45e..d8ba65a 100644
--- a/src/bin/git_remote_nostr/push.rs
+++ b/src/bin/git_remote_nostr/push.rs
@@ -961,9 +961,7 @@ async fn create_merge_status(
961 public_keys.insert(revision.pubkey); 961 public_keys.insert(revision.pubkey);
962 } 962 }
963 sign_event( 963 sign_event(
964 EventBuilder::new( 964 EventBuilder::new(nostr::event::Kind::GitStatusApplied, String::new()).tags(
965 nostr::event::Kind::GitStatusApplied,
966 String::new(),
967 [ 965 [
968 vec![ 966 vec![
969 Tag::custom( 967 Tag::custom(
@@ -972,23 +970,26 @@ async fn create_merge_status(
972 ), 970 ),
973 Tag::from_standardized(nostr::TagStandard::Event { 971 Tag::from_standardized(nostr::TagStandard::Event {
974 event_id: proposal.id, 972 event_id: proposal.id,
975 relay_url: repo_ref.relays.first().map(nostr::UncheckedUrl::new), 973 relay_url: repo_ref.relays.first().cloned(),
976 marker: Some(Marker::Root), 974 marker: Some(Marker::Root),
977 public_key: None, 975 public_key: None,
976 uppercase: false,
978 }), 977 }),
979 Tag::from_standardized(nostr::TagStandard::Event { 978 Tag::from_standardized(nostr::TagStandard::Event {
980 event_id: merged_patch, 979 event_id: merged_patch,
981 relay_url: repo_ref.relays.first().map(nostr::UncheckedUrl::new), 980 relay_url: repo_ref.relays.first().cloned(),
982 marker: Some(Marker::Mention), 981 marker: Some(Marker::Mention),
983 public_key: None, 982 public_key: None,
983 uppercase: false,
984 }), 984 }),
985 ], 985 ],
986 if let Some(revision) = revision { 986 if let Some(revision) = revision {
987 vec![Tag::from_standardized(nostr::TagStandard::Event { 987 vec![Tag::from_standardized(nostr::TagStandard::Event {
988 event_id: revision.id, 988 event_id: revision.id,
989 relay_url: repo_ref.relays.first().map(nostr::UncheckedUrl::new), 989 relay_url: repo_ref.relays.first().cloned(),
990 marker: Some(Marker::Root), 990 marker: Some(Marker::Root),
991 public_key: None, 991 public_key: None,
992 uppercase: false,
992 })] 993 })]
993 } else { 994 } else {
994 vec![] 995 vec![]
@@ -1202,7 +1203,7 @@ impl BuildRepoState for RepoState {
1202 vec![value.clone()], 1203 vec![value.clone()],
1203 )); 1204 ));
1204 } 1205 }
1205 let event = sign_event(EventBuilder::new(STATE_KIND, "", tags), signer).await?; 1206 let event = sign_event(EventBuilder::new(STATE_KIND, "").tags(tags), signer).await?;
1206 Ok(RepoState { 1207 Ok(RepoState {
1207 identifier, 1208 identifier,
1208 state, 1209 state,