convert remaining &str to Cow<str>

Author: Emilgardis

src/helix/client/client_ext.rs

@@ -141,7 +141,7 @@ impl<'a, C: crate::HttpClient<'a> + Sync> HelixClient<'a, C> {
     where
         T: TwitchToken + Send + Sync + ?Sized,
     {
-        let req = helix::search::SearchCategoriesRequest::query(query).first(100);
+        let req = helix::search::SearchCategoriesRequest::query(query.into()).first(100);
         make_stream(req, token, self, std::collections::VecDeque::from)
     }
 

src/helix/endpoints/bits/get_bits_leaderboard.rs

@@ -58,7 +58,7 @@ pub struct GetBitsLeaderboardRequest<'a> {
     /// * "all" – The lifetime of the broadcaster's channel. If this is specified (or used by default), started_at is ignored.
     #[cfg_attr(feature = "typed-builder", builder(default, setter(into)))]
     #[serde(borrow)]
-    pub period: Option<&'a str>,
+    pub period: Option<Cow<'a, str>>,
     /// Timestamp for the period over which the returned data is aggregated. Must be in RFC 3339 format. If this is not provided, data is aggregated over the current period; e.g., the current day/week/month/year. This value is ignored if period is "all".
     #[cfg_attr(feature = "typed-builder", builder(default, setter(into)))]
     #[serde(borrow)]
@@ -79,9 +79,9 @@ impl<'a> GetBitsLeaderboardRequest<'a> {
     }
 
     /// Get loaderboard for this period. Valid values: `"day"`, `"week"`, `"month"`, `"year"`, `"all"`
-    pub fn period(self, period: &'a str) -> Self {
+    pub fn period(self, period: impl Into<Cow<'a, str>>) -> Self {
         Self {
-            period: Some(period),
+            period: Some(period.into()),
             ..self
         }
     }

src/helix/endpoints/channels/modify_channel_information.rs

@@ -87,11 +87,11 @@ pub struct ModifyChannelInformationBody<'a> {
     /// Language of the channel
     #[cfg_attr(feature = "typed-builder", builder(default, setter(into)))]
     #[serde(skip_serializing_if = "Option::is_none", borrow)]
-    pub broadcaster_language: Option<&'a str>,
+    pub broadcaster_language: Option<Cow<'a, str>>,
     /// Title of the stream. Value must not be an empty string.
     #[cfg_attr(feature = "typed-builder", builder(default, setter(into)))]
     #[serde(skip_serializing_if = "Option::is_none", borrow)]
-    pub title: Option<&'a str>,
+    pub title: Option<Cow<'a, str>>,
 }
 
 impl<'a> ModifyChannelInformationBody<'a> {
@@ -116,13 +116,16 @@ impl<'a> ModifyChannelInformationBody<'a> {
     }
 
     /// Language of the channel
-    pub fn broadcaster_language(&mut self, broadcaster_language: impl Into<&'a str>) -> &mut Self {
+    pub fn broadcaster_language(
+        &mut self,
+        broadcaster_language: impl Into<Cow<'a, str>>,
+    ) -> &mut Self {
         self.broadcaster_language = Some(broadcaster_language.into());
         self
     }
 
     /// Title of the stream. Value must not be an empty string.
-    pub fn title(&mut self, title: impl Into<&'a str>) -> &mut Self {
+    pub fn title(&mut self, title: impl Into<Cow<'a, str>>) -> &mut Self {
         self.title = Some(title.into());
         self
     }
@@ -188,10 +191,8 @@ fn test_request() {
     use helix::*;
     let req = ModifyChannelInformationRequest::broadcaster_id("0");
 
-    let body = ModifyChannelInformationBody {
-        title: Some("Hello World!"),
-        ..Default::default()
-    };
+    let mut body = ModifyChannelInformationBody::new();
+    body.title("Hello World!");
 
     dbg!(req.create_request(body, "token", "clientid").unwrap());
 

src/helix/endpoints/chat/send_chat_announcement.rs

@@ -91,7 +91,7 @@ impl<'a> SendChatAnnouncementRequest<'a> {
 pub struct SendChatAnnouncementBody<'a> {
     /// The announcement to make in the broadcaster’s chat room. Announcements are limited to a maximum of 500 characters; announcements longer than 500 characters are truncated.
     #[serde(borrow)]
-    pub message: &'a str,
+    pub message: Cow<'a, str>,
     // FIXME: Enumify?
     /// The color used to highlight the announcement. Possible case-sensitive values are:
     ///
@@ -109,11 +109,11 @@ pub struct SendChatAnnouncementBody<'a> {
 impl<'a> SendChatAnnouncementBody<'a> {
     /// Create a new announcement with specified color
     pub fn new<E>(
-        message: &'a str,
+        message: impl Into<Cow<'a, str>>,
         color: impl std::convert::TryInto<AnnouncementColor, Error = E>,
     ) -> Result<Self, E> {
         Ok(Self {
-            message,
+            message: message.into(),
             color: color.try_into()?,
         })
     }

src/helix/endpoints/goals/get_creator_goals.rs

@@ -56,7 +56,7 @@ pub struct GetCreatorGoalsRequest<'a> {
     /// Retreive a single event by event ID
     #[cfg_attr(feature = "typed-builder", builder(default, setter(into)))]
     #[serde(borrow)]
-    pub id: Option<&'a str>,
+    pub id: Option<Cow<'a, str>>,
 }
 
 impl<'a> GetCreatorGoalsRequest<'a> {

src/helix/endpoints/hypetrain/get_hypetrain_events.rs

@@ -61,7 +61,7 @@ pub struct GetHypeTrainEventsRequest<'a> {
     )]
     #[cfg_attr(feature = "typed-builder", builder(default, setter(into)))]
     #[serde(borrow)]
-    pub id: Option<&'a str>,
+    pub id: Option<Cow<'a, str>>,
 }
 
 impl<'a> GetHypeTrainEventsRequest<'a> {

src/helix/endpoints/moderation/add_blocked_term.rs

@@ -91,12 +91,12 @@ pub struct AddBlockedTermBody<'a> {
     /// The term must contain a minimum of 2 characters and may contain up to a maximum of 500 characters.
     /// Terms can use a wildcard character (*). The wildcard character must appear at the beginning or end of a word, or set of characters. For example, *foo or foo*.
     #[serde(borrow)]
-    pub text: &'a str,
+    pub text: Cow<'a, str>,
 }
 
 impl<'a> AddBlockedTermBody<'a> {
     /// Create a new [`AddBlockedTermBody`]
-    pub fn new(text: &'a str) -> Self { Self { text } }
+    pub fn new(text: impl Into<Cow<'a, str>>) -> Self { Self { text: text.into() } }
 }
 
 impl helix::private::SealedSerialize for AddBlockedTermBody<'_> {}

src/helix/endpoints/moderation/ban_user.rs

@@ -101,7 +101,7 @@ pub struct BanUserBody<'a> {
     /// The reason the user is being banned or put in a timeout. The text is user defined and limited to a maximum of 500 characters.
     #[cfg_attr(feature = "typed-builder", builder(setter(into)))]
     #[serde(borrow)]
-    pub reason: &'a str,
+    pub reason: Cow<'a, str>,
     /// The ID of the user to ban or put in a timeout.
     #[cfg_attr(feature = "typed-builder", builder(setter(into)))]
     #[serde(borrow)]
@@ -112,12 +112,12 @@ impl<'a> BanUserBody<'a> {
     /// Create a new [`BanUserBody`]
     pub fn new(
         user_id: impl types::IntoCow<'a, types::UserIdRef> + 'a,
-        reason: &'a str,
+        reason: impl Into<Cow<'a, str>>,
         duration: impl Into<Option<u32>>,
     ) -> Self {
         Self {
             duration: duration.into(),
-            reason,
+            reason: reason.into(),
             user_id: user_id.to_cow(),
         }
     }

src/helix/endpoints/moderation/check_automod_status.rs

@@ -87,7 +87,7 @@ pub struct CheckAutoModStatusBody<'a> {
     /// Message text.
     #[cfg_attr(feature = "typed-builder", builder(setter(into)))]
     #[serde(borrow)]
-    pub msg_text: &'a str,
+    pub msg_text: Cow<'a, str>,
     /// User ID of the sender.
     #[deprecated(since = "0.7.0", note = "user_id in automod check is no longer read")]
     #[cfg_attr(
@@ -100,10 +100,13 @@ pub struct CheckAutoModStatusBody<'a> {
 
 impl<'a> CheckAutoModStatusBody<'a> {
     /// Create a new [`CheckAutoModStatusBody`]
-    pub fn new(msg_id: impl types::IntoCow<'a, types::MsgIdRef> + 'a, msg_text: &'a str) -> Self {
+    pub fn new(
+        msg_id: impl types::IntoCow<'a, types::MsgIdRef> + 'a,
+        msg_text: impl Into<Cow<'a, str>>,
+    ) -> Self {
         Self {
             msg_id: msg_id.to_cow(),
-            msg_text,
+            msg_text: msg_text.into(),
             user_id: None,
         }
     }

src/helix/endpoints/points/create_custom_rewards.rs

@@ -79,11 +79,11 @@ pub struct CreateCustomRewardBody<'a> {
     /// The title of the reward
     #[cfg_attr(feature = "typed-builder", builder(setter(into)))]
     #[serde(borrow)]
-    pub title: &'a str,
+    pub title: Cow<'a, str>,
     /// The prompt for the viewer when they are redeeming the reward
     #[cfg_attr(feature = "typed-builder", builder(default, setter(into)))]
     #[serde(skip_serializing_if = "Option::is_none", borrow)]
-    pub prompt: Option<&'a str>,
+    pub prompt: Option<Cow<'a, str>>,
     /// The cost of the reward
     pub cost: usize,
     /// Is the reward currently enabled, if false the reward won’t show up to viewers. Defaults true
@@ -93,7 +93,7 @@ pub struct CreateCustomRewardBody<'a> {
     /// Custom background color for the reward. Format: Hex with # prefix. Example: #00E5CB.
     #[cfg_attr(feature = "typed-builder", builder(default, setter(into)))]
     #[serde(skip_serializing_if = "Option::is_none", borrow)]
-    pub background_color: Option<&'a str>,
+    pub background_color: Option<Cow<'a, str>>,
     /// Does the user need to enter information when redeeming the reward. Defaults false
     #[cfg_attr(feature = "typed-builder", builder(default, setter(into)))]
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -131,9 +131,9 @@ pub struct CreateCustomRewardBody<'a> {
 impl<'a> CreateCustomRewardBody<'a> {
     // FIXME: need to add more here
     /// Reward to create with title.
-    pub fn new(title: &'a str, cost: usize) -> Self {
+    pub fn new(title: impl Into<Cow<'a, str>>, cost: usize) -> Self {
         Self {
-            title,
+            title: title.into(),
             prompt: Default::default(),
             cost,
             is_enabled: Default::default(),