add status to all eventsub payloads

Emilgardis · Emilgardis · commit a57d0ce269fd · 2021-02-20T01:30:02.000+01:00
also fixes VerificationRequest roundtrip
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/eventsub/channel/ban.rs b/src/eventsub/channel/ban.rs
@@ -59,6 +59,7 @@ fn parse_payload() {
             "id": "f1c2a387-161a-49f9-a165-0f21d7a4e1c4",
             "type": "channel.ban",
             "version": "1",
+            "status": "enabled",
             "condition": {
                 "broadcaster_user_id": "1337"
             },
diff --git a/src/eventsub/channel/channel_points_custom_reward/add.rs b/src/eventsub/channel/channel_points_custom_reward/add.rs
@@ -30,8 +30,10 @@ pub struct ChannelPointsCustomRewardAddV1Payload {
     pub background_color: String,
     /// The requested broadcaster ID.
     pub broadcaster_user_id: types::UserId,
-    /// The requested broadcaster name.
-    pub broadcaster_user_name: types::UserName,
+    /// The requested broadcaster login.
+    pub broadcaster_user_login: types::UserName,
+    /// The requested broadcaster display name.
+    pub broadcaster_user_name: types::DisplayName,
     /// Timestamp of the cooldown expiration. null if the reward isn’t on cooldown.
     pub cooldown_expires_at: Option<types::Timestamp>,
     /// The reward cost.
@@ -74,6 +76,7 @@ fn parse_payload() {
             "id": "f1c2a387-161a-49f9-a165-0f21d7a4e1c4",
             "type": "channel.channel_points_custom_reward.add",
             "version": "1",
+            "status": "enabled",
             "condition": {
                 "broadcaster_user_id": "1337"
             },
@@ -86,7 +89,8 @@ fn parse_payload() {
         "event": {
             "id": "9001",
             "broadcaster_user_id": "1337",
-            "broadcaster_user_name": "cool_user",
+            "broadcaster_user_login": "cool_user",
+            "broadcaster_user_name": "Cool_User",
             "is_enabled": true,
             "is_paused": false,
             "is_in_stock": true,
diff --git a/src/eventsub/channel/channel_points_custom_reward/remove.rs b/src/eventsub/channel/channel_points_custom_reward/remove.rs
@@ -31,7 +31,9 @@ pub struct ChannelPointsCustomRewardRemoveV1Payload {
     pub background_color: String,
     /// The requested broadcaster ID.
     pub broadcaster_user_id: types::UserId,
-    /// The requested broadcaster name.
+    /// The requested broadcaster login.
+    pub broadcaster_user_login: types::UserName,
+    /// The requested broadcaster display name.
     pub broadcaster_user_name: types::UserName,
     /// Timestamp of the cooldown expiration. null if the reward isn’t on cooldown.
     pub cooldown_expires_at: Option<types::Timestamp>,
@@ -76,6 +78,7 @@ fn parse_payload() {
             "id": "f1c2a387-161a-49f9-a165-0f21d7a4e1c4",
             "type": "channel.channel_points_custom_reward.remove",
             "version": "1",
+            "status": "enabled",
             "condition": {
                 "broadcaster_user_id": "1337",
                 "reward_id": "12345"
@@ -89,7 +92,8 @@ fn parse_payload() {
         "event": {
             "id": "9001",
             "broadcaster_user_id": "1337",
-            "broadcaster_user_name": "cool_user",
+            "broadcaster_user_login": "cool_user",
+            "broadcaster_user_name": "Cool_User",
             "is_enabled": true,
             "is_paused": false,
             "is_in_stock": true,
diff --git a/src/eventsub/channel/channel_points_custom_reward/update.rs b/src/eventsub/channel/channel_points_custom_reward/update.rs
@@ -31,8 +31,10 @@ pub struct ChannelPointsCustomRewardUpdateV1Payload {
     pub background_color: String,
     /// The requested broadcaster ID.
     pub broadcaster_user_id: types::UserId,
-    /// The requested broadcaster name.
-    pub broadcaster_user_name: types::UserName,
+    /// The requested broadcaster login.
+    pub broadcaster_user_login: types::UserName,
+    /// The requested broadcaster display name.
+    pub broadcaster_user_name: types::DisplayName,
     /// Timestamp of the cooldown expiration. null if the reward isn’t on cooldown.
     pub cooldown_expires_at: Option<types::Timestamp>,
     /// The reward cost.
@@ -75,6 +77,7 @@ fn parse_payload() {
             "id": "f1c2a387-161a-49f9-a165-0f21d7a4e1c4",
             "type": "channel.channel_points_custom_reward.update",
             "version": "1",
+            "status": "enabled",
             "condition": {
                 "broadcaster_user_id": "1337"
     
@@ -88,7 +91,8 @@ fn parse_payload() {
         "event": {
             "id": "9001",
             "broadcaster_user_id": "1337",
-            "broadcaster_user_name": "cool_user",
+            "broadcaster_user_login": "cool_user",
+            "broadcaster_user_name": "Cool_User",
             "is_enabled": true,
             "is_paused": false,
             "is_in_stock": true,
diff --git a/src/eventsub/channel/channel_points_custom_reward_redemption/add.rs b/src/eventsub/channel/channel_points_custom_reward_redemption/add.rs
@@ -60,6 +60,7 @@ fn parse_payload() {
             "id": "f1c2a387-161a-49f9-a165-0f21d7a4e1c4",
             "type": "channel.channel_points_custom_reward_redemption.add",
             "version": "1",
+            "status": "enabled",
             "condition": {
                 "broadcaster_user_id": "1337"
             },
diff --git a/src/eventsub/channel/channel_points_custom_reward_redemption/update.rs b/src/eventsub/channel/channel_points_custom_reward_redemption/update.rs
@@ -59,6 +59,7 @@ fn parse_payload() {
             "id": "f1c2a387-161a-49f9-a165-0f21d7a4e1c4",
             "type": "channel.channel_points_custom_reward_redemption.update",
             "version": "1",
+            "status": "enabled",
             "condition": {
                 "broadcaster_user_id": "1337"
             },
diff --git a/src/eventsub/channel/cheer.rs b/src/eventsub/channel/cheer.rs
@@ -53,6 +53,7 @@ fn parse_payload() {
             "id": "f1c2a387-161a-49f9-a165-0f21d7a4e1c4",
             "type": "channel.cheer",
             "version": "1",
+            "status": "enabled",
             "condition": {
                 "broadcaster_user_id": "1337"
             },
diff --git a/src/eventsub/channel/follow.rs b/src/eventsub/channel/follow.rs
@@ -47,6 +47,7 @@ fn parse_payload() {
             "id": "f1c2a387-161a-49f9-a165-0f21d7a4e1c4",
             "type": "channel.follow",
             "version": "1",
+            "status": "enabled",
             "condition": {
                "broadcaster_user_id": "1337"
             },
diff --git a/src/eventsub/channel/hypetrain/begin.rs b/src/eventsub/channel/hypetrain/begin.rs
@@ -57,6 +57,7 @@ fn parse_payload() {
             "id": "f1c2a387-161a-49f9-a165-0f21d7a4e1c4",
             "type": "channel.hype_train.begin",
             "version": "1",
+            "status": "enabled",
             "condition": {
                 "broadcaster_user_id": "1337"
             },
diff --git a/src/eventsub/channel/hypetrain/end.rs b/src/eventsub/channel/hypetrain/end.rs
@@ -54,6 +54,7 @@ fn parse_payload() {
             "id": "f1c2a387-161a-49f9-a165-0f21d7a4e1c4",
             "type": "channel.hype_train.end",
             "version": "1",
+            "status": "enabled",
             "condition": {
                 "broadcaster_user_id": "1337"
             },
diff --git a/src/eventsub/channel/hypetrain/progress.rs b/src/eventsub/channel/hypetrain/progress.rs
@@ -59,6 +59,7 @@ fn parse_payload() {
             "id": "f1c2a387-161a-49f9-a165-0f21d7a4e1c4",
             "type": "channel.hype_train.progress",
             "version": "1",
+            "status": "enabled",
             "condition": {
                 "broadcaster_user_id": "1337"
             },
diff --git a/src/eventsub/channel/raid.rs b/src/eventsub/channel/raid.rs
@@ -51,6 +51,7 @@ fn parse_payload() {
             "id": "f1c2a387-161a-49f9-a165-0f21d7a4e1c4",
             "type": "channel.raid",
             "version": "beta",
+            "status": "enabled",
             "condition": {
                 "to_broadcaster_user_id": "1337"
             },
diff --git a/src/eventsub/channel/subscribe.rs b/src/eventsub/channel/subscribe.rs
@@ -54,6 +54,7 @@ fn parse_payload() {
             "id": "f1c2a387-161a-49f9-a165-0f21d7a4e1c4",
             "type": "channel.subscribe",
             "version": "1",
+            "status": "enabled",
             "condition": {
                "broadcaster_user_id": "1337"
             },
diff --git a/src/eventsub/channel/unban.rs b/src/eventsub/channel/unban.rs
@@ -53,6 +53,7 @@ fn parse_payload() {
             "id": "f1c2a387-161a-49f9-a165-0f21d7a4e1c4",
             "type": "channel.unban",
             "version": "1",
+            "status": "enabled",
             "condition": {
                 "broadcaster_user_id": "1337"
             },
diff --git a/src/eventsub/channel/update.rs b/src/eventsub/channel/update.rs
@@ -27,8 +27,10 @@ impl EventSubscription for ChannelUpdateV1 {
 pub struct ChannelUpdateV1Payload {
     /// The broadcaster’s user ID.
     pub broadcaster_user_id: types::UserId,
-    /// The broadcaster’s user name.
-    pub broadcaster_user_name: types::UserName,
+    /// The requested broadcaster login.
+    pub broadcaster_user_login: types::UserName,
+    /// The broadcaster’s user display name.
+    pub broadcaster_user_name: types::DisplayName,
     /// The channel’s stream title.
     pub title: String,
     /// The channel’s broadcast language.
@@ -50,6 +52,7 @@ fn parse_payload() {
             "id": "f1c2a387-161a-49f9-a165-0f21d7a4e1c4",
             "type": "channel.update",
             "version": "1",
+            "status": "enabled",
             "condition": {
                "broadcaster_user_id": "1337"
             },
@@ -61,7 +64,8 @@ fn parse_payload() {
         },
         "event": {
             "broadcaster_user_id": "1337",
-            "broadcaster_user_name": "cool_user",
+            "broadcaster_user_login": "cool_user",
+            "broadcaster_user_name": "Cool_User",
             "title": "Best Stream Ever",
             "language": "en",
             "category_id": "21779",
diff --git a/src/eventsub/mod.rs b/src/eventsub/mod.rs
diff --git a/src/eventsub/stream/offline.rs b/src/eventsub/stream/offline.rs
diff --git a/src/eventsub/stream/online.rs b/src/eventsub/stream/online.rs
diff --git a/src/eventsub/user/authorization.rs b/src/eventsub/user/authorization.rs
diff --git a/src/eventsub/user/update.rs b/src/eventsub/user/update.rs
