Skip to content
This repository has been archived by the owner on Feb 3, 2025. It is now read-only.

DM requests for invoices #967

Merged
merged 6 commits into from
Jan 23, 2024
Merged

DM requests for invoices #967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7de58d9
DM requests for invoices
benthecarman Jan 15, 2024
005493a
Allow overriding derived nsec or extension
benthecarman Jan 15, 2024
a9187d6
Get dm convo from primal
benthecarman Jan 20, 2024
9f0822d
Set primal url in config
benthecarman Jan 22, 2024
ea630ad
Unify some nostr clients
benthecarman Jan 23, 2024
fadc167
Add send dm function
benthecarman Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions mutiny-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ futures-util = { version = "0.3", default-features = false }
reqwest = { version = "0.11", default-features = false, features = ["json"] }
async-trait = "0.1.68"
url = { version = "2.3.1", features = ["serde"] }
nostr = { version = "0.27.0", default-features = false, features = ["nip05", "nip47", "nip57"] }
nostr-sdk = { version = "0.27.0", default-features = false }
nostr = { version = "0.27.0", default-features = false, features = ["nip04", "nip05", "nip47", "nip57"] }
nostr-sdk = { version = "0.27.0", default-features = false, features = ["nip04", "nip05", "nip47", "nip57"] }
cbc = { version = "0.1", features = ["alloc"] }
aes = { version = "0.8" }
jwt-compact = { version = "0.8.0-beta.1", features = ["es256k"] }
Expand Down Expand Up @@ -84,6 +84,9 @@ js-sys = "0.3.65"
gloo-net = { version = "0.4.0" }
instant = { version = "0.1", features = ["wasm-bindgen"] }
getrandom = { version = "0.2", features = ["js"] }
# add nip07 feature for wasm32
nostr = { version = "0.27.0", default-features = false, features = ["nip04", "nip05", "nip07", "nip47", "nip57"] }
nostr-sdk = { version = "0.27.0", default-features = false, features = ["nip04", "nip05", "nip07", "nip47", "nip57"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1", features = ["rt"] }
Expand Down
10 changes: 10 additions & 0 deletions mutiny-core/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ pub enum MutinyError {
/// Error getting nostr data
#[error("Failed to get nostr data.")]
NostrError,
/// Error with Nip07 Extension
#[error("Error with NIP-07 extension")]
Nip07Extension,
/// Incorrect password entered.
#[error("Incorrect password entered.")]
IncorrectPassword,
Expand Down Expand Up @@ -463,6 +466,13 @@ impl From<nostr::nips::nip04::Error> for MutinyError {
}
}

#[cfg(target_arch = "wasm32")]
impl From<nostr::nips::nip07::Error> for MutinyError {
fn from(_e: nostr::nips::nip07::Error) -> Self {
Self::Nip07Extension
}
}

impl From<nostr::nips::nip57::Error> for MutinyError {
fn from(_e: nostr::nips::nip57::Error) -> Self {
Self::NostrError
Expand Down
Loading
Loading