3 files changed, 38 insertions, 32 deletions

diff --git a/src/repo_ref.rs b/src/repo_ref.rs
index 1ec0ece..87c5b75 100644
--- a/src/repo_ref.rs
+++ b/src/repo_ref.rs
@@ -69,13 +69,19 @@ impl TryFrom<nostr::Event> for RepoRef {
             r.relays.remove(0);
         }
 
-        for tag in event.tags.iter().filter(|t| t.as_vec()[0].eq("p")) {
-            let pk = tag.as_vec()[1].clone();
-            r.maintainers.push(
+        if let Some(t) = event.tags.iter().find(|t| t.as_vec()[0].eq("maintainers")) {
+            let mut maintainers = t.as_vec().clone();
+            maintainers.remove(0);
+            if !maintainers.contains(&event.pubkey.to_string()) {
+                r.maintainers.push(event.pubkey);
+            }
+            for pk in maintainers {
+                r.maintainers.push(
                 nostr_sdk::prelude::XOnlyPublicKey::from_str(&pk)
-                    .context(format!("cannot convert {pk} into a valid nostr public key"))
+                    .context(format!("cannot convert entry from maintainers tag {pk} into a valid nostr public key. it should be in hex format"))
                     .context("invalid repository event")?,
-            );
+                );
+            }
         }
 
         Ok(r)
@@ -121,15 +127,14 @@ impl RepoRef {
                         nostr::TagKind::Custom("relays".to_string()),
                         self.relays.clone(),
                     ),
+                    Tag::Generic(
+                        nostr::TagKind::Custom("maintainers".to_string()),
+                        self.maintainers
+                            .iter()
+                            .map(std::string::ToString::to_string)
+                            .collect(),
+                    ),
                 ],
-                // this appears like a number of relay tags but test suggest is is actually
-                // what we want which is a relays tag with lots of values. no need for the
-                // change?
-                // self.relays.iter().map(|r| Tag::Relay(r.into())).collect(),
-                self.maintainers
-                    .iter()
-                    .map(|pk| Tag::public_key(*pk))
-                    .collect(),
                 // code languages and hashtags
             ]
             .concat(),
@@ -451,25 +456,25 @@ mod tests {
             #[test]
             fn maintainers() {
                 let event = create();
-                let p_tags = event
+                let maintainers_tag: &nostr::Tag = event
                     .tags
                     .iter()
-                    .filter(|t| t.as_vec()[0].eq("p"))
-                    .collect::<Vec<&nostr::Tag>>();
-                assert_eq!(p_tags[0].as_vec().len(), 2);
+                    .find(|t| t.as_vec()[0].eq("maintainers"))
+                    .unwrap();
+                assert_eq!(maintainers_tag.as_vec().len(), 3);
                 assert_eq!(
-                    p_tags[0].as_vec()[1],
+                    maintainers_tag.as_vec()[1],
                     TEST_KEY_1_KEYS.public_key().to_string()
                 );
                 assert_eq!(
-                    p_tags[1].as_vec()[1],
+                    maintainers_tag.as_vec()[2],
                     TEST_KEY_2_KEYS.public_key().to_string()
                 );
             }
 
             #[test]
             fn no_other_tags() {
-                assert_eq!(create().tags.len(), 9)
+                assert_eq!(create().tags.len(), 8)
             }
         }
     }
diff --git a/test_utils/src/lib.rs b/test_utils/src/lib.rs
index 9996008..8788211 100644
--- a/test_utils/src/lib.rs
+++ b/test_utils/src/lib.rs
@@ -164,8 +164,13 @@ pub fn generate_repo_ref_event() -> nostr::Event {
                     "ws://localhost:8056".to_string(),
                 ],
             ),
-            Tag::public_key(TEST_KEY_1_KEYS.public_key()),
-            Tag::public_key(TEST_KEY_2_KEYS.public_key()),
+            Tag::Generic(
+                nostr::TagKind::Custom("maintainers".to_string()),
+                vec![
+                    TEST_KEY_1_KEYS.public_key().to_string(),
+                    TEST_KEY_2_KEYS.public_key().to_string(),
+                ],
+            ),
         ],
     )
     .to_event(&TEST_KEY_1_KEYS)
diff --git a/tests/claim.rs b/tests/claim.rs
index 9eb4b8a..93feb54 100644
--- a/tests/claim.rs
+++ b/tests/claim.rs
@@ -393,7 +393,7 @@ mod when_repo_not_previously_claimed {
 
             #[test]
             #[serial]
-            fn current_user_tagged_indicating_maintainer() -> Result<()> {
+            fn current_user_in_maintainers() -> Result<()> {
                 let (_, _, r53, r55, r56) = futures::executor::block_on(prep_run_claim())?;
                 for relay in [&r53, &r55, &r56] {
                     let event: &nostr::Event = relay
@@ -401,17 +401,13 @@ mod when_repo_not_previously_claimed {
                         .iter()
                         .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND))
                         .unwrap();
-
-                    let relay_tags = event
+                    let maintainers_tag = event
                         .tags
                         .iter()
-                        .filter(|t| t.as_vec()[0].eq("p"))
-                        .collect::<Vec<&nostr::Tag>>();
-                    assert_eq!(relay_tags.len(), 1);
-                    assert_eq!(
-                        relay_tags[0].as_vec()[1],
-                        TEST_KEY_1_KEYS.public_key().to_string()
-                    );
+                        .find(|t| t.as_vec()[0].eq("maintainers"))
+                        .unwrap()
+                        .as_vec();
+                    assert_eq!(maintainers_tag[1], TEST_KEY_1_KEYS.public_key().to_string());
                 }
                 Ok(())
             }