upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDanConwayDev <DanConwayDev@protonmail.com>2025-07-31 12:02:08 +0100
committerDanConwayDev <DanConwayDev@protonmail.com>2025-07-31 12:02:08 +0100
commit8fe7737a491d6056d6e865bfdecd02e3dda3e8f5 (patch)
treeea044a7e3744724c1245a8c20bc5bf5e01ef492f /src
parentf4d3a622eeff76677316076afcd0cb8954aa2e05 (diff)
chore: bump rust-nostr v0.43
with trival breaking changes. nip05 changes will be done seperately.
Diffstat (limited to 'src')
-rw-r--r--src/lib/client.rs16
-rw-r--r--src/lib/git/nostr_url.rs1
-rw-r--r--src/lib/login/fresh.rs1
3 files changed, 12 insertions, 6 deletions
diff --git a/src/lib/client.rs b/src/lib/client.rs
index 6f28cff..c1e7e69 100644
--- a/src/lib/client.rs
+++ b/src/lib/client.rs
@@ -32,15 +32,15 @@ use mockall::*;
32use nostr::{ 32use nostr::{
33 Event, 33 Event,
34 event::{TagKind, TagStandard, UnsignedEvent}, 34 event::{TagKind, TagStandard, UnsignedEvent},
35 filter::Alphabet, 35 filter::{Alphabet, MatchEventOptions},
36 nips::{nip01::Coordinate, nip19::Nip19Coordinate}, 36 nips::{nip01::Coordinate, nip19::Nip19Coordinate},
37 signer::SignerBackend, 37 signer::SignerBackend,
38}; 38};
39use nostr_database::{NostrEventsDatabase, SaveEventStatus}; 39use nostr_database::{NostrDatabase, SaveEventStatus};
40use nostr_lmdb::NostrLMDB; 40use nostr_lmdb::NostrLMDB;
41use nostr_relay_pool::relay::ReqExitPolicy; 41use nostr_relay_pool::relay::ReqExitPolicy;
42use nostr_sdk::{ 42use nostr_sdk::{
43 EventBuilder, EventId, Kind, NostrSigner, Options, PublicKey, RelayUrl, SingleLetterTag, 43 ClientOptions, EventBuilder, EventId, Kind, NostrSigner, PublicKey, RelayUrl, SingleLetterTag,
44 Timestamp, Url, prelude::RelayLimits, 44 Timestamp, Url, prelude::RelayLimits,
45}; 45};
46 46
@@ -144,12 +144,12 @@ impl Connect for Client {
144 Client { 144 Client {
145 client: if let Some(keys) = opts.keys { 145 client: if let Some(keys) = opts.keys {
146 nostr_sdk::ClientBuilder::new() 146 nostr_sdk::ClientBuilder::new()
147 .opts(Options::new().relay_limits(RelayLimits::disable())) 147 .opts(ClientOptions::new().relay_limits(RelayLimits::disable()))
148 .signer(keys) 148 .signer(keys)
149 .build() 149 .build()
150 } else { 150 } else {
151 nostr_sdk::ClientBuilder::new() 151 nostr_sdk::ClientBuilder::new()
152 .opts(Options::new().relay_limits(RelayLimits::disable())) 152 .opts(ClientOptions::new().relay_limits(RelayLimits::disable()))
153 .build() 153 .build()
154 }, 154 },
155 relay_default_set: opts.relay_default_set, 155 relay_default_set: opts.relay_default_set,
@@ -605,7 +605,11 @@ impl Connect for Client {
605 .await? 605 .await?
606 .iter() 606 .iter()
607 // don't process events that don't match filters 607 // don't process events that don't match filters
608 .filter(|e| filters.iter().any(|f| f.match_event(e))) 608 .filter(|e| {
609 filters
610 .iter()
611 .any(|f| f.match_event(e, MatchEventOptions::default()))
612 })
609 .cloned() 613 .cloned()
610 .collect(); 614 .collect();
611 // TODO: try reconcile 615 // TODO: try reconcile
diff --git a/src/lib/git/nostr_url.rs b/src/lib/git/nostr_url.rs
index e9b482f..8abf3f7 100644
--- a/src/lib/git/nostr_url.rs
+++ b/src/lib/git/nostr_url.rs
@@ -206,6 +206,7 @@ impl NostrUrlDecoded {
206 if s.len() == 2 { s[1] } else { s[0] } 206 if s.len() == 2 { s[1] } else { s[0] }
207 }; 207 };
208 term.write_line(&format!("fetching pubic key info from {domain}..."))?; 208 term.write_line(&format!("fetching pubic key info from {domain}..."))?;
209 // TODO we now need to implement our own wrapper for this
209 let res = nip05::profile(npub_or_nip05, None).await.context(format!( 210 let res = nip05::profile(npub_or_nip05, None).await.context(format!(
210 "failed to get nostr public key for {npub_or_nip05} from {domain}" 211 "failed to get nostr public key for {npub_or_nip05} from {domain}"
211 ))?; 212 ))?;
diff --git a/src/lib/login/fresh.rs b/src/lib/login/fresh.rs
index 358045a..aec8df5 100644
--- a/src/lib/login/fresh.rs
+++ b/src/lib/login/fresh.rs
@@ -384,6 +384,7 @@ pub fn generate_nostr_connect_app(
384pub async fn fetch_nip46_uri_from_nip05(nip05: &str) -> Result<NostrConnectURI> { 384pub async fn fetch_nip46_uri_from_nip05(nip05: &str) -> Result<NostrConnectURI> {
385 let term = console::Term::stderr(); 385 let term = console::Term::stderr();
386 term.write_line("contacting login service provider...")?; 386 term.write_line("contacting login service provider...")?;
387 // TODO we now need to implement our own wrapper for this
387 let res = nip05::profile(&nip05, None).await; 388 let res = nip05::profile(&nip05, None).await;
388 term.clear_last_lines(1)?; 389 term.clear_last_lines(1)?;
389 match res { 390 match res {