make cursors into Cows too

Author: Emilgardis

src/helix/endpoints/channels/get_vips.rs

@@ -57,7 +57,7 @@ pub struct GetVipsRequest<'a> {
     pub first: Option<usize>,
     /// The cursor used to get the next page of results. The Pagination object in the response contains the cursor’s value. Read more.
     #[cfg_attr(feature = "typed-builder", builder(default))]
-    pub after: Option<helix::Cursor>,
+    pub after: Option<Cow<'a, helix::CursorRef>>,
 }
 
 impl<'a> GetVipsRequest<'a> {
@@ -110,7 +110,9 @@ impl Request for GetVipsRequest<'_> {
 }
 
 impl helix::Paginated for GetVipsRequest<'_> {
-    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) { self.after = cursor; }
+    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) {
+        self.after = cursor.map(|c| c.into_cow())
+    }
 }
 
 impl RequestGet for GetVipsRequest<'_> {}

src/helix/endpoints/chat/get_chatters.rs

@@ -62,7 +62,7 @@ pub struct GetChattersRequest<'a> {
     pub first: Option<usize>,
     /// The cursor used to get the next page of results. The Pagination object in the response contains the cursor’s value.
     #[cfg_attr(feature = "typed-builder", builder(default))]
-    pub after: Option<helix::Cursor>,
+    pub after: Option<Cow<'a, helix::CursorRef>>,
 }
 
 impl<'a> GetChattersRequest<'a> {
@@ -91,7 +91,9 @@ impl<'a> GetChattersRequest<'a> {
 }
 
 impl helix::Paginated for GetChattersRequest<'_> {
-    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) { self.after = cursor }
+    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) {
+        self.after = cursor.map(|c| c.into_cow())
+    }
 }
 
 /// Return Values for [Get Chatters](super::get_chatters)

src/helix/endpoints/clips/get_clips.rs

@@ -59,11 +59,11 @@ pub struct GetClipsRequest<'a> {
     // one of above is needed.
     /// Cursor for forward pagination: tells the server where to start fetching the next set of results, in a multi-page response. This applies only to queries specifying broadcaster_id or game_id. The cursor value specified here is from the pagination response field of a prior query.
     #[cfg_attr(feature = "typed-builder", builder(default))]
-    pub after: Option<helix::Cursor>,
+    pub after: Option<Cow<'a, helix::CursorRef>>,
     /// Cursor for backward pagination: tells the server where to start fetching the next set of results, in a multi-page response. This applies only to queries specifying broadcaster_id or game_id. The cursor value specified here is from the pagination response field of a prior query.
     #[cfg_attr(feature = "typed-builder", builder(default))]
     #[serde(borrow)]
-    pub before: Option<&'a helix::CursorRef>,
+    pub before: Option<Cow<'a, helix::CursorRef>>,
     /// Ending date/time for returned clips, in RFC3339 format. (Note that the seconds value is ignored.) If this is specified, started_at also must be specified; otherwise, the time period is ignored.
     #[cfg_attr(feature = "typed-builder", builder(default))]
     #[serde(borrow)]
@@ -199,7 +199,9 @@ impl Request for GetClipsRequest<'_> {
 impl RequestGet for GetClipsRequest<'_> {}
 
 impl helix::Paginated for GetClipsRequest<'_> {
-    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) { self.after = cursor }
+    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) {
+        self.after = cursor.map(|c| c.into_cow())
+    }
 }
 
 #[cfg(test)]

src/helix/endpoints/eventsub/get_eventsub_subscriptions.rs

@@ -27,7 +27,7 @@ pub struct GetEventSubSubscriptionsRequest<'a> {
     // FIXME: https://github.com/twitchdev/issues/issues/272
     /// Cursor for forward pagination
     #[cfg_attr(feature = "typed-builder", builder(default, setter(into)))]
-    pub after: Option<helix::Cursor>,
+    pub after: Option<Cow<'a, helix::CursorRef>>,
     // FIXME: https://github.com/twitchdev/issues/issues/271
     /// Maximum number of objects to return. Maximum: 100. Default: 20.
     #[cfg_attr(feature = "typed-builder", builder(default, setter(into)))]
@@ -124,7 +124,9 @@ impl RequestGet for GetEventSubSubscriptionsRequest<'_> {
 }
 
 impl helix::Paginated for GetEventSubSubscriptionsRequest<'_> {
-    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) { self.after = cursor }
+    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) {
+        self.after = cursor.map(|c| c.into_cow())
+    }
 }
 
 #[cfg(test)]

src/helix/endpoints/games/get_top_games.rs

@@ -48,11 +48,11 @@ use helix::RequestGet;
 pub struct GetTopGamesRequest<'a> {
     /// Cursor for forward pagination: tells the server where to start fetching the next set of results, in a multi-page response. The cursor value specified here is from the pagination response field of a prior query.
     #[cfg_attr(feature = "typed-builder", builder(default, setter(into)))]
-    pub after: Option<helix::Cursor>,
+    pub after: Option<Cow<'a, helix::CursorRef>>,
     /// Cursor for backward pagination: tells the server where to start fetching the next set of results, in a multi-page response. The cursor value specified here is from the pagination response field of a prior query.
     #[cfg_attr(feature = "typed-builder", builder(default, setter(into)))]
     #[serde(borrow)]
-    pub before: Option<&'a helix::CursorRef>,
+    pub before: Option<Cow<'a, helix::CursorRef>>,
     /// Maximum number of objects to return. Maximum: 100. Default: 20.
     #[cfg_attr(feature = "typed-builder", builder(default, setter(into)))]
     pub first: Option<usize>,
@@ -82,7 +82,9 @@ impl Request for GetTopGamesRequest<'_> {
 impl RequestGet for GetTopGamesRequest<'_> {}
 
 impl helix::Paginated for GetTopGamesRequest<'_> {
-    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) { self.after = cursor }
+    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) {
+        self.after = cursor.map(|c| c.into_cow())
+    }
 }
 
 #[cfg(test)]

src/helix/endpoints/moderation/get_banned_users.rs

@@ -55,11 +55,11 @@ pub struct GetBannedUsersRequest<'a> {
     pub user_id: Cow<'a, [&'a types::UserIdRef]>,
     /// Cursor for forward pagination: tells the server where to start fetching the next set of results, in a multi-page response. The cursor value specified here is from the pagination response field of a prior query.
     #[cfg_attr(feature = "typed-builder", builder(default))]
-    pub after: Option<helix::Cursor>,
+    pub after: Option<Cow<'a, helix::CursorRef>>,
     /// Cursor for backward pagination: tells the server where to start fetching the next set of results, in a multi-page response. The cursor value specified here is from the pagination response field of a prior query.
     #[cfg_attr(feature = "typed-builder", builder(default))]
     #[serde(borrow)]
-    pub before: Option<&'a helix::CursorRef>,
+    pub before: Option<Cow<'a, helix::CursorRef>>,
     /// Number of values to be returned per page. Limit: 100. Default: 20.
     #[cfg_attr(feature = "typed-builder", builder(setter(into), default))]
     pub first: Option<usize>,
@@ -128,7 +128,9 @@ impl Request for GetBannedUsersRequest<'_> {
 impl RequestGet for GetBannedUsersRequest<'_> {}
 
 impl helix::Paginated for GetBannedUsersRequest<'_> {
-    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) { self.after = cursor }
+    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) {
+        self.after = cursor.map(|c| c.into_cow())
+    }
 }
 
 #[cfg(test)]

src/helix/endpoints/moderation/get_blocked_terms.rs

@@ -57,7 +57,7 @@ pub struct GetBlockedTerms<'a> {
     pub first: Option<u32>,
     /// The cursor used to get the next page of results. The Pagination object in the response contains the cursor’s value.
     #[cfg_attr(feature = "typed-builder", builder(default))]
-    pub after: Option<helix::Cursor>,
+    pub after: Option<Cow<'a, helix::CursorRef>>,
 }
 
 impl<'a> GetBlockedTerms<'a> {
@@ -98,7 +98,9 @@ impl Request for GetBlockedTerms<'_> {
 impl RequestGet for GetBlockedTerms<'_> {}
 
 impl helix::Paginated for GetBlockedTerms<'_> {
-    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) { self.after = cursor }
+    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) {
+        self.after = cursor.map(|c| c.into_cow())
+    }
 }
 
 #[cfg(test)]

src/helix/endpoints/moderation/get_moderators.rs

@@ -54,7 +54,7 @@ pub struct GetModeratorsRequest<'a> {
     pub user_id: Cow<'a, [&'a types::UserIdRef]>,
     /// Cursor for forward pagination: tells the server where to start fetching the next set of results, in a multi-page response. The cursor value specified here is from the pagination response field of a prior query.
     #[cfg_attr(feature = "typed-builder", builder(default))]
-    pub after: Option<helix::Cursor>,
+    pub after: Option<Cow<'a, helix::CursorRef>>,
     /// Number of values to be returned per page. Limit: 100. Default: 20.
     #[cfg_attr(feature = "typed-builder", builder(setter(into), default))]
     pub first: Option<usize>,
@@ -110,7 +110,9 @@ impl Request for GetModeratorsRequest<'_> {
 impl RequestGet for GetModeratorsRequest<'_> {}
 
 impl helix::Paginated for GetModeratorsRequest<'_> {
-    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) { self.after = cursor }
+    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) {
+        self.after = cursor.map(|c| c.into_cow())
+    }
 }
 
 #[cfg(test)]

src/helix/endpoints/points/get_custom_reward_redemption.rs

@@ -68,7 +68,7 @@ pub struct GetCustomRewardRedemptionRequest<'a> {
 
     /// Cursor for forward pagination: tells the server where to start fetching the next set of results, in a multi-page response. This applies only to queries without ID. If an ID is specified, it supersedes any cursor/offset combinations. The cursor value specified here is from the pagination response field of a prior query.
     #[cfg_attr(feature = "typed-builder", builder(default))]
-    pub after: Option<helix::Cursor>,
+    pub after: Option<Cow<'a, helix::CursorRef>>,
 
     /// Number of results to be returned when getting the paginated Custom Reward Redemption objects for a reward. Limit: 50. Default: 20.
     #[cfg_attr(feature = "typed-builder", builder(default, setter(into)))]
@@ -174,7 +174,9 @@ impl Request for GetCustomRewardRedemptionRequest<'_> {
 impl RequestGet for GetCustomRewardRedemptionRequest<'_> {}
 
 impl helix::Paginated for GetCustomRewardRedemptionRequest<'_> {
-    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) { self.after = cursor }
+    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) {
+        self.after = cursor.map(|c| c.into_cow())
+    }
 }
 
 #[cfg(test)]

src/helix/endpoints/polls/get_polls.rs

@@ -54,7 +54,7 @@ pub struct GetPollsRequest<'a> {
     pub id: Cow<'a, [&'a types::PollIdRef]>,
     /// Cursor for forward pagination
     #[cfg_attr(feature = "typed-builder", builder(default, setter(into)))]
-    pub after: Option<helix::Cursor>,
+    pub after: Option<Cow<'a, helix::CursorRef>>,
     /// Maximum number of objects to return. Maximum: 20. Default: 20.
     #[cfg_attr(feature = "typed-builder", builder(default, setter(into)))]
     pub first: Option<usize>,
@@ -128,7 +128,9 @@ impl Request for GetPollsRequest<'_> {
 impl RequestGet for GetPollsRequest<'_> {}
 
 impl helix::Paginated for GetPollsRequest<'_> {
-    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) { self.after = cursor; }
+    fn set_pagination(&mut self, cursor: Option<helix::Cursor>) {
+        self.after = cursor.map(|c| c.into_cow())
+    }
 }
 
 #[cfg(test)]