nostr: add EventDeletionRequest struct

- Add `EventDeletionRequest` struct
- Remove `EventIdOrCoordinate` enum
- Add unit tests for NIP09 stuff

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

CHANGELOG.md

@@ -45,8 +45,10 @@
 * nostr: change `EventBuilder::git_patch` constructor signature ([Yuki Kishimoto])
 * nostr: `TagStandard::parse` now returns `Err(Error::UnknownStandardizedTag)` for non-lowercase hashtags as per NIP-24 ([awiteb])
 * nostr: update `NostrWalletConnectURI` to support multiple relay URLs ([Yuki Kishimoto])
+* nostr: remove `EventIdOrCoordinate` enum ([Yuki Kishimoto])
+* nostr: change `EventBuilder::delete` arguments ([Yuki Kishimoto])
 * pool: drop `RelayFiltering` ([Yuki Kishimoto])
-* sdk: change `Client::fetch_metadata` output ([Yuki Kishimoto]) 
+* sdk: change `Client::fetch_metadata` output ([Yuki Kishimoto])
 
 ### Changed
 
@@ -88,6 +90,7 @@
 * nostr: add `TagStandard::Client` variant ([Yuki Kishimoto])
 * nostr: add `EventBuilder::dedup_tags` method ([Yuki Kishimoto])
 * nostr: impl `FromIterator<Tag>` for `Tags` ([Yuki Kishimoto])
+* nostr: add `EventDeletionRequest` struct ([Yuki Kishimoto])
 * pool: event verification cache ([Yuki Kishimoto])
 * pool: add `AdmitPolicy` trait ([Yuki Kishimoto])
 * ffi: add Mac Catalyst support in Swift package ([Yuki Kishimoto])

bindings/nostr-sdk-ffi/src/protocol/event/builder.rs

@@ -6,7 +6,6 @@ use std::collections::HashMap;
 use std::ops::Deref;
 use std::sync::Arc;
 
-use nostr::util::EventIdOrCoordinate;
 use nostr::{RelayUrl, Url};
 use uniffi::Object;
 
@@ -15,6 +14,7 @@ use crate::error::Result;
 use crate::protocol::event::{PublicKey, Tag, Timestamp, UnsignedEvent};
 use crate::protocol::key::Keys;
 use crate::protocol::nips::nip01::{Coordinate, Metadata};
+use crate::protocol::nips::nip09::EventDeletionRequest;
 use crate::protocol::nips::nip15::{ProductData, StallData};
 use crate::protocol::nips::nip34::{GitIssue, GitPatch, GitRepositoryAnnouncement};
 use crate::protocol::nips::nip46::NostrConnectMessage;
@@ -253,29 +253,13 @@ impl EventBuilder {
         })
     }
 
-    /// Event deletion
+    /// Event deletion request
     ///
     /// <https://github.com/nostr-protocol/nips/blob/master/09.md>
-    #[uniffi::constructor(default(ids = [], coordinates = [], reason = None))]
-    pub fn delete(
-        ids: &[Arc<EventId>],
-        coordinates: &[Arc<Coordinate>],
-        reason: Option<String>,
-    ) -> Self {
-        let coordinates = coordinates
-            .iter()
-            .map(|c| c.as_ref().deref().clone())
-            .map(EventIdOrCoordinate::from);
-        let ids = ids
-            .iter()
-            .map(|e| ***e)
-            .map(EventIdOrCoordinate::from)
-            .chain(coordinates);
-        Self {
-            inner: match reason {
-                Some(reason) => nostr::EventBuilder::delete_with_reason(ids, reason),
-                None => nostr::EventBuilder::delete(ids),
-            },
+    #[uniffi::constructor]
+    pub fn delete(request: EventDeletionRequest) -> Self {
+        Self {
+            inner: nostr::EventBuilder::delete(request.into()),
         }
     }
 

bindings/nostr-sdk-ffi/src/protocol/nips/mod.rs

@@ -5,6 +5,7 @@
 pub mod nip01;
 pub mod nip04;
 pub mod nip05;
+pub mod nip09;
 pub mod nip10;
 pub mod nip11;
 pub mod nip13;

bindings/nostr-sdk-ffi/src/protocol/nips/nip09.rs

@@ -0,0 +1,36 @@
+// Copyright (c) 2023-2025 Rust Nostr Developers
+// Distributed under the MIT software license
+
+use std::ops::Deref;
+use std::sync::Arc;
+
+use nostr::nips::nip09;
+use uniffi::Record;
+
+use super::nip01::Coordinate;
+use crate::protocol::event::EventId;
+
+/// Event deletion request
+#[derive(Record)]
+pub struct EventDeletionRequest {
+    /// Event IDs
+    pub ids: Vec<Arc<EventId>>,
+    /// Event coordinates
+    pub coordinates: Vec<Arc<Coordinate>>,
+    /// Optional reason
+    pub reason: Option<String>,
+}
+
+impl From<EventDeletionRequest> for nip09::EventDeletionRequest {
+    fn from(request: EventDeletionRequest) -> Self {
+        Self {
+            ids: request.ids.into_iter().map(|id| **id).collect(),
+            coordinates: request
+                .coordinates
+                .into_iter()
+                .map(|c| c.as_ref().deref().clone())
+                .collect(),
+            reason: request.reason,
+        }
+    }
+}

bindings/nostr-sdk-js/src/protocol/event/builder.rs

@@ -11,6 +11,7 @@ use super::{JsEvent, JsEventId, JsKind, JsTag, JsUnsignedEvent};
 use crate::error::{into_err, Result};
 use crate::protocol::key::{JsKeys, JsPublicKey};
 use crate::protocol::nips::nip01::{JsCoordinate, JsMetadata};
+use crate::protocol::nips::nip09::JsEventDeletionRequest;
 use crate::protocol::nips::nip15::{JsProductData, JsStallData};
 use crate::protocol::nips::nip34::{JsGitIssue, JsGitRepositoryAnnouncement};
 use crate::protocol::nips::nip51::{
@@ -247,25 +248,9 @@ impl JsEventBuilder {
     ///
     /// <https://github.com/nostr-protocol/nips/blob/master/09.md>
     #[wasm_bindgen]
-    pub fn delete(
-        ids: Vec<JsEventId>,
-        coordinates: Vec<JsCoordinate>,
-        reason: Option<String>,
-    ) -> Self {
-        let coordinates = coordinates
-            .into_iter()
-            .map(|c| c.deref().clone())
-            .map(EventIdOrCoordinate::from);
-        let ids = ids
-            .into_iter()
-            .map(|id| *id)
-            .map(EventIdOrCoordinate::from)
-            .chain(coordinates);
-        Self {
-            inner: match reason {
-                Some(reason) => EventBuilder::delete_with_reason(ids, reason),
-                None => EventBuilder::delete(ids),
-            },
+    pub fn delete(request: JsEventDeletionRequest) -> Self {
+        Self {
+            inner: EventBuilder::delete(request.into()),
         }
     }
 

bindings/nostr-sdk-js/src/protocol/nips/mod.rs

@@ -6,6 +6,7 @@ pub mod nip01;
 pub mod nip04;
 pub mod nip05;
 pub mod nip07;
+pub mod nip09;
 pub mod nip11;
 pub mod nip15;
 pub mod nip19;

bindings/nostr-sdk-js/src/protocol/nips/nip01.rs

@@ -30,6 +30,12 @@ impl From<Coordinate> for JsCoordinate {
     }
 }
 
+impl From<JsCoordinate> for Coordinate {
+    fn from(coordinate: JsCoordinate) -> Self {
+        coordinate.inner
+    }
+}
+
 #[wasm_bindgen(js_class = Coordinate)]
 impl JsCoordinate {
     #[wasm_bindgen(constructor)]

bindings/nostr-sdk-js/src/protocol/nips/nip09.rs

@@ -0,0 +1,32 @@
+// Copyright (c) 2023-2025 Rust Nostr Developers
+// Distributed under the MIT software license
+
+use nostr_sdk::prelude::*;
+use wasm_bindgen::prelude::*;
+
+use super::nip01::JsCoordinate;
+use crate::protocol::event::id::JsEventId;
+
+/// Event deletion request
+#[wasm_bindgen(js_name = GitRepositoryAnnouncement)]
+pub struct JsEventDeletionRequest {
+    /// Event IDs
+    #[wasm_bindgen(getter_with_clone)]
+    pub ids: Vec<JsEventId>,
+    /// Event coordinates
+    #[wasm_bindgen(getter_with_clone)]
+    pub coordinates: Vec<JsCoordinate>,
+    /// Optional reason
+    #[wasm_bindgen(getter_with_clone)]
+    pub reason: Option<String>,
+}
+
+impl From<JsEventDeletionRequest> for EventDeletionRequest {
+    fn from(request: JsEventDeletionRequest) -> Self {
+        Self {
+            ids: request.ids.into_iter().map(Into::into).collect(),
+            coordinates: request.coordinates.into_iter().map(Into::into).collect(),
+            reason: request.reason,
+        }
+    }
+}

crates/nostr/examples/nip09.rs

@@ -10,9 +10,11 @@ fn main() -> Result<()> {
     let event_id =
         EventId::from_hex("7469af3be8c8e06e1b50ef1caceba30392ddc0b6614507398b7d7daa4c218e96")?;
 
-    let event: Event =
-        EventBuilder::delete_with_reason(vec![event_id], "these posts were published by accident")
-            .sign_with_keys(&keys)?;
+    let request = EventDeletionRequest::new()
+        .id(event_id)
+        .reason("these posts were published by accident");
+
+    let event: Event = EventBuilder::delete(request).sign_with_keys(&keys)?;
     println!("{}", event.as_json());
 
     Ok(())

crates/nostr/src/event/builder.rs

@@ -700,32 +700,12 @@ impl EventBuilder {
         }
     }
 
-    /// Event deletion
+    /// Event deletion request
     ///
     /// <https://github.com/nostr-protocol/nips/blob/master/09.md>
     #[inline]
-    pub fn delete<I, T>(ids: I) -> Self
-    where
-        I: IntoIterator<Item = T>,
-        T: Into<EventIdOrCoordinate>,
-    {
-        Self::delete_with_reason(ids, "")
-    }
-
-    /// Event deletion with reason
-    ///
-    /// <https://github.com/nostr-protocol/nips/blob/master/09.md>
-    pub fn delete_with_reason<I, T, S>(ids: I, reason: S) -> Self
-    where
-        I: IntoIterator<Item = T>,
-        T: Into<EventIdOrCoordinate>,
-        S: Into<String>,
-    {
-        let tags = ids.into_iter().map(|t| {
-            let middle: EventIdOrCoordinate = t.into();
-            middle.into()
-        });
-        Self::new(Kind::EventDeletion, reason.into()).tags(tags)
+    pub fn delete(request: EventDeletionRequest) -> Self {
+        request.to_event_builder()
     }
 
     /// Request to vanish