Skip to content

Commit b97bb93

Browse files
committed
nostr: remove EventBuilder::encrypted_direct_msg
Signed-off-by: Yuki Kishimoto <[email protected]>
1 parent 5be67ba commit b97bb93

File tree

4 files changed

+1
-95
lines changed

4 files changed

+1
-95
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
* Remove deprecated methods/functions ([Yuki Kishimoto])
7070
* nostr: remove support for `nrelay` NIP-19 entity ([Yuki Kishimoto])
7171
* nostr: remove support for NIP-44 v1 ([Yuki Kishimoto])
72+
* nostr: remove `EventBuilder::encrypted_direct_msg` ([Yuki Kishimoto])
7273
* cli: remove `tracing-subscriber` dep
7374

7475
## [v0.33.0]

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -178,27 +178,6 @@ impl EventBuilder {
178178
}
179179
}
180180

181-
/// Create encrypted direct msg event
182-
///
183-
/// <div class="warning"><strong>Unsecure!</strong> Deprecated in favor of NIP-17!</div>
184-
#[uniffi::constructor(default(reply_to = None))]
185-
pub fn encrypted_direct_msg(
186-
sender_keys: &Keys,
187-
receiver_pubkey: &PublicKey,
188-
content: &str,
189-
reply_to: Option<Arc<EventId>>,
190-
) -> Result<Self> {
191-
Ok(Self {
192-
#[allow(deprecated)]
193-
inner: nostr::EventBuilder::encrypted_direct_msg(
194-
sender_keys.deref(),
195-
**receiver_pubkey,
196-
content,
197-
reply_to.map(|id| **id),
198-
)?,
199-
})
200-
}
201-
202181
/// Repost
203182
///
204183
/// <https://github.com/nostr-protocol/nips/blob/master/18.md>

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

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -188,28 +188,6 @@ impl JsEventBuilder {
188188
}
189189
}
190190

191-
/// Create encrypted direct msg event
192-
///
193-
/// <div class="warning"><strong>Unsecure!</strong> Deprecated in favor of NIP-17!</div>
194-
#[wasm_bindgen(js_name = encryptedDirectMsg)]
195-
pub fn encrypted_direct_msg(
196-
sender_keys: &JsKeys,
197-
receiver_pubkey: &JsPublicKey,
198-
content: &str,
199-
reply_to: Option<JsEventId>,
200-
) -> Result<JsEventBuilder> {
201-
Ok(Self {
202-
#[allow(deprecated)]
203-
inner: EventBuilder::encrypted_direct_msg(
204-
sender_keys.deref(),
205-
**receiver_pubkey,
206-
content,
207-
reply_to.map(|id| id.into()),
208-
)
209-
.map_err(into_err)?,
210-
})
211-
}
212-
213191
/// Repost
214192
///
215193
/// <https://github.com/nostr-protocol/nips/blob/master/18.md>

crates/nostr/src/event/builder.rs

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -565,31 +565,6 @@ impl EventBuilder {
565565
))
566566
}
567567

568-
/// Create encrypted direct msg event
569-
///
570-
/// <div class="warning"><strong>Unsecure!</strong> Deprecated in favor of NIP-17!</div>
571-
///
572-
/// <https://github.com/nostr-protocol/nips/blob/master/04.md>
573-
#[deprecated(note = "Unsecure! Deprecated in favor of NIP-17!")]
574-
#[cfg(all(feature = "std", feature = "nip04"))]
575-
pub fn encrypted_direct_msg<S>(
576-
sender_keys: &Keys,
577-
receiver_pubkey: PublicKey,
578-
content: S,
579-
reply_to: Option<EventId>,
580-
) -> Result<Self, Error>
581-
where
582-
S: Into<String>,
583-
{
584-
let content: String =
585-
nip04::encrypt(sender_keys.secret_key()?, &receiver_pubkey, content.into())?;
586-
let mut tags: Vec<Tag> = vec![Tag::public_key(receiver_pubkey)];
587-
if let Some(reply_to) = reply_to {
588-
tags.push(Tag::event(reply_to));
589-
}
590-
Ok(Self::new(Kind::EncryptedDirectMessage, content, tags))
591-
}
592-
593568
/// Repost
594569
///
595570
/// <https://github.com/nostr-protocol/nips/blob/master/18.md>
@@ -1668,33 +1643,6 @@ mod tests {
16681643
assert_eq!(event, deserialized);
16691644
}
16701645

1671-
#[test]
1672-
#[cfg(all(feature = "std", feature = "nip04"))]
1673-
fn test_encrypted_direct_msg() {
1674-
let sender_keys = Keys::new(
1675-
SecretKey::from_str("6b911fd37cdf5c81d4c0adb1ab7fa822ed253ab0ad9aa18d77257c88b29b718e")
1676-
.unwrap(),
1677-
);
1678-
let receiver_keys = Keys::new(
1679-
SecretKey::from_str("7b911fd37cdf5c81d4c0adb1ab7fa822ed253ab0ad9aa18d77257c88b29b718e")
1680-
.unwrap(),
1681-
);
1682-
1683-
let content = "Mercury, the Winged Messenger";
1684-
#[allow(deprecated)]
1685-
let event = EventBuilder::encrypted_direct_msg(
1686-
&sender_keys,
1687-
receiver_keys.public_key(),
1688-
content,
1689-
None,
1690-
)
1691-
.unwrap()
1692-
.to_event(&sender_keys)
1693-
.unwrap();
1694-
1695-
event.verify().unwrap();
1696-
}
1697-
16981646
#[test]
16991647
#[cfg(feature = "nip57")]
17001648
fn test_zap_event_builder() {

0 commit comments

Comments
 (0)