3 files changed, 19 insertions, 11 deletions

diff --git a/src/lib/git/mod.rs b/src/lib/git/mod.rs
index 0615213..7a7ad5d 100644
--- a/src/lib/git/mod.rs
+++ b/src/lib/git/mod.rs
@@ -850,7 +850,7 @@ fn git_sig_to_tag_vec(sig: &git2::Signature) -> Vec<String> {
 fn extract_sig_from_patch_tags<'a>(tags: &'a Tags, tag_name: &str) -> Result<git2::Signature<'a>> {
     let v = tags
         .iter()
-        .find(|t| t.as_slice()[0].eq(tag_name))
+        .find(|t| !t.as_slice().is_empty() && t.as_slice()[0].eq(tag_name))
         .context(format!("tag '{tag_name}' not present in patch"))?
         .as_slice();
     if v.len() != 5 {
diff --git a/src/lib/git_events.rs b/src/lib/git_events.rs
index 10194bb..17fae8c 100644
--- a/src/lib/git_events.rs
+++ b/src/lib/git_events.rs
@@ -18,7 +18,7 @@ pub fn tag_value(event: &Event, tag_name: &str) -> Result<String> {
     Ok(event
         .tags
         .iter()
-        .find(|t| t.as_slice()[0].eq(tag_name))
+        .find(|t| !t.as_slice().is_empty() && t.as_slice()[0].eq(tag_name))
         .context(format!("tag '{tag_name}'not present"))?
         .as_slice()[1]
         .clone())
@@ -59,7 +59,11 @@ pub fn status_kinds() -> Vec<Kind> {
 }
 
 pub fn event_is_patch_set_root(event: &Event) -> bool {
-    event.kind.eq(&Kind::GitPatch) && event.tags.iter().any(|t| t.as_slice()[1].eq("root"))
+    event.kind.eq(&Kind::GitPatch)
+        && event
+            .tags
+            .iter()
+            .any(|t| t.as_slice().len() > 1 && t.as_slice()[1].eq("root"))
 }
 
 pub fn event_is_revision_root(event: &Event) -> bool {
@@ -67,7 +71,7 @@ pub fn event_is_revision_root(event: &Event) -> bool {
         && event
             .tags
             .iter()
-            .any(|t| t.as_slice()[1].eq("revision-root"))
+            .any(|t| t.as_slice().len() > 1 && t.as_slice()[1].eq("revision-root"))
 }
 
 pub fn patch_supports_commit_ids(event: &Event) -> bool {
@@ -75,7 +79,7 @@ pub fn patch_supports_commit_ids(event: &Event) -> bool {
         && event
             .tags
             .iter()
-            .any(|t| t.as_slice()[0].eq("commit-pgp-sig"))
+            .any(|t| !t.as_slice().is_empty() && t.as_slice()[0].eq("commit-pgp-sig"))
 }
 
 #[allow(clippy::too_many_arguments)]
@@ -473,11 +477,14 @@ pub fn event_is_cover_letter(event: &nostr::Event) -> bool {
     //   [PATCH v1 0/n ] or
     //   [PATCH subsystem v2 0/n ]
     event.kind.eq(&Kind::GitPatch)
-        && event.tags.iter().any(|t| t.as_slice()[1].eq("root"))
         && event
             .tags
             .iter()
-            .any(|t| t.as_slice()[1].eq("cover-letter"))
+            .any(|t| t.as_slice().len() > 1 && t.as_slice()[1].eq("root"))
+        && event
+            .tags
+            .iter()
+            .any(|t| t.as_slice().len() > 1 && t.as_slice()[1].eq("cover-letter"))
 }
 
 pub fn commit_msg_from_patch(patch: &nostr::Event) -> Result<String> {
diff --git a/src/lib/login/user.rs b/src/lib/login/user.rs
index c13cdf5..de4a2d9 100644
--- a/src/lib/login/user.rs
+++ b/src/lib/login/user.rs
@@ -187,10 +187,11 @@ pub fn extract_user_relays(public_key: &nostr::PublicKey, events: &[nostr::Event
                 .tags
                 .iter()
                 .filter(|t| {
-                    t.kind()
-                        .eq(&nostr::TagKind::SingleLetter(SingleLetterTag::lowercase(
-                            Alphabet::R,
-                        )))
+                    t.as_slice().len() > 1
+                        && t.kind()
+                            .eq(&nostr::TagKind::SingleLetter(SingleLetterTag::lowercase(
+                                Alphabet::R,
+                            )))
                 })
                 .map(|t| UserRelayRef {
                     url: t.as_slice()[1].clone(),