From 15acebbbfa138a4b264476a6f513f98187ee0472 Mon Sep 17 00:00:00 2001 From: glyph Date: Fri, 1 Jul 2022 08:58:33 +0100 Subject: [PATCH] replace SsbMessageValue with SsbMessageKVT in stream examples --- examples/streams.rs | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/examples/streams.rs b/examples/streams.rs index d692baa..a9b9106 100644 --- a/examples/streams.rs +++ b/examples/streams.rs @@ -5,7 +5,7 @@ use futures::TryStreamExt; use golgi::{ api::get_subset::{SubsetQuery, SubsetQueryOptions}, - messages::{SsbMessageContentType, SsbMessageValue}, + messages::{SsbMessageContentType, SsbMessageKVT}, sbot::Keystore, GolgiError, Sbot, }; @@ -31,7 +31,7 @@ async fn run() -> Result<(), GolgiError> { /* HISTORY STREAM EXAMPLE */ // Create an ordered stream of all messages authored by the `author` - // identity. + // identity. Messages are returned as KVTs (Key Value Timestamp). let history_stream = sbot_client .create_history_stream(author.to_string()) .await?; @@ -42,12 +42,12 @@ async fn run() -> Result<(), GolgiError> { println!("looping through stream"); // Iterate through each element in the stream and match on the `Result`. - // In this case, each element has type `Result`. + // In this case, each element has type `Result`. while let Some(res) = history_stream.next().await { match res { - Ok(value) => { - // Print the `SsbMessageValue` of this element to `stdout`. - println!("value: {:?}", value); + Ok(kvt) => { + // Print the `SsbMessageKVT` of this element to `stdout`. + println!("kvt: {:?}", kvt); } Err(err) => { // Print the `GolgiError` of this element to `stderr`. @@ -64,12 +64,12 @@ async fn run() -> Result<(), GolgiError> { .create_history_stream(author.to_string()) .await?; - // Collect the stream elements into a `Vec` using + // Collect the stream elements into a `Vec` using // `try_collect`. A `GolgiError` will be returned from the `run` // function if any element contains an error. - let results: Vec = history_stream.try_collect().await?; + let results: Vec = history_stream.try_collect().await?; - // Loop through the `SsbMessageValue` elements, printing each one + // Loop through the `SsbMessageKVT` elements, printing each one // to `stdout`. for x in results { println!("x: {:?}", x); @@ -82,13 +82,14 @@ async fn run() -> Result<(), GolgiError> { .await?; // Iterate through the elements in the stream and use `map` to convert - // each `SsbMessageValue` element into a tuple of + // each `SsbMessageKVT` element into a tuple of // `(String, SsbMessageContentType)`. This is an example of stream // conversion. let type_stream = history_stream.map(|msg| match msg { - Ok(val) => { - let message_type = val.get_message_type()?; - let tuple: (String, SsbMessageContentType) = (val.signature, message_type); + Ok(kvt) => { + let message_type = kvt.value.get_message_type()?; + // Return the message key and type. + let tuple: (String, SsbMessageContentType) = (kvt.key, message_type); Ok(tuple) } Err(err) => Err(err),