From 7561bc0e2f39531460d1d43deaa548e22ccf85d4 Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Mon, 18 Nov 2024 14:52:52 +0100 Subject: [PATCH] refactor: update to latest nostr sdk version --- Cargo.lock | 8 +++---- Cargo.toml | 2 +- src/kinds.rs | 7 ++---- src/task.rs | 8 +++---- src/tasks.rs | 63 ++++++++++++++++++++++++---------------------------- 5 files changed, 40 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cfd92bf..4bac4f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1566,7 +1566,7 @@ dependencies = [ [[package]] name = "nostr" version = "0.36.0" -source = "git+https://github.com/rust-nostr/nostr?rev=829e8cad6e68f54fb3a8d056d9ce4d1ceeeb84cb#829e8cad6e68f54fb3a8d056d9ce4d1ceeeb84cb" +source = "git+https://github.com/rust-nostr/nostr?rev=e82bc787bdd8490ceadb034fe4483e4df1e91b2a#e82bc787bdd8490ceadb034fe4483e4df1e91b2a" dependencies = [ "async-trait", "base64 0.22.1", @@ -1591,7 +1591,7 @@ dependencies = [ [[package]] name = "nostr-database" version = "0.36.0" -source = "git+https://github.com/rust-nostr/nostr?rev=829e8cad6e68f54fb3a8d056d9ce4d1ceeeb84cb#829e8cad6e68f54fb3a8d056d9ce4d1ceeeb84cb" +source = "git+https://github.com/rust-nostr/nostr?rev=e82bc787bdd8490ceadb034fe4483e4df1e91b2a#e82bc787bdd8490ceadb034fe4483e4df1e91b2a" dependencies = [ "async-trait", "lru", @@ -1604,7 +1604,7 @@ dependencies = [ [[package]] name = "nostr-relay-pool" version = "0.36.0" -source = "git+https://github.com/rust-nostr/nostr?rev=829e8cad6e68f54fb3a8d056d9ce4d1ceeeb84cb#829e8cad6e68f54fb3a8d056d9ce4d1ceeeb84cb" +source = "git+https://github.com/rust-nostr/nostr?rev=e82bc787bdd8490ceadb034fe4483e4df1e91b2a#e82bc787bdd8490ceadb034fe4483e4df1e91b2a" dependencies = [ "async-utility", "async-wsocket", @@ -1622,7 +1622,7 @@ dependencies = [ [[package]] name = "nostr-sdk" version = "0.36.0" -source = "git+https://github.com/rust-nostr/nostr?rev=829e8cad6e68f54fb3a8d056d9ce4d1ceeeb84cb#829e8cad6e68f54fb3a8d056d9ce4d1ceeeb84cb" +source = "git+https://github.com/rust-nostr/nostr?rev=e82bc787bdd8490ceadb034fe4483e4df1e91b2a#e82bc787bdd8490ceadb034fe4483e4df1e91b2a" dependencies = [ "async-utility", "atomic-destructor", diff --git a/Cargo.toml b/Cargo.toml index abf40d0..31db455 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ itertools = "0.12" chrono = "0.4" parse_datetime = "0.5.0" interim = { version = "0.1", features = ["chrono"] } -nostr-sdk = { git = "https://github.com/rust-nostr/nostr", rev = "829e8cad6e68f54fb3a8d056d9ce4d1ceeeb84cb" } +nostr-sdk = { git = "https://github.com/rust-nostr/nostr", rev = "e82bc787bdd8490ceadb034fe4483e4df1e91b2a" } [dev-dependencies] tokio = { version = "1.41", features = ["rt", "rt-multi-thread", "macros", "io-std"] } diff --git a/src/kinds.rs b/src/kinds.rs index 0f8597d..f18315a 100644 --- a/src/kinds.rs +++ b/src/kinds.rs @@ -74,11 +74,8 @@ pub(crate) fn build_tracking(id: I) -> EventBuilder where I: IntoIterator, { - EventBuilder::new( - Kind::from(TRACKING_KIND), - "", - id.into_iter().map(Tag::event), - ) + EventBuilder::new(Kind::from(TRACKING_KIND), "") + .tags(id.into_iter().map(Tag::event)) } pub fn join<'a, T>(tags: T) -> String diff --git a/src/task.rs b/src/task.rs index 78ffeff..d5e7319 100644 --- a/src/task.rs +++ b/src/task.rs @@ -353,22 +353,22 @@ mod tasks_test { fn test_state() { let keys = Keys::generate(); let mut task = Task::new( - EventBuilder::new(TASK_KIND, "task", [Tag::hashtag("tag1")]) + EventBuilder::new(TASK_KIND, "task").tags([Tag::hashtag("tag1")]) .sign_with_keys(&keys).unwrap()); assert_eq!(task.pure_state(), State::Open); assert_eq!(task.get_hashtags().count(), 1); task.props.insert( - EventBuilder::new(State::Done.into(), "", []) + EventBuilder::new(State::Done.into(), "") .sign_with_keys(&keys).unwrap()); assert_eq!(task.pure_state(), State::Done); task.props.insert( - EventBuilder::new(State::Open.into(), "", [Tag::hashtag("tag2")]) + EventBuilder::new(State::Open.into(), "").tags([Tag::hashtag("tag2")]) .custom_created_at(Timestamp::from(Timestamp::now() - 2)) .sign_with_keys(&keys).unwrap()); assert_eq!(task.pure_state(), State::Done); assert_eq!(task.get_hashtags().count(), 2); task.props.insert( - EventBuilder::new(State::Closed.into(), "", []) + EventBuilder::new(State::Closed.into(), "") .custom_created_at(Timestamp::from(Timestamp::now() + 1)) .sign_with_keys(&keys).unwrap()); assert_eq!(task.pure_state(), State::Closed); diff --git a/src/tasks.rs b/src/tasks.rs index a0901a8..8540ff6 100644 --- a/src/tasks.rs +++ b/src/tasks.rs @@ -633,11 +633,10 @@ impl TasksRelay { false } }; - self.sender.submit(EventBuilder::new( - Kind::Bookmarks, - "mostr pins", - self.bookmarks.iter().map(|id| Tag::event(*id)), - ))?; + self.sender.submit( + EventBuilder::new(Kind::Bookmarks, "mostr pins") + .tags(self.bookmarks.iter().map(|id| Tag::event(*id))) + )?; Ok(added) } @@ -976,10 +975,11 @@ impl TasksRelay { if input_tags.iter().any(|t| t.kind().to_string() == PRIO) { None } else { self.priority.map(|p| to_prio_tag(p)) }; info!("Created task \"{input}\" with tags [{}]", join(&input_tags)); let id = self.submit( - EventBuilder::new(TASK_KIND, &input, input_tags) - .add_tags(self.tags.iter().cloned()) - .add_tags(tags) - .add_tags(prio) + EventBuilder::new(TASK_KIND, &input) + .tags(input_tags) + .tags(self.tags.iter().cloned()) + .tags(tags) + .tags(prio) ); if set_state { self.state @@ -1189,13 +1189,11 @@ impl TasksRelay { vec![id] }; let (desc, tags) = extract_tags(comment); - let prop = EventBuilder::new( - state.into(), - desc, - ids.into_iter() - .map(|e| self.make_event_tag_from_id(e, MARKER_PROPERTY)) - .chain(tags), - ); + let prop = + EventBuilder::new(state.into(), desc) + .tags(ids.into_iter() + .map(|e| self.make_event_tag_from_id(e, MARKER_PROPERTY))) + .tags(tags); // if self.custom_time.is_none() && self.get_by_id(id).map(|task| {}) {} info!( "Task status {} set for \"{}\"{}", @@ -1219,7 +1217,7 @@ impl TasksRelay { let (name, tags) = extract_tags(note.trim()); let format = format!("\"{name}\" with tags [{}]", join(&tags)); let mut prop = - EventBuilder::new(Kind::TextNote, name, tags); + EventBuilder::new(Kind::TextNote, name).tags(tags); //.filter(|id| self.get_by_id(id).is_some_and(|t| t.is_task())) //.map(|id| let marker = @@ -1445,7 +1443,7 @@ fn display_time(format: &str, secs: u64) -> String { .map_or(String::new(), |mins| format .replace("MMM", &format!("{:3}", mins)) .replace("HH", &format!("{:02}", mins.div(60))) - .replace("MM", &format!("{:02}", mins.rem(60))) + .replace("MM", &format!("{:02}", mins.rem(60))), ) } @@ -1775,11 +1773,10 @@ mod tasks_test { fn test_sibling_dependency() { let mut tasks = stub_tasks(); let parent = tasks.make_task("parent"); - let sub = tasks.submit(EventBuilder::new( - TASK_KIND, - "sub", - [tasks.make_event_tag_from_id(parent, MARKER_PARENT)], - )); + let sub = tasks.submit( + EventBuilder::new(TASK_KIND, "sub") + .tags([tasks.make_event_tag_from_id(parent, MARKER_PARENT)]) + ); assert_eq!(tasks.visible_tasks().len(), 1); tasks.track_at(Timestamp::now(), Some(sub)); assert_eq!(tasks.get_own_events_history().count(), 1); @@ -1807,11 +1804,10 @@ mod tasks_test { assert_eq!(tasks.filtered_tasks(Some(pin), false).len(), 0); assert_eq!(tasks.filtered_tasks(Some(zero), false).len(), 0); - tasks.submit(EventBuilder::new( - Kind::Bookmarks, - "", - [Tag::event(pin), Tag::event(zero)], - )); + tasks.submit( + EventBuilder::new(Kind::Bookmarks, "") + .tags([Tag::event(pin), Tag::event(zero)]) + ); assert_eq!(tasks.visible_tasks().len(), 1); assert_eq!(tasks.filtered_tasks(Some(pin), true).len(), 0); assert_eq!(tasks.filtered_tasks(Some(pin), false).len(), 0); @@ -1833,7 +1829,7 @@ mod tasks_test { vec![tasks.get_by_id(&test).unwrap()] ); - tasks.submit(EventBuilder::new(Kind::Bookmarks, "", [])); + tasks.submit(EventBuilder::new(Kind::Bookmarks, "")); tasks.clear_filters(); assert_tasks!(tasks, [pin, test]); tasks.set_view_depth(0); @@ -1845,11 +1841,10 @@ mod tasks_test { let mut tasks = stub_tasks(); tasks.make_task_and_enter("proc # tags", State::Procedure); assert_eq!(tasks.get_own_events_history().count(), 1); - let side = tasks.submit(EventBuilder::new( - TASK_KIND, - "side", - [tasks.make_event_tag(&tasks.get_current_task().unwrap().event, MARKER_DEPENDS)], - )); + let side = tasks.submit( + EventBuilder::new(TASK_KIND, "side") + .tags([tasks.make_event_tag(&tasks.get_current_task().unwrap().event, MARKER_DEPENDS)]) + ); assert_eq!(tasks.visible_tasks(), Vec::<&Task>::new()); let sub_id = tasks.make_task("sub"); assert_tasks!(tasks, [sub_id]);