diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2024-08-28 14:20:34 +0100 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2024-08-28 16:42:53 +0100 |
| commit | a5216602749bff55c2773acce098c91942cd3920 (patch) | |
| tree | f1961c73d0586cab4de8fd54aafd9ba8171f3adb /src/sub_commands | |
| parent | 2045aa5d928306f2a03cc924eac9c453c399b9b8 (diff) | |
chore: bump rust-nostr to v0.34.0
bump all rust-nostr packages
I'm not sure I'm completely happy with allowing mutable_key_type
but it is just run inside tests
it appears that Event didn't have the Copy trait in v0.33.0 so I'm
not sure why this warning suddenly appeared
the timeout of client.get_events_of needed to be doubled which could
indicate that an ineffiency has been introduced in v0.34.0
the primary motivation for upgrading now was to get this fix:
nostr:nevent1qqsffl2ld678pjj77rh9k2g4edljmxdu6ew4lvgnglxv7jhu3ru8vvcpp4mhxue69uhkummn9ekx7mqzyzsq3hh327t0h2dq6matqn5064cgj2zanl2stkj6s0lg4t2h5dty6rm2ucm
as I suspect it is also effecting other repositories
eg nostr-profile-manager
Diffstat (limited to 'src/sub_commands')
| -rw-r--r-- | src/sub_commands/list.rs | 7 | ||||
| -rw-r--r-- | src/sub_commands/send.rs | 18 |
2 files changed, 17 insertions, 8 deletions
diff --git a/src/sub_commands/list.rs b/src/sub_commands/list.rs index 73ef107..ac1f4ab 100644 --- a/src/sub_commands/list.rs +++ b/src/sub_commands/list.rs | |||
| @@ -78,7 +78,8 @@ pub async fn launch() -> Result<()> { | |||
| 78 | .iter() | 78 | .iter() |
| 79 | .filter(|e| { | 79 | .filter(|e| { |
| 80 | status_kinds().contains(&e.kind()) | 80 | status_kinds().contains(&e.kind()) |
| 81 | && e.iter_tags() | 81 | && e.tags() |
| 82 | .iter() | ||
| 82 | .any(|t| t.as_vec()[1].eq(&proposal.id.to_string())) | 83 | .any(|t| t.as_vec()[1].eq(&proposal.id.to_string())) |
| 83 | }) | 84 | }) |
| 84 | .collect::<Vec<&nostr::Event>>() | 85 | .collect::<Vec<&nostr::Event>>() |
| @@ -873,7 +874,7 @@ pub async fn get_all_proposal_patch_events_from_cache( | |||
| 873 | .iter() | 874 | .iter() |
| 874 | .copied() | 875 | .copied() |
| 875 | .collect(); | 876 | .collect(); |
| 876 | commit_events.retain(|e| permissioned_users.contains(e.author_ref())); | 877 | commit_events.retain(|e| permissioned_users.contains(&e.author())); |
| 877 | 878 | ||
| 878 | let revision_roots: HashSet<nostr::EventId> = commit_events | 879 | let revision_roots: HashSet<nostr::EventId> = commit_events |
| 879 | .iter() | 880 | .iter() |
| @@ -899,7 +900,7 @@ pub async fn get_all_proposal_patch_events_from_cache( | |||
| 899 | 900 | ||
| 900 | Ok(commit_events | 901 | Ok(commit_events |
| 901 | .iter() | 902 | .iter() |
| 902 | .filter(|e| !event_is_cover_letter(e) && permissioned_users.contains(e.author_ref())) | 903 | .filter(|e| !event_is_cover_letter(e) && permissioned_users.contains(&e.author())) |
| 903 | .cloned() | 904 | .cloned() |
| 904 | .collect()) | 905 | .collect()) |
| 905 | } | 906 | } |
diff --git a/src/sub_commands/send.rs b/src/sub_commands/send.rs index 8369b10..3c4df9d 100644 --- a/src/sub_commands/send.rs +++ b/src/sub_commands/send.rs | |||
| @@ -806,8 +806,11 @@ pub fn event_is_cover_letter(event: &nostr::Event) -> bool { | |||
| 806 | // [PATCH v1 0/n ] or | 806 | // [PATCH v1 0/n ] or |
| 807 | // [PATCH subsystem v2 0/n ] | 807 | // [PATCH subsystem v2 0/n ] |
| 808 | event.kind.eq(&Kind::GitPatch) | 808 | event.kind.eq(&Kind::GitPatch) |
| 809 | && event.iter_tags().any(|t| t.as_vec()[1].eq("root")) | 809 | && event.tags().iter().any(|t| t.as_vec()[1].eq("root")) |
| 810 | && event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter")) | 810 | && event |
| 811 | .tags() | ||
| 812 | .iter() | ||
| 813 | .any(|t| t.as_vec()[1].eq("cover-letter")) | ||
| 811 | } | 814 | } |
| 812 | 815 | ||
| 813 | pub fn commit_msg_from_patch(patch: &nostr::Event) -> Result<String> { | 816 | pub fn commit_msg_from_patch(patch: &nostr::Event) -> Result<String> { |
| @@ -876,17 +879,22 @@ pub fn event_to_cover_letter(event: &nostr::Event) -> Result<CoverLetter> { | |||
| 876 | } | 879 | } |
| 877 | 880 | ||
| 878 | pub fn event_is_patch_set_root(event: &nostr::Event) -> bool { | 881 | pub fn event_is_patch_set_root(event: &nostr::Event) -> bool { |
| 879 | event.kind.eq(&Kind::GitPatch) && event.iter_tags().any(|t| t.as_vec()[1].eq("root")) | 882 | event.kind.eq(&Kind::GitPatch) && event.tags().iter().any(|t| t.as_vec()[1].eq("root")) |
| 880 | } | 883 | } |
| 881 | 884 | ||
| 882 | pub fn event_is_revision_root(event: &nostr::Event) -> bool { | 885 | pub fn event_is_revision_root(event: &nostr::Event) -> bool { |
| 883 | event.kind.eq(&Kind::GitPatch) && event.iter_tags().any(|t| t.as_vec()[1].eq("revision-root")) | 886 | event.kind.eq(&Kind::GitPatch) |
| 887 | && event | ||
| 888 | .tags() | ||
| 889 | .iter() | ||
| 890 | .any(|t| t.as_vec()[1].eq("revision-root")) | ||
| 884 | } | 891 | } |
| 885 | 892 | ||
| 886 | pub fn patch_supports_commit_ids(event: &nostr::Event) -> bool { | 893 | pub fn patch_supports_commit_ids(event: &nostr::Event) -> bool { |
| 887 | event.kind.eq(&Kind::GitPatch) | 894 | event.kind.eq(&Kind::GitPatch) |
| 888 | && event | 895 | && event |
| 889 | .iter_tags() | 896 | .tags() |
| 897 | .iter() | ||
| 890 | .any(|t| t.as_vec()[0].eq("commit-pgp-sig")) | 898 | .any(|t| t.as_vec()[0].eq("commit-pgp-sig")) |
| 891 | } | 899 | } |
| 892 | 900 | ||