Updated missing Topics, updated interface (#120)

* Updated Communication Library, Updated interface with missing methods, added missing topics

* Added events and objects for new channel-bits-badge-unlocks and low-trust-users, cleanup

* Removed OnBitsReceived event

* Updated Communication library to version 2.0.0

TwitchLib.PubSub/Events/OnChannelBitsBadgeUnlockArgs.cs

@@ -0,0 +1,18 @@
+using System;
+using TwitchLib.PubSub.Models.Responses.Messages;
+
+namespace TwitchLib.PubSub.Events
+{
+    public class OnChannelBitsBadgeUnlockArgs : EventArgs
+    {
+        /// <summary>
+        /// The subscription
+        /// </summary>
+        public BitsBadgeNotificationMessage BitsBadgeUnlocks;
+
+        /// <summary>
+        /// The channel ID the event came from
+        /// </summary>
+        public string ChannelId;
+    }
+}

TwitchLib.PubSub/Events/OnLowTrustUsersArgs.cs

@@ -0,0 +1,18 @@
+using System;
+using TwitchLib.PubSub.Models.Responses.Messages;
+
+namespace TwitchLib.PubSub.Events
+{
+    public class OnLowTrustUsersArgs : EventArgs
+    {
+        /// <summary>
+        /// The subscription
+        /// </summary>
+        public LowTrustUsers LowTrustUsers;
+
+        /// <summary>
+        /// The channel ID the event came from
+        /// </summary>
+        public string ChannelId;
+    }
+}

TwitchLib.PubSub/Interfaces/ITwitchPubSub.cs

@@ -9,14 +9,28 @@ namespace TwitchLib.PubSub.Interfaces
     /// </summary>
     public interface ITwitchPubSub
     {
+        /// <summary>
+        /// Fires when a moderation event hits a user
+        /// </summary>
+        event EventHandler<OnAutomodCaughtUserMessage> OnAutomodCaughtUserMessage;
+
+        /// <summary>
+        /// Fires when Automod updates a held message.
+        /// </summary>
+        event EventHandler<OnAutomodCaughtMessageArgs> OnAutomodCaughtMessage;
+
         /// <summary>
         /// Occurs when [on ban].
         /// </summary>
         event EventHandler<OnBanArgs> OnBan;
         /// <summary>
-        /// Occurs when [on bits received].
+        /// Fires when PubSub receives a bits message.
+        /// </summary>
+        event EventHandler<OnBitsReceivedV2Args> OnBitsReceivedV2;
+        /// <summary>
+        /// Fires when PubSub receives notice when the channel unlocks bit badge.
         /// </summary>
-        event EventHandler<OnBitsReceivedArgs> OnBitsReceived;
+        event EventHandler<OnChannelBitsBadgeUnlockArgs> OnChannelBitsBadgeUnlock;
         /// <summary>
         /// Occurs when [on channel extension broadcast].
         /// </summary>
@@ -54,6 +68,10 @@ public interface ITwitchPubSub
         /// </summary>
         event EventHandler<OnListenResponseArgs> OnListenResponse;
         /// <summary>
+        /// Fires when PubSub receives notice when the channel detects low trust user.
+        /// </summary>
+        event EventHandler<OnLowTrustUsersArgs> OnLowTrustUsers;
+        /// <summary>
         /// Occurs when [on pub sub service closed].
         /// </summary>
         event EventHandler OnPubSubServiceClosed;
@@ -74,6 +92,10 @@ public interface ITwitchPubSub
         /// </summary>
         event EventHandler<OnR9kBetaOffArgs> OnR9kBetaOff;
         /// <summary>
+        /// Fires when PubSub receives notice when a channel cancels the raid
+        /// </summary>
+        event EventHandler<OnRaidCancelArgs> OnRaidCancel; 
+        /// <summary>
         /// Occurs when [on stream down].
         /// </summary>
         event EventHandler<OnStreamDownArgs> OnStreamDown;
@@ -186,12 +208,6 @@ public interface ITwitchPubSub
         /// </summary>
         Task DisconnectAsync();
 
-        /// <summary>
-        /// Listens to bits events.
-        /// </summary>
-        /// <param name="channelTwitchId">The channel twitch identifier.</param>
-        [Obsolete("This topic is deprecated by Twitch. Please use ListenToBitsEventsV2()", false)]
-        void ListenToBitsEvents(string channelTwitchId);
         /// <summary>
         /// Listens to bits events.
         /// </summary>
@@ -255,6 +271,30 @@ public interface ITwitchPubSub
         /// </summary>
         /// <param name="channelTwitchId">The channel twitch identifier.</param>
         void ListenToPredictions(string channelTwitchId);
+        /// <summary>
+        /// A user’s message held by AutoMod has been approved or denied.
+        /// </summary>
+        /// <param name="myTwitchId">Current user identifier.</param>
+        /// <param name="channelTwitchId">The channel twitch identifier.</param>
+        void ListenToUserModerationNotifications(string myTwitchId, string channelTwitchId);
+        /// <summary>
+        /// Sends a request to listen to Automod queued messages in a specific channel
+        /// </summary>
+        /// <param name="userTwitchId">A moderator's twitch account's ID</param>
+        /// <param name="channelTwitchId">Channel ID who has previous parameter's moderator</param>
+        void ListenToAutomodQueue(string userTwitchId, string channelTwitchId);
+        /// <summary>
+        /// Message sent when a user earns a new Bits badge in a particular channel, and chooses to share the notification with chat.
+        /// </summary>
+        /// <param name="channelTwitchId">The channel twitch identifier.</param>
+        void ListenToChannelBitsBadgeUnlocks(string channelTwitchId);
+        /// <summary>
+        /// The broadcaster or a moderator updates the low trust status of a user, or a new message has been sent in chat by a potential ban evader or a bans shared user.
+        /// </summary>
+        /// <param name="channelTwitchId">The channel twitch identifier.</param>
+        /// <param name="suspiciousUser">Suspicious user identifier.</param>
+        void ListenToLowTrustUsers(string channelTwitchId, string suspiciousUser);
+
         /// <summary>
         /// Sends the topics.
         /// </summary>

TwitchLib.PubSub/Models/Responses/Message.cs

@@ -1,7 +1,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using TwitchLib.PubSub.Models.Responses.Messages;
-using TwitchLib.PubSub.Models.Responses.Messages.AutomodCaughtMessage;
 using TwitchLib.PubSub.Models.Responses.Messages.UserModerationNotifications;
 
 namespace TwitchLib.PubSub.Models.Responses
@@ -41,9 +40,6 @@ public Message(string jsonStr)
                 case "chat_moderator_actions":
                     MessageData = new ChatModeratorActions(encodedJsonMessage);
                     break;
-                case "channel-bits-events-v1":
-                    MessageData = new ChannelBitsEvents(encodedJsonMessage);
-                    break;
                 case "channel-bits-events-v2":
                     encodedJsonMessage = encodedJsonMessage.Replace("\\", "");
                     var dataEncoded = JObject.Parse(encodedJsonMessage)["data"].ToString();
@@ -79,6 +75,14 @@ public Message(string jsonStr)
                 case "predictions-channel-v1":
                     MessageData = new PredictionEvents(encodedJsonMessage);
                     break;
+                case "channel-bits-badge-unlocks":
+                    encodedJsonMessage = encodedJsonMessage.Replace("\\", "");
+                    var channelBitsBadgeData = JObject.Parse(encodedJsonMessage)["data"].ToString();
+                    MessageData = JsonConvert.DeserializeObject<BitsBadgeNotificationMessage>(channelBitsBadgeData);
+                    break;
+                case "low-trust-users":
+                    MessageData = new LowTrustUsers(encodedJsonMessage);
+                    break;
             }
         }
     }

TwitchLib.PubSub/Models/Responses/Messages/BitsBadgeNotificationMessage.cs

@@ -0,0 +1,29 @@
+using System;
+using Newtonsoft.Json;
+
+namespace TwitchLib.PubSub.Models.Responses.Messages
+{
+    public class BitsBadgeNotificationMessage : MessageData
+    {
+        [JsonProperty(PropertyName = "user_id")]
+        public string UserId { get; protected set; }
+
+        [JsonProperty(PropertyName = "user_name")]
+        public string UserName { get; protected set; }
+
+        [JsonProperty(PropertyName = "channel_id")]
+        public string ChannelId { get; protected set; }
+
+        [JsonProperty(PropertyName = "channel_name")]
+        public string ChannelName { get; protected set; }
+
+        [JsonProperty(PropertyName = "badge_tier")]
+        public int BadgeTier { get; protected set; }
+
+        [JsonProperty(PropertyName = "chat_message")]
+        public string ChatMessage { get; protected set; }
+
+        [JsonProperty(PropertyName = "time")]
+        public DateTime Time { get; protected set; }
+    }
+}

TwitchLib.PubSub/Models/Responses/Messages/LowTrustUsers.cs

@@ -0,0 +1,12 @@
+namespace TwitchLib.PubSub.Models.Responses.Messages
+{
+    public class LowTrustUsers : MessageData
+    {
+        public string RawData { get; private set; }
+
+        public LowTrustUsers(string jsonString)
+        {
+            RawData = jsonString;
+        }
+    }
+}

TwitchLib.PubSub/TwitchLib.PubSub.csproj

@@ -25,6 +25,6 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-    <PackageReference Include="TwitchLib.Communication" Version="2.0.0-preview-8108207851b6bbef87062f15a497036183ffea70" />
+    <PackageReference Include="TwitchLib.Communication" Version="2.0.0" />
   </ItemGroup>
 </Project>