6 files changed, 36 insertions, 38 deletions

diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs
index d42c904..1738790 100644
--- a/src/bin/git_remote_nostr/push.rs
+++ b/src/bin/git_remote_nostr/push.rs
@@ -1244,11 +1244,10 @@ async fn get_proposal_and_revision_root_from_patch(
         bail!("thread root is not a git patch");
     }
 
-    if proposal_or_revision
-        .tags
-        .iter()
-        .any(|t| t.as_slice().len() > 1 && t.as_slice()[1].eq("revision-root"))
-    {
+    if proposal_or_revision.tags.iter().any(|t| {
+        t.as_slice().len() > 1
+            && ["revision-root", "root-revision"].contains(&t.as_slice()[1].as_str())
+    }) {
         Ok((
             EventId::parse(
                 &proposal_or_revision
diff --git a/src/lib/client.rs b/src/lib/client.rs
index 9ce3e24..0984b19 100644
--- a/src/lib/client.rs
+++ b/src/lib/client.rs
@@ -32,7 +32,7 @@ use mockall::*;
 use nostr::{
     Event,
     event::{TagKind, TagStandard, UnsignedEvent},
-    filter::{Alphabet, MatchEventOptions},
+    filter::Alphabet,
     nips::{
         nip01::Coordinate,
         nip05::{Nip05Address, Nip05Profile},
@@ -149,12 +149,20 @@ impl Connect for Client {
         Client {
             client: if let Some(keys) = opts.keys {
                 nostr_sdk::ClientBuilder::new()
-                    .opts(ClientOptions::new().relay_limits(RelayLimits::disable()))
+                    .opts(
+                        ClientOptions::new()
+                            .relay_limits(RelayLimits::disable())
+                            .verify_subscriptions(true),
+                    )
                     .signer(keys)
                     .build()
             } else {
                 nostr_sdk::ClientBuilder::new()
-                    .opts(ClientOptions::new().relay_limits(RelayLimits::disable()))
+                    .opts(
+                        ClientOptions::new()
+                            .relay_limits(RelayLimits::disable())
+                            .verify_subscriptions(true),
+                    )
                     .build()
             },
             relay_default_set: opts.relay_default_set,
@@ -606,17 +614,7 @@ impl Connect for Client {
             fresh_profiles = HashSet::new();
 
             let relay = self.client.relay(&relay_url).await?;
-            let events: Vec<nostr::Event> = get_events_of(&relay, filters.clone(), &None)
-                .await?
-                .iter()
-                // don't process events that don't match filters
-                .filter(|e| {
-                    filters
-                        .iter()
-                        .any(|f| f.match_event(e, MatchEventOptions::default()))
-                })
-                .cloned()
-                .collect();
+            let events: Vec<nostr::Event> = get_events_of(&relay, filters.clone(), &None).await?;
             // TODO: try reconcile
 
             process_fetched_events(
diff --git a/src/lib/git_events.rs b/src/lib/git_events.rs
index 76c31de..5ea630a 100644
--- a/src/lib/git_events.rs
+++ b/src/lib/git_events.rs
@@ -75,10 +75,10 @@ pub fn event_is_patch_set_root(event: &Event) -> bool {
 
 pub fn event_is_revision_root(event: &Event) -> bool {
     (event.kind.eq(&Kind::GitPatch)
-        && event
-            .tags
-            .iter()
-            .any(|t| t.as_slice().len() > 1 && t.as_slice()[1].eq("revision-root")))
+        && event.tags.iter().any(|t| {
+            t.as_slice().len() > 1
+                && ["revision-root", "root-revision"].contains(&t.as_slice()[1].as_str())
+        }))
         || (event.kind.eq(&KIND_PULL_REQUEST)
             && event
                 .tags
@@ -180,7 +180,7 @@ pub async fn generate_patch_event(
                 } else if let Some(event_ref) = root_proposal_id.clone() {
                     vec![
                         Tag::hashtag("root"),
-                        Tag::hashtag("revision-root"),
+                        Tag::hashtag("root-revision"),
                         // TODO check if id is for a root proposal (perhaps its for an issue?)
                         event_tag_from_nip19_or_hex(
                             &event_ref,
@@ -605,7 +605,7 @@ pub async fn generate_cover_letter_and_patch_events(
             if let Some(event_ref) = root_proposal_id.clone() {
                 vec![
                     Tag::hashtag("root"),
-                    Tag::hashtag("revision-root"),
+                    Tag::hashtag("root-revision"),
                     // TODO check if id is for a root proposal (perhaps its for an issue?)
                     event_tag_from_nip19_or_hex(&event_ref,"proposal",EventRefType::Reply, false, false)?,
                 ]
diff --git a/test_utils/src/lib.rs b/test_utils/src/lib.rs
index 12cac76..3e348a4 100644
--- a/test_utils/src/lib.rs
+++ b/test_utils/src/lib.rs
@@ -1182,7 +1182,7 @@ pub fn get_proposal_branch_name_from_events(
         if !event
             .tags
             .iter()
-            .any(|t| t.as_slice()[1].eq("revision-root"))
+            .any(|t| ["revision-root", "root-revision"].contains(&t.as_slice()[1].as_str()))
             && event.tags.iter().any(|t| {
                 t.as_slice()[0].eq("branch-name") && t.as_slice()[1].eq(branch_name_in_event)
             })
diff --git a/tests/git_remote_nostr/push.rs b/tests/git_remote_nostr/push.rs
index a137da5..2afadf9 100644
--- a/tests/git_remote_nostr/push.rs
+++ b/tests/git_remote_nostr/push.rs
@@ -1688,7 +1688,11 @@ async fn force_push_creates_proposal_revision() -> Result<()> {
 
     let revision_root_patch = new_events
         .iter()
-        .find(|e| e.tags.iter().any(|t| t.as_slice()[1].eq("revision-root")))
+        .find(|e| {
+            e.tags
+                .iter()
+                .any(|t| ["revision-root", "root-revision"].contains(&t.as_slice()[1].as_str()))
+        })
         .unwrap();
 
     assert_eq!(
diff --git a/tests/ngit_send.rs b/tests/ngit_send.rs
index e128bd9..a5bb564 100644
--- a/tests/ngit_send.rs
+++ b/tests/ngit_send.rs
@@ -1636,11 +1636,10 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let
             for relay in [&r53, &r55, &r56] {
                 let cover_letter_event: &nostr::Event =
                     relay.events.iter().find(|e| is_cover_letter(e)).unwrap();
-                assert!(
-                    cover_letter_event.tags.iter().any(|t| {
-                        t.as_slice()[0].eq("t") && t.as_slice()[1].eq(&"revision-root")
-                    })
-                );
+                assert!(cover_letter_event.tags.iter().any(|t| {
+                    t.as_slice()[0].eq("t")
+                        && ["revision-root", "root-revision"].contains(&t.as_slice()[1].as_str())
+                }));
             }
             Ok(())
         }
@@ -1817,12 +1816,10 @@ mod in_reply_to_mentions_issue {
         for relay in [&r53, &r55, &r56] {
             let cover_letter_event: &nostr::Event =
                 relay.events.iter().find(|e| is_cover_letter(e)).unwrap();
-            assert!(
-                !cover_letter_event
-                    .tags
-                    .iter()
-                    .any(|t| { t.as_slice()[0].eq("t") && t.as_slice()[1].eq(&"revision-root") })
-            );
+            assert!(!cover_letter_event.tags.iter().any(|t| {
+                t.as_slice()[0].eq("t")
+                    && ["revision-root", "root-revision"].contains(&t.as_slice()[1].as_str())
+            }));
         }
         Ok(())
     }