Merge pull request #359 from Emilgardis/helpers

Improve helix::client_ext helpers & types in collections

Author: Emilgardis

.github/workflows/audit.yml

@@ -1,6 +1,6 @@
 name: Audit
 env:
-  MSRV: 1.67.0
+  MSRV: 1.77.0
 on:
   pull_request:
     types: [opened, reopened, synchronize]

.github/workflows/ci.yml

@@ -1,7 +1,7 @@
 name: CI
 env:
   CI_TWITCH_API_FEATURES: "twitch_oauth2/all all unsupported deny_unknown_fields ureq"
-  MSRV: 1.67.0
+  MSRV: 1.77.0
 on:
   pull_request:
     types: [opened, reopened, synchronize]

CHANGELOG.md

@@ -8,7 +8,7 @@
 
 ### Breaking changes
 
-- MSRV: 1.67.0
+- MSRV: 1.77.0
 - Requests for helix endpoints have been converted to take `Cow`s.
   This change means the `builder()` methods are harder to use, consider using the new methods on
   each request which provide the same functionality but with better ergonomics.
@@ -73,6 +73,7 @@
 - Added `helix::Response::new` and `helix::Response::with_data` to make it possible to create your own responses.
 - Added `is_branded_content` and `content_classification_labels` to `Get Channel Information` and `Modify Channel information`
 - Added `channel.update` v2 EventSub event
+- Added `HelixClient` functions `get_streams_from_logins` and `get_streams_from_ids`
 - Added `is_featured` to Get Clips
 - Added beta `Get Ad Schedule` and `Snooze Next Ad` endpoint
 - Added beta `channel.ad_break.begin` eventsub event

Cargo.lock

@@ -19,7 +19,7 @@ include = [
     "CHANGELOG.md",
     "LICENSE*",
 ]
-rust-version = "1.67.0"
+rust-version = "1.77.0"
 
 
 [workspace]
@@ -29,7 +29,7 @@ exclude = ["twitch_types", "twitch_oauth2"]
 [workspace.dependencies]
 twitch_api = { version = "0.7.0-rc.6", path = "." }
 twitch_oauth2 = { version = "0.13.0", path = "twitch_oauth2/" }
-twitch_types = { version = "0.4.3", features = [
+twitch_types = { version = "0.4.5", features = [
     "serde",
 ], path = "./twitch_types" }
 

Cargo.toml

@@ -25,10 +25,9 @@ async fn run() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>>
         .expect("Please set env: TWITCH_TOKEN or pass token as first argument");
     let token = UserToken::from_existing(&client, token, None, None).await?;
 
-    let ids: &[_] = &[token.user_id.as_ref()];
     let resp = client
         .req_get_custom(
-            helix::channels::GetChannelInformationRequest::broadcaster_ids(ids),
+            helix::channels::GetChannelInformationRequest::broadcaster_ids(&token.user_id),
             &token,
         )
         .await
@@ -43,7 +42,7 @@ async fn run() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>>
 /// Return Values for Get Channel Information
 ///
 /// [`get-channel-information`](https://dev.twitch.tv/docs/api/reference#get-channel-information)
-#[derive(PartialEq, Eq, serde::Deserialize, serde_derive::Serialize, Debug, Clone)]
+#[derive(PartialEq, Eq, serde_derive::Deserialize, serde_derive::Serialize, Debug, Clone)]
 pub struct CustomChannelInformation<'a> {
     /// Twitch User ID of this channel owner
     pub broadcaster_id: &'a types::UserIdRef,

examples/channel_information_custom.rs

@@ -265,9 +265,7 @@ pub async fn is_live<'a>(
     tracing::info!("checking if live");
     if let Some(stream) = client
         .req_get(
-            helix::streams::get_streams::GetStreamsRequest::user_ids(
-                &[config.broadcaster.id.as_ref()][..],
-            ),
+            helix::streams::get_streams::GetStreamsRequest::user_ids(&config.broadcaster.id),
             token,
         )
         .await

examples/eventsub/src/twitch.rs

@@ -40,10 +40,13 @@ async fn run() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>>
         .get_games_by_id(
             &streams
                 .iter()
-                .map(|s| s.game_id.as_ref())
-                .collect::<Vec<_>>(),
+                .map(|s| &s.game_id)
+                .collect::<Vec<_>>()
+                .into(),
             &token,
         )
+        .map_ok(|g| (g.id.clone(), g))
+        .try_collect::<std::collections::HashMap<_, _>>()
         .await?;
 
     println!(