2 files changed, 21 insertions, 2 deletions

diff --git a/src/lib/client.rs b/src/lib/client.rs
index 1f3b08c..091d68d 100644
--- a/src/lib/client.rs
+++ b/src/lib/client.rs
@@ -49,7 +49,8 @@ use crate::{
     git::{Repo, RepoActions, get_git_config_item},
     git_events::{
         KIND_PULL_REQUEST, KIND_PULL_REQUEST_UPDATE, event_is_cover_letter,
-        event_is_patch_set_root, event_is_revision_root, status_kinds,
+        event_is_patch_set_root, event_is_revision_root, event_is_valid_pr_or_pr_update,
+        status_kinds,
     },
     login::{get_likely_logged_in_user, user::get_user_ref_from_cache},
     repo_ref::RepoRef,
@@ -1824,6 +1825,7 @@ pub async fn get_proposals_and_revisions_from_cache(
     .await?
     .iter()
     .filter(|e| event_is_patch_set_root(e) || e.kind.eq(&KIND_PULL_REQUEST))
+    .filter(|e| e.kind.eq(&Kind::GitPatch) || event_is_valid_pr_or_pr_update(e))
     .cloned()
     .collect::<Vec<nostr::Event>>();
     proposals.sort_by_key(|e| e.created_at);
@@ -1874,7 +1876,11 @@ pub async fn get_all_proposal_patch_pr_pr_update_events_from_cache(
     .iter()
     .copied()
     .collect();
-    commit_events.retain(|e| permissioned_users.contains(&e.pubkey));
+
+    commit_events.retain(|e| {
+        permissioned_users.contains(&e.pubkey)
+            && (e.kind.eq(&Kind::GitPatch) || event_is_valid_pr_or_pr_update(e))
+    });
 
     let revision_roots: HashSet<nostr::EventId> = commit_events
         .iter()
diff --git a/src/lib/git_events.rs b/src/lib/git_events.rs
index 7b25daf..09ec040 100644
--- a/src/lib/git_events.rs
+++ b/src/lib/git_events.rs
@@ -90,6 +90,19 @@ pub fn patch_supports_commit_ids(event: &Event) -> bool {
             .any(|t| !t.as_slice().is_empty() && t.as_slice()[0].eq("commit-pgp-sig"))
 }
 
+pub fn event_is_valid_pr_or_pr_update(event: &Event) -> bool {
+    [KIND_PULL_REQUEST, KIND_PULL_REQUEST_UPDATE].contains(&event.kind)
+        && event.tags.iter().any(|t| {
+            t.as_slice().len().gt(&1)
+                && t.as_slice()[0].eq("c")
+                && git2::Oid::from_str(&t.as_slice()[1]).is_ok()
+        })
+        && event
+            .tags
+            .iter()
+            .any(|t| t.as_slice().len().gt(&1) && t.as_slice()[0].eq("clone"))
+}
+
 #[allow(clippy::too_many_arguments)]
 #[allow(clippy::too_many_lines)]
 pub async fn generate_patch_event(