Merge #72

72: Fixes r=Emilgardis a=Emilgardis



Co-authored-by: Emil Gardström <emil.gardstrom@gmail.com>

Author: bors[bot]

src/eventsub/channel/ban.rs

@@ -25,18 +25,30 @@ impl EventSubscription for ChannelBanV1 {
 #[cfg_attr(not(feature = "allow_unknown_fields"), serde(deny_unknown_fields))]
 #[non_exhaustive]
 pub struct ChannelBanV1Payload {
-    /// The requested broadcaster ID.
-    pub broadcaster_user_id: types::UserId,
-    /// The requested broadcaster login.
-    pub broadcaster_user_login: types::UserName,
-    /// The requested broadcaster display name.
-    pub broadcaster_user_name: types::DisplayName,
     /// The user ID for the user who was banned on the specified channel.
     pub user_id: types::UserId,
     /// The user login for the user who was banned on the specified channel.
     pub user_login: types::UserName,
     /// The requested broadcaster display name.
     pub user_name: types::DisplayName,
+    /// The requested broadcaster ID.
+    pub broadcaster_user_id: types::UserId,
+    /// The requested broadcaster login.
+    pub broadcaster_user_login: types::UserName,
+    /// The requested broadcaster display name.
+    pub broadcaster_user_name: types::DisplayName,
+    /// The user ID of the issuer of the ban.
+    pub moderator_user_id: types::UserId,
+    /// The user login of the issuer of the ban.
+    pub moderator_user_login: types::UserName,
+    /// The user name of the issuer of the ban.
+    pub moderator_user_name: types::DisplayName,
+    /// The reason behind the ban.
+    pub reason: String,
+    /// Will be null if permanent ban. If it is a timeout, this field shows when the timeout will end.
+    pub ends_at: Option<types::Timestamp>,
+    /// Indicates whether the ban is permanent (true) or a timeout (false). If true, ends_at will be null.
+    pub is_permanent: bool,
 }
 
 #[test]
@@ -62,7 +74,13 @@ fn parse_payload() {
             "user_name": "Cool_User",
             "broadcaster_user_id": "1337",
             "broadcaster_user_login": "cooler_user",
-            "broadcaster_user_name": "Cooler_User"
+            "broadcaster_user_name": "Cooler_User",
+            "moderator_user_id": "1339",
+            "moderator_user_login": "mod_user",
+            "moderator_user_name": "Mod_User",
+            "reason": "Offensive language",
+            "ends_at": "2020-07-15T18:16:11.17106713Z",
+            "is_permanent": false
         }
     }
     "#;

src/eventsub/channel/unban.rs

@@ -37,6 +37,12 @@ pub struct ChannelUnbanV1Payload {
     pub user_login: types::UserName,
     /// The user display name for the user who was unbanned on the specified channel.
     pub user_name: types::DisplayName,
+    /// The user ID of the issuer of the unban.
+    pub moderator_user_id: types::UserId,
+    /// The user login of the issuer of the unban.
+    pub moderator_user_login: types::UserName,
+    /// The user name of the issuer of the unban.
+    pub moderator_user_name: types::DisplayName,
 }
 
 #[test]
@@ -62,7 +68,10 @@ fn parse_payload() {
             "user_name": "Cool_User",
             "broadcaster_user_id": "1337",
             "broadcaster_user_login": "cooler_user",
-            "broadcaster_user_name": "Cooler_User"
+            "broadcaster_user_name": "Cooler_User",
+            "moderator_user_id": "1339",
+            "moderator_user_login": "mod_user",
+            "moderator_user_name": "Mod_User"
         }
     }
     "#;

src/helix/users/get_users.rs

@@ -107,20 +107,22 @@ fn test_request() {
     // FIXME: This is not valid anymore. Twitch....
     let data = br#"
 {
-    "data": [{
-        "id": "44322889",
-        "login": "dallas",
-        "display_name": "dallas",
-        "type": "staff",
-        "broadcaster_type": "",
-        "description": "Just a gamer playing games and chatting. :)",
-        "profile_image_url": "https://static-cdn.jtvnw.net/jtv_user_pictures/dallas-profile_image-1a2c906ee2c35f12-300x300.png",
-        "offline_image_url": "https://static-cdn.jtvnw.net/jtv_user_pictures/dallas-channel_offline_image-1a2c906ee2c35f12-1920x1080.png",
-        "view_count": 191836881,
-        "email": "login@provider.com",
-        "created_at": "2013-06-03T19:12:02.580593Z"
-    }]
-}
+    "data": [
+        {
+        "id": "141981764",
+        "login": "twitchdev",
+        "display_name": "TwitchDev",
+        "type": "",
+        "broadcaster_type": "partner",
+        "description": "Supporting third-party developers building Twitch integrations from chatbots to game integrations.",
+        "profile_image_url": "https://static-cdn.jtvnw.net/jtv_user_pictures/8a6381c7-d0c0-4576-b179-38bd5ce1d6af-profile_image-300x300.png",
+        "offline_image_url": "https://static-cdn.jtvnw.net/jtv_user_pictures/3f13ab61-ec78-4fe6-8481-8682cb3b0ac2-channel_offline_image-1920x1080.png",
+        "view_count": 5980557,
+        "email": "not-real@email.com",
+        "created_at": "2016-12-14T20:32:28.894263Z"
+        }
+    ]
+    }
 "#
         .to_vec();