4 files changed, 37 insertions, 17 deletions

diff --git a/src/key_handling/users.rs b/src/key_handling/users.rs
index 751c577..1dd75a8 100644
--- a/src/key_handling/users.rs
+++ b/src/key_handling/users.rs
@@ -249,7 +249,11 @@ impl UserManagement for UserManager {
                         relays: new_relays_event
                             .tags
                             .iter()
-                            .filter(|t| t.kind().eq(&nostr::TagKind::R))
+                            .filter(|t| {
+                                t.kind().eq(&nostr::TagKind::SingleLetter(
+                                    SingleLetterTag::lowercase(Alphabet::R),
+                                ))
+                            })
                             .map(|t| UserRelayRef {
                                 url: t.as_vec()[1].clone(),
                                 read: t.as_vec().len() == 2 || t.as_vec()[2].eq("read"),
diff --git a/src/repo_ref.rs b/src/repo_ref.rs
index 0a14005..2dab79c 100644
--- a/src/repo_ref.rs
+++ b/src/repo_ref.rs
@@ -200,8 +200,9 @@ pub async fn fetch(
                     nostr::Filter::default().kind(nostr::Kind::Custom(REPO_REF_KIND));
                 match nip19 {
                     Nip19::Coordinate(c) => {
-                        repo_event_filter =
-                            repo_event_filter.identifier(c.identifier).author(c.pubkey);
+                        repo_event_filter = repo_event_filter
+                            .identifier(c.identifier)
+                            .author(c.public_key);
                         for r in c.relays {
                             relays.push(r);
                         }
diff --git a/src/sub_commands/list.rs b/src/sub_commands/list.rs
index 2d81164..1a30b9b 100644
--- a/src/sub_commands/list.rs
+++ b/src/sub_commands/list.rs
@@ -730,9 +730,12 @@ pub async fn find_proposal_events(
             vec![
                 nostr::Filter::default()
                     .kind(nostr::Kind::Custom(PATCH_KIND))
-                    .custom_tag(nostr::Alphabet::T, vec!["root"])
                     .custom_tag(
-                        nostr::Alphabet::A,
+                        nostr::SingleLetterTag::lowercase(nostr::Alphabet::T),
+                        vec!["root"],
+                    )
+                    .custom_tag(
+                        nostr::SingleLetterTag::lowercase(nostr::Alphabet::A),
                         repo_ref
                             .maintainers
                             .iter()
@@ -742,7 +745,10 @@ pub async fn find_proposal_events(
                 // events
                 nostr::Filter::default()
                     .kind(nostr::Kind::Custom(PATCH_KIND))
-                    .custom_tag(nostr::Alphabet::T, vec!["root"])
+                    .custom_tag(
+                        nostr::SingleLetterTag::lowercase(nostr::Alphabet::T),
+                        vec!["root"],
+                    )
                     .reference(root_commit),
             ],
         )
diff --git a/src/sub_commands/send.rs b/src/sub_commands/send.rs
index cc182f1..91654d2 100644
--- a/src/sub_commands/send.rs
+++ b/src/sub_commands/send.rs
@@ -4,7 +4,10 @@ use anyhow::{bail, Context, Result};
 use console::Style;
 use futures::future::join_all;
 use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
-use nostr::{nips::nip19::Nip19, EventBuilder, FromBech32, Marker, Tag, TagKind, UncheckedUrl};
+use nostr::{
+    nips::{nip01::Coordinate, nip19::Nip19},
+    EventBuilder, FromBech32, Marker, Tag, TagKind, UncheckedUrl,
+};
 use nostr_sdk::hashes::sha1::Hash as Sha1Hash;
 
 use super::list::tag_value;
@@ -539,11 +542,14 @@ pub fn generate_cover_letter_and_patch_events(
             vec![
                 // TODO: why not tag all maintainer identifiers?
                 Tag::A {
-                    kind: nostr::Kind::Custom(REPO_REF_KIND),
-                    public_key: *repo_ref.maintainers.first()
-                        .context("repo reference should always have at least one maintainer - the issuer of the repo event")
-                        ?,
-                    identifier: repo_ref.identifier.to_string(),
+                    coordinate: Coordinate {
+                        kind: nostr::Kind::Custom(REPO_REF_KIND),
+                        public_key: *repo_ref.maintainers.first()
+                            .context("repo reference should always have at least one maintainer - the issuer of the repo event")
+                            ?,
+                        identifier: repo_ref.identifier.to_string(),
+                        relays: repo_ref.relays.clone(),
+                    },
                     relay_url: repo_ref.relays.first().map(nostr::UncheckedUrl::from).clone(),
                 },
                 Tag::Reference(format!("{root_commit}")),
@@ -795,11 +801,14 @@ pub fn generate_patch_event(
         [
             vec![
                 Tag::A {
-                    kind: nostr::Kind::Custom(REPO_REF_KIND),
-                    public_key: *repo_ref.maintainers.first()
-                        .context("repo reference should always have at least one maintainer - the issuer of the repo event")
-                        ?,
-                    identifier: repo_ref.identifier.to_string(),
+                    coordinate: Coordinate {
+                        kind: nostr::Kind::Custom(REPO_REF_KIND),
+                        public_key: *repo_ref.maintainers.first()
+                            .context("repo reference should always have at least one maintainer - the issuer of the repo event")
+                            ?,
+                        identifier: repo_ref.identifier.to_string(),
+                        relays: repo_ref.relays.clone(),
+                    },
                     relay_url: relay_hint.clone(),
                 },
                 Tag::Reference(format!("{root_commit}")),