From 12e318a447b2f1b2552bfd60fed32db392e4e335 Mon Sep 17 00:00:00 2001
From: Tobias 'Syzuna' Teske <syzuna@syzuna-programs.de>
Date: Mon, 30 Oct 2023 23:00:14 +0100
Subject: [PATCH] Removed GuestStarSlotUpdate, updated GuestStarGuestUpdate,
 fixed property names

---
 .../Models/GuestStar/ChannelGuestStarBase.cs  |  6 ++---
 .../Channel/ChannelGuestStarGuestUpdate.cs    | 15 +++++++++++
 .../Channel/ChannelGuestStarSlotUpdate.cs     | 25 -------------------
 3 files changed, 18 insertions(+), 28 deletions(-)
 delete mode 100644 TwitchLib.EventSub.Core/SubscriptionTypes/Channel/ChannelGuestStarSlotUpdate.cs

diff --git a/TwitchLib.EventSub.Core/Models/GuestStar/ChannelGuestStarBase.cs b/TwitchLib.EventSub.Core/Models/GuestStar/ChannelGuestStarBase.cs
index 501b018..1700792 100644
--- a/TwitchLib.EventSub.Core/Models/GuestStar/ChannelGuestStarBase.cs
+++ b/TwitchLib.EventSub.Core/Models/GuestStar/ChannelGuestStarBase.cs
@@ -33,15 +33,15 @@ public abstract class ChannelGuestStarBase
         /// <summary>
         /// The user ID of the guest
         /// </summary>
-        public string GuestStarUserId { get; set; } = string.Empty;
+        public string GuestUserId { get; set; } = string.Empty;
         /// <summary>
         /// The guest display name
         /// </summary>
-        public string GuestStarUserName { get; set; } = string.Empty;
+        public string GuestUserName { get; set; } = string.Empty;
         /// <summary>
         /// The guest login
         /// </summary>
-        public string GuestStarUserLogin { get; set; } = string.Empty;
+        public string GuestUserLogin { get; set; } = string.Empty;
         /// <summary>
         /// The ID of the slot assignment the guest is assigned to. null/empty if the guest is in the INVITED state.
         /// <para>or the ID of the slot where settings were updated.</para>
diff --git a/TwitchLib.EventSub.Core/SubscriptionTypes/Channel/ChannelGuestStarGuestUpdate.cs b/TwitchLib.EventSub.Core/SubscriptionTypes/Channel/ChannelGuestStarGuestUpdate.cs
index c4b0997..b2782ac 100644
--- a/TwitchLib.EventSub.Core/SubscriptionTypes/Channel/ChannelGuestStarGuestUpdate.cs
+++ b/TwitchLib.EventSub.Core/SubscriptionTypes/Channel/ChannelGuestStarGuestUpdate.cs
@@ -28,5 +28,20 @@ public class ChannelGuestStarGuestUpdate : ChannelGuestStarBase
         /// </para>
         /// </summary>
         public string State { get; set; } = string.Empty;
+        /// <summary>
+        /// Flag that signals whether the host is allowing the slot’s video to be seen by participants within the session.
+        /// <para>null if the guest is not slotted.</para>
+        /// </summary>
+        public bool? HostVideoEnabled { get; set; }
+        /// <summary>
+        /// Flag that signals whether the host is allowing the slot’s audio to be heard by participants within the session.
+        /// <para>null if the guest is not slotted.</para>
+        /// </summary>
+        public bool? HostAudioEnabled { get; set; }
+        /// <summary>
+        /// Value between 0-100 that represents the slot’s audio level as heard by participants within the session.
+        /// <para>null if the guest is not slotted.</para>
+        /// </summary>
+        public int? HostVolume { get; set; }
     }
 }
\ No newline at end of file
diff --git a/TwitchLib.EventSub.Core/SubscriptionTypes/Channel/ChannelGuestStarSlotUpdate.cs b/TwitchLib.EventSub.Core/SubscriptionTypes/Channel/ChannelGuestStarSlotUpdate.cs
deleted file mode 100644
index 086e15d..0000000
--- a/TwitchLib.EventSub.Core/SubscriptionTypes/Channel/ChannelGuestStarSlotUpdate.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using TwitchLib.EventSub.Core.Models.GuestStar;
-
-namespace TwitchLib.EventSub.Core.SubscriptionTypes.Channel
-{
-    /// <summary>
-    /// Channel GuestStar Slot Update subscription type model
-    /// <para>Description:</para>
-    /// <para>The channel.guest_star_slot.update subscription type sends a notification when a slot setting is updated in an active Guest Star session.</para>
-    /// </summary>
-    public class ChannelGuestStarSlotUpdate : ChannelGuestStarBase
-    {
-        /// <summary>
-        /// Flag that signals whether the host is allowing the slot’s video to be seen by participants within the session.
-        /// </summary>
-        public bool HostVideoEnabled { get; set; }
-        /// <summary>
-        /// Flag that signals whether the host is allowing the slot’s audio to be heard by participants within the session.
-        /// </summary>
-        public bool HostAudioEnabled { get; set; }
-        /// <summary>
-        /// Value between 0-100 that represents the slot’s audio level as heard by participants within the session.
-        /// </summary>
-        public int HostVolume { get; set; }
-    }
-}
\ No newline at end of file