diff --git a/cli/src/api/mod.rs b/cli/src/api/mod.rs index 8e8c7e6..34d9acb 100644 --- a/cli/src/api/mod.rs +++ b/cli/src/api/mod.rs @@ -57,7 +57,17 @@ pub struct Spond { // // -crate::get!(search(), () => "sponds" -> Vec); +crate::get!(search( + comments: bool, + hidden: bool, + add_profile_info: bool, + scheduled: bool, + #[builder(into)] order: Order, + #[builder(default=20)]max: usize, + ), + min_end_timestamp: Option>, + max_end_timestamp: Option>, + () => "sponds" -> Vec); //impl Search { // with_comments( diff --git a/cli/src/request/get.rs b/cli/src/request/get.rs index 78b7f53..0c9ff3b 100644 --- a/cli/src/request/get.rs +++ b/cli/src/request/get.rs @@ -1,4 +1,3 @@ -/// GET macro #[macro_export] macro_rules! get { // Case 1: no query @@ -84,8 +83,8 @@ macro_rules! get { } async move { - let result = client.get_with::<_, RP>(&query.as_pairs(), ( $( $arg ),* )).await?; - Ok(result.0) + let result = client.get_with::<_, RP>(( $( $arg ),* ), &query.as_pairs()).await?; + Ok(result.into_inner().0) } } };