diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2024-09-25 14:37:17 +0100 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2024-09-25 14:37:17 +0100 |
| commit | d6faad17e814d252a72e3aca39a4b3898382bab9 (patch) | |
| tree | 16a238703293fe0d9cce04fa83de2af4a88f5433 /src/bin/git_remote_nostr/push.rs | |
| parent | 4f84dc460c3494286233afe9ca480d3b7c0186b1 (diff) | |
chore: bump rust-nostr v0.35
bump all rust-nostr packages
Diffstat (limited to 'src/bin/git_remote_nostr/push.rs')
| -rw-r--r-- | src/bin/git_remote_nostr/push.rs | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs index 0f4e792..db86c04 100644 --- a/src/bin/git_remote_nostr/push.rs +++ b/src/bin/git_remote_nostr/push.rs | |||
| @@ -184,7 +184,7 @@ pub async fn run_push( | |||
| 184 | if let Some((_, (proposal, patches))) = | 184 | if let Some((_, (proposal, patches))) = |
| 185 | find_proposal_and_patches_by_branch_name(to, &all_proposals, ¤t_user) | 185 | find_proposal_and_patches_by_branch_name(to, &all_proposals, ¤t_user) |
| 186 | { | 186 | { |
| 187 | if [repo_ref.maintainers.clone(), vec![proposal.author()]] | 187 | if [repo_ref.maintainers.clone(), vec![proposal.pubkey]] |
| 188 | .concat() | 188 | .concat() |
| 189 | .contains(&user_ref.public_key) | 189 | .contains(&user_ref.public_key) |
| 190 | { | 190 | { |
| @@ -200,7 +200,7 @@ pub async fn run_push( | |||
| 200 | &ahead, | 200 | &ahead, |
| 201 | &signer, | 201 | &signer, |
| 202 | repo_ref, | 202 | repo_ref, |
| 203 | &Some(proposal.id().to_string()), | 203 | &Some(proposal.id.to_string()), |
| 204 | &[], | 204 | &[], |
| 205 | ) | 205 | ) |
| 206 | .await? | 206 | .await? |
| @@ -223,7 +223,7 @@ pub async fn run_push( | |||
| 223 | root_event_id | 223 | root_event_id |
| 224 | } else { | 224 | } else { |
| 225 | // tip patch is the root proposal | 225 | // tip patch is the root proposal |
| 226 | tip_patch.id() | 226 | tip_patch.id |
| 227 | }; | 227 | }; |
| 228 | let mut parent_patch = tip_patch.clone(); | 228 | let mut parent_patch = tip_patch.clone(); |
| 229 | ahead.reverse(); | 229 | ahead.reverse(); |
| @@ -235,7 +235,7 @@ pub async fn run_push( | |||
| 235 | Some(thread_id), | 235 | Some(thread_id), |
| 236 | &signer, | 236 | &signer, |
| 237 | repo_ref, | 237 | repo_ref, |
| 238 | Some(parent_patch.id()), | 238 | Some(parent_patch.id), |
| 239 | Some(( | 239 | Some(( |
| 240 | (patches.len() + i + 1).try_into().unwrap(), | 240 | (patches.len() + i + 1).try_into().unwrap(), |
| 241 | (patches.len() + ahead.len()).try_into().unwrap(), | 241 | (patches.len() + ahead.len()).try_into().unwrap(), |
| @@ -901,8 +901,8 @@ async fn get_merged_status_events( | |||
| 901 | .await?; | 901 | .await?; |
| 902 | if let Some(commit_event) = commit_events.iter().find(|e| { | 902 | if let Some(commit_event) = commit_events.iter().find(|e| { |
| 903 | e.tags.iter().any(|t| { | 903 | e.tags.iter().any(|t| { |
| 904 | t.as_vec()[0].eq("commit") | 904 | t.as_slice()[0].eq("commit") |
| 905 | && t.as_vec()[1].eq(&parent.id().to_string()) | 905 | && t.as_slice()[1].eq(&parent.id().to_string()) |
| 906 | }) | 906 | }) |
| 907 | }) { | 907 | }) { |
| 908 | let (proposal_id, revision_id) = | 908 | let (proposal_id, revision_id) = |
| @@ -930,7 +930,7 @@ async fn get_merged_status_events( | |||
| 930 | None | 930 | None |
| 931 | }, | 931 | }, |
| 932 | &commit_hash, | 932 | &commit_hash, |
| 933 | commit_event.id(), | 933 | commit_event.id, |
| 934 | ) | 934 | ) |
| 935 | .await?, | 935 | .await?, |
| 936 | ); | 936 | ); |
| @@ -956,9 +956,9 @@ async fn create_merge_status( | |||
| 956 | .iter() | 956 | .iter() |
| 957 | .copied() | 957 | .copied() |
| 958 | .collect::<HashSet<PublicKey>>(); | 958 | .collect::<HashSet<PublicKey>>(); |
| 959 | public_keys.insert(proposal.author()); | 959 | public_keys.insert(proposal.pubkey); |
| 960 | if let Some(revision) = revision { | 960 | if let Some(revision) = revision { |
| 961 | public_keys.insert(revision.author()); | 961 | public_keys.insert(revision.pubkey); |
| 962 | } | 962 | } |
| 963 | sign_event( | 963 | sign_event( |
| 964 | EventBuilder::new( | 964 | EventBuilder::new( |
| @@ -971,7 +971,7 @@ async fn create_merge_status( | |||
| 971 | vec!["git proposal merged / applied".to_string()], | 971 | vec!["git proposal merged / applied".to_string()], |
| 972 | ), | 972 | ), |
| 973 | Tag::from_standardized(nostr::TagStandard::Event { | 973 | Tag::from_standardized(nostr::TagStandard::Event { |
| 974 | event_id: proposal.id(), | 974 | event_id: proposal.id, |
| 975 | relay_url: repo_ref.relays.first().map(nostr::UncheckedUrl::new), | 975 | relay_url: repo_ref.relays.first().map(nostr::UncheckedUrl::new), |
| 976 | marker: Some(Marker::Root), | 976 | marker: Some(Marker::Root), |
| 977 | public_key: None, | 977 | public_key: None, |
| @@ -985,7 +985,7 @@ async fn create_merge_status( | |||
| 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().map(nostr::UncheckedUrl::new), |
| 990 | marker: Some(Marker::Root), | 990 | marker: Some(Marker::Root), |
| 991 | public_key: None, | 991 | public_key: None, |
| @@ -1023,7 +1023,7 @@ async fn get_proposal_and_revision_root_from_patch( | |||
| 1023 | git_repo: &Repo, | 1023 | git_repo: &Repo, |
| 1024 | patch: &Event, | 1024 | patch: &Event, |
| 1025 | ) -> Result<(EventId, Option<EventId>)> { | 1025 | ) -> Result<(EventId, Option<EventId>)> { |
| 1026 | let proposal_or_revision = if patch.tags.iter().any(|t| t.as_vec()[1].eq("root")) { | 1026 | let proposal_or_revision = if patch.tags.iter().any(|t| t.as_slice()[1].eq("root")) { |
| 1027 | patch.clone() | 1027 | patch.clone() |
| 1028 | } else { | 1028 | } else { |
| 1029 | let proposal_or_revision_id = EventId::parse( | 1029 | let proposal_or_revision_id = EventId::parse( |
| @@ -1032,9 +1032,9 @@ async fn get_proposal_and_revision_root_from_patch( | |||
| 1032 | } else if let Some(t) = patch.tags.iter().find(|t| t.is_reply()) { | 1032 | } else if let Some(t) = patch.tags.iter().find(|t| t.is_reply()) { |
| 1033 | t.clone() | 1033 | t.clone() |
| 1034 | } else { | 1034 | } else { |
| 1035 | Tag::event(patch.id()) | 1035 | Tag::event(patch.id) |
| 1036 | } | 1036 | } |
| 1037 | .as_vec()[1] | 1037 | .as_slice()[1] |
| 1038 | .clone(), | 1038 | .clone(), |
| 1039 | )?; | 1039 | )?; |
| 1040 | 1040 | ||
| @@ -1048,14 +1048,14 @@ async fn get_proposal_and_revision_root_from_patch( | |||
| 1048 | .clone() | 1048 | .clone() |
| 1049 | }; | 1049 | }; |
| 1050 | 1050 | ||
| 1051 | if !proposal_or_revision.kind().eq(&Kind::GitPatch) { | 1051 | if !proposal_or_revision.kind.eq(&Kind::GitPatch) { |
| 1052 | bail!("thread root is not a git patch"); | 1052 | bail!("thread root is not a git patch"); |
| 1053 | } | 1053 | } |
| 1054 | 1054 | ||
| 1055 | if proposal_or_revision | 1055 | if proposal_or_revision |
| 1056 | .tags | 1056 | .tags |
| 1057 | .iter() | 1057 | .iter() |
| 1058 | .any(|t| t.as_vec()[1].eq("revision-root")) | 1058 | .any(|t| t.as_slice()[1].eq("revision-root")) |
| 1059 | { | 1059 | { |
| 1060 | Ok(( | 1060 | Ok(( |
| 1061 | EventId::parse( | 1061 | EventId::parse( |
| @@ -1064,13 +1064,13 @@ async fn get_proposal_and_revision_root_from_patch( | |||
| 1064 | .iter() | 1064 | .iter() |
| 1065 | .find(|t| t.is_reply()) | 1065 | .find(|t| t.is_reply()) |
| 1066 | .unwrap() | 1066 | .unwrap() |
| 1067 | .as_vec()[1] | 1067 | .as_slice()[1] |
| 1068 | .clone(), | 1068 | .clone(), |
| 1069 | )?, | 1069 | )?, |
| 1070 | Some(proposal_or_revision.id()), | 1070 | Some(proposal_or_revision.id), |
| 1071 | )) | 1071 | )) |
| 1072 | } else { | 1072 | } else { |
| 1073 | Ok((proposal_or_revision.id(), None)) | 1073 | Ok((proposal_or_revision.id, None)) |
| 1074 | } | 1074 | } |
| 1075 | } | 1075 | } |
| 1076 | 1076 | ||