From 5fe839e2bf8ceb2931c1984efb2d956980431203 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Mon, 16 Dec 2024 07:58:54 +0000 Subject: chore: nix flake update update nix dependancies to latest version using default update options fix warning related to idomatic patterns --- src/lib/git_events.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib') diff --git a/src/lib/git_events.rs b/src/lib/git_events.rs index 17fae8c..d8564ae 100644 --- a/src/lib/git_events.rs +++ b/src/lib/git_events.rs @@ -619,11 +619,11 @@ fn get_event_parent_id(event: &nostr::Event) -> Result { pub fn is_event_proposal_root_for_branch( e: &Event, branch_name_or_refstr: &str, - logged_in_user: &Option, + logged_in_user: Option<&PublicKey>, ) -> Result { let branch_name = branch_name_or_refstr.replace("refs/heads/", ""); Ok(event_to_cover_letter(e).is_ok_and(|cl| { - (logged_in_user.is_some_and(|public_key| e.pubkey.eq(&public_key)) + (logged_in_user.is_some_and(|public_key| e.pubkey.eq(public_key)) && (branch_name.eq(&format!("pr/{}", cl.branch_name)) || cl.branch_name.eq(&branch_name))) || cl.get_branch_name().is_ok_and(|s| s.eq(&branch_name)) -- cgit v1.2.3