Added slave message.

Requests/IRequest.cs

@@ -1,9 +0,0 @@
-namespace HermesSocketLibrary.Requests
-{
-    public interface IRequest
-    {
-        string Name { get; }
-
-        Task<RequestResult> Grant(string sender, IDictionary<string, object>? data);
-    }
-}

Requests/IRequestManager.cs

@@ -1,9 +0,0 @@
-using HermesSocketLibrary.Socket.Data;
-
-namespace HermesSocketLibrary.Requests
-{
-    public interface IRequestManager
-    {
-        Task<RequestResult> Grant(string sender, RequestMessage? message);
-    }
-}

Requests/Messages/EmoteInfo.cs

@@ -2,7 +2,7 @@ namespace HermesSocketLibrary.Requests.Messages
 {
     public class EmoteInfo
     {
-        public string Id { get; set; }
+        public required string Id { get; set; }
-        public string Name { get; set; }
+        public required string Name { get; set; }
     }
 }

Requests/Messages/Group.cs

@@ -2,8 +2,9 @@ namespace HermesSocketLibrary.Requests.Messages
 {
     public class Group
     {
-        public string Id { get; set; }
+        public required string Id { get; set; }
-        public string Name { get; set; }
+        public required string UserId { get; set; }
+        public required string Name { get; set; }
         public int Priority { get; set; }
     }
 }

Requests/Messages/GroupChatter.cs

@@ -2,7 +2,9 @@ namespace HermesSocketLibrary.Requests.Messages
 {
     public class GroupChatter
     {
-        public string GroupId { get; set; }
+        public required string UserId { get; set; }
+        public required string GroupId { get; set; }
         public long ChatterId { get; set;}
+        public required string ChatterLabel { get; set; }
     }
 }

Requests/Messages/GroupInfo.cs

@@ -2,8 +2,8 @@ namespace HermesSocketLibrary.Requests.Messages
 {
     public class GroupInfo
     {
-        public IEnumerable<Group> Groups { get; set; }
+        public required IEnumerable<Group> Groups { get; set; }
-        public IEnumerable<GroupChatter> GroupChatters { get; set; }
+        public required IEnumerable<GroupChatter> GroupChatters { get; set; }
-        public IEnumerable<GroupPermission> GroupPermissions { get; set; }
+        public required IEnumerable<GroupPermission> GroupPermissions { get; set; }
     }
 }

Requests/Messages/GroupPermission.cs

@@ -2,9 +2,10 @@ namespace HermesSocketLibrary.Requests.Messages
 {
     public class GroupPermission
     {
-        public string Id { get; set; }
+        public required string Id { get; set; }
-        public string GroupId { get; set; }
+        public required string UserId { get; set; }
-        public string Path { get; set; }
+        public Guid GroupId { get; set; }
+        public required string Path { get; set; }
         public bool? Allow { get; set; }
     }
 }

Requests/Messages/Policy.cs

@@ -0,0 +1,12 @@
+namespace HermesSocketServer.Messages
+{
+    public class Policy
+    {
+        public Guid Id { get; set; }
+        public required string UserId { get; set; }
+        public Guid GroupId { get; set; }
+        public required string Path { get; set; }
+        public int Usage { get; set; }
+        public int Span { get; set; }
+    }
+}

Requests/Messages/RedeemableAction.cs

@@ -2,8 +2,10 @@ namespace HermesSocketLibrary.Requests.Messages
 {
     public class RedeemableAction
     {
-        public string Name { get; set; }
+        public required string UserId { get; set; }
-        public string Type { get; set; }
+        public required string Name { get; set; }
-        public IDictionary<string, string> Data { get; set; }
+        public required string Type { get; set; }
+        public required bool HasMessage { get; set; }
+        public required IDictionary<string, string> Data { get; set; }
     }
 }

Requests/Messages/Redemption.cs

@@ -2,9 +2,10 @@ namespace HermesSocketLibrary.Requests.Messages
 {
     public class Redemption
     {
-        public string Id { get; set; }
+        public required string Id { get; set; }
-        public string RedemptionId { get; set; }
+        public required string UserId { get; set; }
-        public string ActionName { get; set; }
+        public required string RedemptionId { get; set; }
+        public required string ActionName { get; set; }
         public int Order { get; set; }
         public bool State { get; set; }
     }

Requests/Messages/TTSVoice.cs

@@ -0,0 +1,8 @@
+namespace HermesSocketLibrary.Requests.Messages
+{
+    public class TTSVoice
+    {
+        public required string Id { get; set; }
+        public required string Name { get; set; }
+    }
+}

Requests/Messages/TTSVoiceState.cs

@@ -0,0 +1,9 @@
+namespace HermesSocketLibrary.Requests.Messages
+{
+    public class TTSVoiceState
+    {
+        public required string Id { get; set; }
+        public required string UserId { get; set; }
+        public bool Enabled { get; set; }
+    }
+}

Requests/Messages/TTSWordFilter.cs

@@ -5,17 +5,12 @@ namespace HermesSocketLibrary.Requests.Messages
 {
     public class TTSWordFilter
     {
-        public string? Id { get; set; }
+        public required string Id { get; set; }
-        public string? Search { get; set; }
+        public required string UserId { get; set; }
-        public string? Replace { get; set; }
+        public required string Search { get; set; }
+        public required string Replace { get; set; }
+        public int Flag { get; set; }
         [JsonIgnore]
         public Regex? Regex { get; set; }
-        public bool IsRegex { get; set; }
-
-
-        public TTSWordFilter()
-        {
-            IsRegex = true;
-        }
     }
 }

Requests/Messages/VoiceDetails.cs

@@ -1,8 +0,0 @@
-namespace HermesSocketLibrary.Requests.Messages
-{
-    public class VoiceDetails
-    {
-        public string Id { get; set; }
-        public string Name { get; set; }
-    }
-}

Requests/RequestManager.cs

@@ -1,41 +0,0 @@
-using HermesSocketLibrary.Socket.Data;
-using Serilog;
-
-namespace HermesSocketLibrary.Requests
-{
-    public class RequestManager : IRequestManager
-    {
-        private readonly IDictionary<string, IRequest> _requests;
-        private readonly ILogger _logger;
-
-
-        public RequestManager(IEnumerable<IRequest> requests, ILogger logger)
-        {
-            _logger = logger;
-
-            _requests = requests.ToDictionary(r => r.Name, r => r);
-        }
-
-        public async Task<RequestResult> Grant(string sender, RequestMessage? message)
-        {
-            if (message == null || message.Type == null)
-                return new RequestResult(false, null);
-
-            if (!_requests.TryGetValue(message.Type, out IRequest? request) || request == null)
-            {
-                _logger.Warning($"Did not find request type '{message.Type}'.");
-                return new RequestResult(false, null);
-            }
-
-            try
-            {
-                return await request.Grant(sender, message.Data);
-            }
-            catch (Exception e)
-            {
-                _logger.Error(e, $"Failed to grant a request of type '{message.Type}'.");
-            }
-            return new RequestResult(false, null);
-        }
-    }
-}

Requests/RequestResult.cs

@@ -1,16 +0,0 @@
-namespace HermesSocketLibrary.Requests
-{
-    public class RequestResult
-    {
-        public bool Success;
-        public object? Result;
-        public bool NotifyClientsOnAccount;
-
-        public RequestResult(bool success, object? result, bool notifyClientsOnAccount = true)
-        {
-            Success = success;
-            Result = result;
-            NotifyClientsOnAccount = notifyClientsOnAccount;
-        }
-    }
-}

Socket/Data/ChatterMessage.cs

@@ -2,7 +2,7 @@ namespace HermesSocketLibrary.Socket.Data
 {
     public class ChatterMessage
     {
-        public long Id { get; set; }
+        public required long Id { get; set; }
-        public string Name { get; set; }
+        public required string Name { get; set; }
     }
 }

Socket/Data/Connection.cs

@@ -1,19 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
 namespace HermesSocketLibrary.Socket.Data
 {
     public class Connection
     {
-        public string Name { get; set; }
+        public required string UserId { get; set; }
-        public string Type { get; set; }
+        public required string Name { get; set; }
-        public string ClientId { get; set; }
+        public required string Type { get; set; }
-        public string AccessToken { get; set; }
+        public required string ClientId { get; set; }
-        public string GrantType { get; set; }
+        public required string AccessToken { get; set; }
-        public string Scope { get; set; }
+        public required string GrantType { get; set; }
-        public DateTime ExpiresIn { get; set; }
+        public required string Scope { get; set; }
+        public DateTime ExpiresAt { get; set; }
         public bool Default { get; set; }
     }
 }

Socket/Data/EmoteDetailsMessage.cs

@@ -2,6 +2,6 @@ namespace HermesSocketLibrary.Socket.Data
 {
     public class EmoteDetailsMessage
     {
-        public IDictionary<string, string> Emotes { get; set; }
+        public required IDictionary<string, string> Emotes { get; set; }
     }
 }

Socket/Data/EmoteUsageMessage.cs

@@ -2,10 +2,10 @@ namespace HermesSocketLibrary.Socket.Data
 {
     public class EmoteUsageMessage
     {
-        public string MessageId { get; set; }
+        public required string MessageId { get; set; }
         public DateTime DateTime { get; set; }
         public long BroadcasterId { get; set; }
-        public ICollection<string> Emotes { get; set; }
+        public required ICollection<string> Emotes { get; set; }
         public long ChatterId { get; set; }
     }
 }

Socket/Data/HermesLoginMessage.cs

@@ -2,10 +2,10 @@ namespace HermesSocketLibrary.Socket.Data
 {
     public class HermesLoginMessage
     {
-        public string ApiKey { get; set; }
+        public required string ApiKey { get; set; }
-        public string Password { get; set; }
         public bool WebLogin { get; set; }
-        public int? MajorVersion { get; set; }
+        public int MajorVersion { get; set; }
-        public int? MinorVersion { get; set; }
+        public int MinorVersion { get; set; }
+        public int? PatchVersion { get; set; }
     }
 }

Socket/Data/LoginAckMessage.cs

@@ -1,17 +1,25 @@
+using HermesSocketLibrary.Requests.Messages;
+
 namespace HermesSocketLibrary.Socket.Data
 {
     public class LoginAckMessage
     {
         public string UserId { get; set; }
+        public string ProviderAccountId { get; set; }
+        public string SessionId { get; set; }
+        public string UserName { get; set; }
         public bool AnotherClient { get; set; }
         public long? OwnerId { get; set; }
         public bool Admin { get; set; }
         public bool WebLogin { get; set; }
+        public bool Slave { get; set; }
 
         public string DefaultTTSVoice { get; set; }
-        public IEnumerable<string> EnabledTTSVoices { get; set; }
+        public IList<string> EnabledTTSVoices { get; set; }
         public IDictionary<string, string> TTSVoicesAvailable { get; set; }
 
-        public Connection[] Connections { get; set; }
+        public IEnumerable<TTSWordFilter> WordFilters { get; set; }
+
+        public IList<Connection> Connections { get; set; }
     }
 }

Socket/Data/RequestAckMessage.cs

@@ -5,5 +5,6 @@ namespace HermesSocketLibrary.Socket.Data
         public RequestMessage? Request { get; set; }
         public string? Nounce { get; set; }
         public object? Data { get; set; }
+        public string? Error { get; set; }
     }
 }

Socket/Data/RequestMessage.cs

@@ -2,8 +2,8 @@ namespace HermesSocketLibrary.Socket.Data
 {
     public class RequestMessage
     {
-        public string RequestId { get; set; }
+        public string? RequestId { get; set; }
-        public string? Type { get; set; }
+        public required string Type { get; set; }
         public IDictionary<string, object>? Data { get; set; }
         public string? Nounce { get; set; }
     }

Socket/Data/SlaveMessage.cs

@@ -0,0 +1,7 @@
+namespace HermesSocketLibrary.Socket.Data
+{
+    public class SlaveMessage
+    {
+        public required bool Slave { get; set; }
+    }
+}