Fixed TTS using StreamElements. Fixed several issues.

Bus/ServiceBusCentral.cs

@@ -37,7 +37,7 @@ namespace TwitchChatTTS.Bus
             {
                 if (!_topics.TryGetValue(topic, out var bus))
                 {
-                    bus = new ServiceBusObservable(topic, this);
+                    bus = new ServiceBusObservable(topic, this, _logger);
                     _topics.Add(topic, bus);
                 }
                 return bus;

Bus/ServiceBusObservable.cs

@@ -1,4 +1,5 @@
 using System.Reactive;
+using Serilog;
 
 namespace TwitchChatTTS.Bus
 {
@@ -6,11 +7,13 @@ namespace TwitchChatTTS.Bus
     {
         private readonly string _topic;
         private readonly ServiceBusCentral _central;
+        private readonly ILogger _logger;
 
-        public ServiceBusObservable(string topic, ServiceBusCentral central)
+        public ServiceBusObservable(string topic, ServiceBusCentral central, ILogger logger)
         {
             _topic = topic;
             _central = central;
+            _logger = logger;
         }
 
         protected override IDisposable SubscribeCore(IObserver<ServiceBusData> observer)
@@ -19,6 +22,10 @@ namespace TwitchChatTTS.Bus
             return new ServiceBusUnsubscriber(_topic, _central, observer);
         }
 
+        public IDisposable Subscribe(Action<ServiceBusData> action) {
+            return Subscribe(new ServiceBusObserver(action, _logger));
+        }
+
         private sealed class ServiceBusUnsubscriber : IDisposable
         {
             private readonly string _topic;

Chat/Commands/CommandManager.cs

@@ -14,9 +14,8 @@ namespace TwitchChatTTS.Chat.Commands
     public class CommandManager : ICommandManager
     {
         private readonly User _user;
-        private ICommandSelector _commandSelector;
+        private ICommandSelector? _commandSelector;
         private readonly HermesSocketClient _hermes;
-        //private readonly TwitchWebsocketClient _twitch;
         private readonly IGroupPermissionManager _permissionManager;
         private readonly IUsagePolicy<long> _permissionPolicy;
         private readonly ILogger _logger;
@@ -26,7 +25,6 @@ namespace TwitchChatTTS.Chat.Commands
         public CommandManager(
             User user,
             [FromKeyedServices("hermes")] SocketClient<WebSocketMessage> hermes,
-            //[FromKeyedServices("twitch")] SocketClient<TwitchWebsocketMessage> twitch,
             IGroupPermissionManager permissionManager,
             IUsagePolicy<long> limitManager,
             ILogger logger
@@ -34,7 +32,6 @@ namespace TwitchChatTTS.Chat.Commands
         {
             _user = user;
             _hermes = (hermes as HermesSocketClient)!;
-            //_twitch = (twitch as TwitchWebsocketClient)!;
             _permissionManager = permissionManager;
             _permissionPolicy = limitManager;
             _logger = logger;
@@ -43,7 +40,7 @@ namespace TwitchChatTTS.Chat.Commands
 
         public async Task<ChatCommandResult> Execute(string arg, ChannelChatMessage message, IEnumerable<string> groups)
         {
-            if (string.IsNullOrWhiteSpace(arg))
+            if (string.IsNullOrWhiteSpace(arg) || _commandSelector == null)
                 return ChatCommandResult.Unknown;
 
             arg = arg.Trim();

Chat/Commands/Limits/UsagePolicy.cs

@@ -12,7 +12,7 @@ namespace TwitchChatTTS.Chat.Commands.Limits
         public UsagePolicy(ILogger logger)
         {
             _logger = logger;
-            _root = new UsagePolicyNode<K>(string.Empty, null, null, logger);
+            _root = new UsagePolicyNode<K>(string.Empty, null, null, logger, root: true);
         }
 
 
@@ -102,111 +102,162 @@ namespace TwitchChatTTS.Chat.Commands.Limits
             private IDictionary<T, UserUsageData> _usages { get; }
             private IList<UsagePolicyNode<T>> _children { get; }
             private ILogger _logger;
-            private object _lock { get; }
+            private ReaderWriterLockSlim _rwls { get; }
 
-            public UsagePolicyNode(string name, UsagePolicyLimit? data, UsagePolicyNode<T>? parent, ILogger logger)
+            public UsagePolicyNode(string name, UsagePolicyLimit? data, UsagePolicyNode<T>? parent, ILogger logger, bool root = false)
             {
-                //ArgumentException.ThrowIfNullOrWhiteSpace(name, nameof(name));
+                if (!root)
+                    ArgumentException.ThrowIfNullOrWhiteSpace(name, nameof(name));
                 Name = name;
                 Limit = data;
                 _parent = parent;
                 _usages = new Dictionary<T, UserUsageData>();
                 _children = new List<UsagePolicyNode<T>>();
                 _logger = logger;
-                _lock = new object();
+                _rwls = new ReaderWriterLockSlim();
             }
 
 
             public UsagePolicyNode<T>? Get(IEnumerable<string> path)
             {
-                if (!path.Any())
+                _rwls.EnterReadLock();
-                    return this;
+                try
+                {
+                    if (!path.Any())
+                        return this;
 
-                var nextName = path.First();
+                    var nextName = path.First();
-                var next = _children.FirstOrDefault(c => c.Name == nextName);
+                    var next = _children.FirstOrDefault(c => c.Name == nextName);
-                if (next == null)
+                    if (next == null)
-                    return this;
+                        return this;
-                return next.Get(path.Skip(1));
+                    return next.Get(path.Skip(1));
+                }
+                finally
+                {
+                    _rwls.ExitReadLock();
+                }
             }
 
             public UsagePolicyNode<T>? Remove(IEnumerable<string> path)
             {
-                if (!path.Any())
+                _rwls.EnterWriteLock();
+                try
                 {
-                    if (_parent == null)
+                    if (!path.Any())
-                        throw new InvalidOperationException("Cannot remove root node");
+                    {
+                        if (_parent == null)
+                            throw new InvalidOperationException("Cannot remove root node");
 
-                    _parent._children.Remove(this);
+                        _parent._children.Remove(this);
-                    return this;
+                        return this;
+                    }
+
+                    var nextName = path.First();
+                    var next = _children.FirstOrDefault(c => c.Name == nextName);
+                    _logger.Debug($"internal remove node [is null: {next == null}][path: {string.Join('.', path)}]");
+                    if (next == null)
+                        return null;
+                    return next.Remove(path.Skip(1));
+                }
+                finally
+                {
+                    _rwls.ExitWriteLock();
                 }
-
-                var nextName = path.First();
-                var next = _children.FirstOrDefault(c => c.Name == nextName);
-                _logger.Debug($"internal remove node [is null: {next == null}][path: {string.Join('.', path)}]");
-                if (next == null)
-                    return null;
-                return next.Remove(path.Skip(1));
             }
 
             public void Set(IEnumerable<string> path, int count, TimeSpan span)
             {
-                if (!path.Any())
+                _rwls.EnterWriteLock();
+                try
                 {
-                    Limit = new UsagePolicyLimit(count, span);
+                    if (!path.Any())
-                    return;
+                    {
-                }
+                        Limit = new UsagePolicyLimit(count, span);
+                        return;
+                    }
 
-                var nextName = path.First();
+                    var nextName = path.First();
-                var next = _children.FirstOrDefault(c => c.Name == nextName);
+                    var next = _children.FirstOrDefault(c => c.Name == nextName);
-                _logger.Debug($"internal set node [is null: {next == null}][path: {string.Join('.', path)}]");
+                    _logger.Debug($"internal set node [is null: {next == null}][path: {string.Join('.', path)}]");
-                if (next == null)
+                    if (next == null)
-                {
+                    {
-                    next = new UsagePolicyNode<T>(nextName, null, this, _logger);
+                        next = new UsagePolicyNode<T>(nextName, null, this, _logger);
-                    _children.Add(next);
+                        _children.Add(next);
+                    }
+                    next.Set(path.Skip(1), count, span);
+                }
+                finally
+                {
+                    _rwls.ExitWriteLock();
                 }
-                next.Set(path.Skip(1), count, span);
             }
 
             public bool TryUse(T key, DateTime timestamp)
             {
-                if (_parent == null)
+                _rwls.EnterUpgradeableReadLock();
-                    return false;
+                try
-                if (Limit == null || Limit.Count <= 0)
-                    return _parent.TryUse(key, timestamp);
-
-                UserUsageData? usage;
-                lock (_lock)
                 {
+                    if (_parent == null)
+                        return false;
+                    if (Limit == null || Limit.Count <= 0)
+                        return _parent.TryUse(key, timestamp);
+
+                    UserUsageData? usage;
                     if (!_usages.TryGetValue(key, out usage))
                     {
-                        usage = new UserUsageData(Limit.Count, 1 % Limit.Count);
+                        _rwls.EnterWriteLock();
-                        usage.Uses[0] = timestamp;
+                        try
-                        _usages.Add(key, usage);
+                        {
+                            usage = new UserUsageData(Limit.Count, 1 % Limit.Count);
+                            usage.Uses[0] = timestamp;
+                            _usages.Add(key, usage);
+                        }
+                        finally
+                        {
+                            _rwls.ExitWriteLock();
+                        }
                         _logger.Debug($"internal use node create");
                         return true;
                     }
 
                     if (usage.Uses.Length != Limit.Count)
                     {
-                        var sizeDiff = Math.Max(0, usage.Uses.Length - Limit.Count);
+                        _rwls.EnterWriteLock();
-                        var temp = usage.Uses.Skip(sizeDiff);
+                        try
-                        var tempSize = usage.Uses.Length - sizeDiff;
+                        {
-                        usage.Uses = temp.Union(new DateTime[Math.Max(0, Limit.Count - tempSize)]).ToArray();
+                            var sizeDiff = Math.Max(0, usage.Uses.Length - Limit.Count);
+                            var temp = usage.Uses.Skip(sizeDiff);
+                            var tempSize = usage.Uses.Length - sizeDiff;
+                            usage.Uses = temp.Union(new DateTime[Math.Max(0, Limit.Count - tempSize)]).ToArray();
+                        }
+                        finally
+                        {
+                            _rwls.ExitWriteLock();
+                        }
+                    }
+
+                    // Attempt on parent node if policy has been abused.
+                    if (timestamp - usage.Uses[usage.Index] < Limit.Span)
+                    {
+                        _logger.Debug($"internal use node spam [span: {(timestamp - usage.Uses[usage.Index]).TotalMilliseconds}][index: {usage.Index}]");
+                        return _parent.TryUse(key, timestamp);
+                    }
+
+                    _logger.Debug($"internal use node normal [span: {(timestamp - usage.Uses[usage.Index]).TotalMilliseconds}][index: {usage.Index}]");
+                    _rwls.EnterWriteLock();
+                    try
+                    {
+                        usage.Uses[usage.Index] = timestamp;
+                        usage.Index = (usage.Index + 1) % Limit.Count;
+                    }
+                    finally
+                    {
+                        _rwls.ExitWriteLock();
                     }
                 }
-
+                finally
-                // Attempt on parent node if policy has been abused.
-                if (timestamp - usage.Uses[usage.Index] < Limit.Span)
                 {
-                    _logger.Debug($"internal use node spam [span: {(timestamp - usage.Uses[usage.Index]).TotalMilliseconds}][index: {usage.Index}]");
+                    _rwls.ExitUpgradeableReadLock();
-                    return _parent.TryUse(key, timestamp);
-                }
-
-                _logger.Debug($"internal use node normal [span: {(timestamp - usage.Uses[usage.Index]).TotalMilliseconds}][index: {usage.Index}]");
-                lock (_lock)
-                {
-                    usage.Uses[usage.Index] = timestamp;
-                    usage.Index = (usage.Index + 1) % Limit.Count;
                 }
 
                 return true;

Chat/Commands/VersionCommand.cs

@@ -1,7 +1,6 @@
 using HermesSocketLibrary.Socket.Data;
 using Serilog;
 using TwitchChatTTS.Hermes.Socket;
-using TwitchChatTTS.Twitch.Socket;
 using TwitchChatTTS.Twitch.Socket.Messages;
 using static TwitchChatTTS.Chat.Commands.TTSCommands;
 
@@ -40,9 +39,9 @@ namespace TwitchChatTTS.Chat.Commands
 
             public async Task Execute(IDictionary<string, string> values, ChannelChatMessage message, HermesSocketClient hermes)
             {
-                _logger.Information($"TTS Version: {TTS.MAJOR_VERSION}.{TTS.MINOR_VERSION}");
+                _logger.Information($"TTS Version: {TTS.MAJOR_VERSION}.{TTS.MINOR_VERSION}.{TTS.PATCH_VERSION}");
 
-                await hermes.SendLoggingMessage(HermesLoggingLevel.Info, $"{_user.TwitchUsername} [twitch id: {_user.TwitchUserId}] using version {TTS.MAJOR_VERSION}.{TTS.MINOR_VERSION}.");
+                await hermes.SendLoggingMessage(HermesLoggingLevel.Info, $"{_user.TwitchUsername} [twitch id: {_user.TwitchUserId}] using version {TTS.MAJOR_VERSION}.{TTS.MINOR_VERSION}.{TTS.PATCH_VERSION}.");
             }
         }
     }

Chat/Emotes/EmoteDatabase.cs

@@ -3,7 +3,6 @@ namespace TwitchChatTTS.Chat.Emotes
     public class EmoteDatabase : IEmoteDatabase
     {
         private readonly IDictionary<string, string> _emotes;
-        public IDictionary<string, string> Emotes { get => _emotes.AsReadOnly(); }
 
         public EmoteDatabase()
         {
@@ -36,20 +35,20 @@ namespace TwitchChatTTS.Chat.Emotes
 
     public class EmoteSet
     {
-        public string Id { get; set; }
+        public required string Id { get; set; }
-        public string Name { get; set; }
+        public required string Name { get; set; }
         public int Flags { get; set; }
         public bool Immutable { get; set; }
         public bool Privileged { get; set; }
-        public IList<Emote> Emotes { get; set; }
+        public required IList<Emote> Emotes { get; set; }
         public int EmoteCount { get; set; }
         public int Capacity { get; set; }
     }
 
     public class Emote
     {
-        public string Id { get; set; }
+        public required string Id { get; set; }
-        public string Name { get; set; }
+        public required string Name { get; set; }
         public int Flags { get; set; }
     }
 }

Chat/Groups/ChatterGroupManager.cs

@@ -1,5 +1,3 @@
-
-using System.Collections.Concurrent;
 using HermesSocketLibrary.Requests.Messages;
 using Serilog;
 
@@ -9,84 +7,199 @@ namespace TwitchChatTTS.Chat.Groups
     {
         private readonly IDictionary<string, Group> _groups;
         private readonly IDictionary<long, ICollection<string>> _chatters;
+        private readonly ReaderWriterLockSlim _rwls;
         private readonly ILogger _logger;
 
 
         public ChatterGroupManager(ILogger logger)
         {
             _logger = logger;
-            _groups = new ConcurrentDictionary<string, Group>();
+            _groups = new Dictionary<string, Group>();
-            _chatters = new ConcurrentDictionary<long, ICollection<string>>();
+            _chatters = new Dictionary<long, ICollection<string>>();
+            _rwls = new ReaderWriterLockSlim();
         }
 
         public void Add(Group group)
         {
-            _groups.Add(group.Name, group);
+            _rwls.EnterWriteLock();
-        }
+            try
-
-        public void Add(long chatter, string groupName)
-        {
-            _chatters.Add(chatter, new List<string>() { groupName });
-        }
-
-        public void Add(long chatter, ICollection<string> groupNames)
-        {
-            if (_chatters.TryGetValue(chatter, out var list))
             {
-                foreach (var group in groupNames)
+                _groups.Add(group.Id, group);
-                    list.Add(group);
+            }
+            finally
+            {
+                _rwls.ExitWriteLock();
+            }
+        }
+
+        public void Add(long chatterId, string groupId)
+        {
+            _rwls.EnterWriteLock();
+            try
+            {
+                if (_chatters.TryGetValue(chatterId, out var list))
+                {
+                    if (!list.Contains(groupId))
+                        list.Add(groupId);
+                }
+                else
+                    _chatters.Add(chatterId, new List<string>() { groupId });
+            }
+            finally
+            {
+                _rwls.ExitWriteLock();
+            }
+        }
+
+        public void Add(long chatter, ICollection<string> groupIds)
+        {
+            _rwls.EnterWriteLock();
+            try
+            {
+                if (_chatters.TryGetValue(chatter, out var list))
+                {
+                    foreach (var groupId in groupIds)
+                        if (!list.Contains(groupId))
+                            list.Add(groupId);
+                }
+                else
+                    _chatters.Add(chatter, groupIds);
+            }
+            finally
+            {
+                _rwls.ExitWriteLock();
             }
-            else
-                _chatters.Add(chatter, groupNames);
         }
 
         public void Clear()
         {
-            _groups.Clear();
+            _rwls.EnterWriteLock();
-            _chatters.Clear();
+            try
+            {
+                _groups.Clear();
+                _chatters.Clear();
+            }
+            finally
+            {
+                _rwls.ExitWriteLock();
+            }
         }
 
-        public Group? Get(string groupName)
+        public Group? Get(string groupId)
         {
-            if (_groups.TryGetValue(groupName, out var group))
+            _rwls.EnterReadLock();
-                return group;
+            try
-            return null;
+            {
+                if (_groups.TryGetValue(groupId, out var group))
+                    return group;
+                return null;
+            }
+            finally
+            {
+                _rwls.ExitReadLock();
+            }
         }
 
         public IEnumerable<string> GetGroupNamesFor(long chatter)
         {
-            if (_chatters.TryGetValue(chatter, out var groups))
+            _rwls.EnterReadLock();
-                return groups.Select(g => _groups[g].Name);
+            try
+            {
+                if (_chatters.TryGetValue(chatter, out var groups))
+                    return groups.Select(g => _groups.TryGetValue(g, out var group) ? group.Name : null)
+                        .Where(g => g != null)
+                        .Cast<string>();
 
-            return Array.Empty<string>();
+                return Array.Empty<string>();
+            }
+            finally
+            {
+                _rwls.ExitReadLock();
+            }
         }
 
         public int GetPriorityFor(long chatter)
         {
-            if (!_chatters.TryGetValue(chatter, out var groups))
+            _rwls.EnterReadLock();
-                return 0;
+            try
+            {
+                if (!_chatters.TryGetValue(chatter, out var groups))
+                    return 0;
 
-            return GetPriorityFor(groups);
+                return GetPriorityFor(groups);
+            }
+            finally
+            {
+                _rwls.ExitReadLock();
+            }
         }
 
-        public int GetPriorityFor(IEnumerable<string> groupNames)
+        public int GetPriorityFor(IEnumerable<string> groupIds)
         {
-            var values = groupNames.Select(g => _groups.TryGetValue(g, out var group) ? group : null).Where(g => g != null);
+            _rwls.EnterReadLock();
-            if (values.Any())
+            try
-                return values.Max(g => g!.Priority);
+            {
-            return 0;
+                var values = groupIds.Select(g => _groups.TryGetValue(g, out var group) ? group : null).Where(g => g != null);
+                if (values.Any())
+                    return values.Max(g => g!.Priority);
+                return 0;
+            }
+            finally
+            {
+                _rwls.ExitReadLock();
+            }
+        }
+
+        public void Modify(Group group)
+        {
+            _rwls.EnterWriteLock();
+            try
+            {
+                _groups[group.Id] = group;
+            }
+            finally
+            {
+                _rwls.ExitWriteLock();
+            }
+        }
+
+        public bool Remove(string groupId)
+        {
+            _rwls.EnterWriteLock();
+            try
+            {
+                if (_groups.Remove(groupId))
+                {
+                    foreach (var entry in _chatters)
+                        entry.Value.Remove(groupId);
+                    return true;
+                }
+                return false;
+            }
+            finally
+            {
+                _rwls.ExitReadLock();
+            }
         }
 
         public bool Remove(long chatterId, string groupId)
         {
-            if (_chatters.TryGetValue(chatterId, out var groups))
+            _rwls.EnterWriteLock();
+            try
             {
-                groups.Remove(groupId);
+                if (_chatters.TryGetValue(chatterId, out var groups))
-                _logger.Debug($"Removed chatter from group [chatter id: {chatterId}][group name: {_groups[groupId]}][group id: {groupId}]");
+                {
-                return true;
+                    groups.Remove(groupId);
+                    _logger.Debug($"Removed chatter from group [chatter id: {chatterId}][group name: {_groups[groupId].Name}][group id: {groupId}]");
+                    return true;
+                }
+                _logger.Debug($"Failed to remove chatter from group [chatter id: {chatterId}][group name: {_groups[groupId].Name}][group id: {groupId}]");
+                return false;
+            }
+            finally
+            {
+                _rwls.ExitReadLock();
             }
-            _logger.Debug($"Failed to remove chatter from group [chatter id: {chatterId}][group name: {_groups[groupId]}][group id: {groupId}]");
-            return false;
         }
     }
 }

Chat/Groups/IChatterGroupManager.cs

@@ -12,6 +12,8 @@ namespace TwitchChatTTS.Chat.Groups
         IEnumerable<string> GetGroupNamesFor(long chatter);
         int GetPriorityFor(long chatter);
         int GetPriorityFor(IEnumerable<string> groupIds);
+        void Modify(Group group);
+        bool Remove(string groupId);
         bool Remove(long chatter, string groupId);
     }
 }

Chat/Groups/Permissions/GroupPermissionManager.cs

@@ -5,33 +5,51 @@ namespace TwitchChatTTS.Chat.Groups.Permissions
 {
     public class GroupPermissionManager : IGroupPermissionManager
     {
-        private PermissionNode _root;
+        private readonly PermissionNode _root;
-        private ILogger _logger;
+        private readonly ILogger _logger;
+        private readonly ReaderWriterLockSlim _rwls;
 
 
         public GroupPermissionManager(ILogger logger)
         {
             _logger = logger;
             _root = new PermissionNode(string.Empty, null, null);
+            _rwls = new ReaderWriterLockSlim();
         }
 
 
         public bool? CheckIfAllowed(string path)
         {
-            var res = Get(path)!.Allow;
+            _rwls.EnterReadLock();
-            _logger.Debug($"Permission Node GET {path} = {res?.ToString() ?? "null"}");
+            try
-            return res;
+            {
+                var res = Get(path)!.Allow;
+                _logger.Debug($"Permission Node GET {path} = {res?.ToString() ?? "null"}");
+                return res;
+            }
+            finally
+            {
+                _rwls.ExitReadLock();
+            }
         }
 
         public bool? CheckIfDirectAllowed(string path)
         {
-            var node = Get(path, nullIfMissing: true);
+            _rwls.EnterReadLock();
-            if (node == null)
+            try
-                return null;
+            {
-            
+                var node = Get(path, nullIfMissing: true);
-            var res = node.DirectAllow;
+                if (node == null)
-            _logger.Debug($"Permission Node GET {path} = {res?.ToString() ?? "null"} [direct]");
+                    return null;
-            return res;
+
+                var res = node.DirectAllow;
+                _logger.Debug($"Permission Node GET {path} = {res?.ToString() ?? "null"} [direct]");
+                return res;
+            }
+            finally
+            {
+                _rwls.ExitReadLock();
+            }
         }
 
         public bool? CheckIfAllowed(IEnumerable<string> groups, string path)
@@ -64,31 +82,63 @@ namespace TwitchChatTTS.Chat.Groups.Permissions
 
         public void Clear()
         {
-            _root.Clear();
+            _rwls.EnterWriteLock();
+            try
+            {
+                _root.Clear();
+            }
+            finally
+            {
+                _rwls.ExitWriteLock();
+            }
         }
 
         public bool Remove(string path)
         {
-            var node = Get(path);
+            _rwls.EnterUpgradeableReadLock();
-            if (node == null || node.Parent == null)
+            try
-                return false;
-
-            var parts = path.Split('.');
-            var last = parts.Last();
-            if (parts.Length > 1 && parts[parts.Length - 1] == node.Parent.Name || parts.Length == 1 && node.Parent.Name == null)
             {
-                node.Parent.Remove(last);
+                var node = Get(path);
-                _logger.Debug($"Permission Node REMOVE priv {path}");
+                if (node == null || node.Parent == null)
-                return true;
+                    return false;
+
+                _rwls.EnterWriteLock();
+                try
+                {
+                    var parts = path.Split('.');
+                    var last = parts.Last();
+                    if (parts.Length > 1 && parts[parts.Length - 1] == node.Parent.Name || parts.Length == 1 && node.Parent.Name == null)
+                    {
+                        node.Parent.Remove(last);
+                        _logger.Debug($"Permission Node REMOVE priv {path}");
+                        return true;
+                    }
+                    return false;
+                }
+                finally
+                {
+                    _rwls.ExitWriteLock();
+                }
+            }
+            finally
+            {
+                _rwls.ExitUpgradeableReadLock();
             }
-            return false;
         }
 
         public void Set(string path, bool? allow)
         {
-            var node = Get(path, true);
+            _rwls.EnterWriteLock();
-            node!.Allow = allow;
+            try
-            _logger.Debug($"Permission Node ADD {path} = {allow?.ToString() ?? "null"}");
+            {
+                var node = Get(path, true);
+                node!.Allow = allow;
+                _logger.Debug($"Permission Node ADD {path} = {allow?.ToString() ?? "null"}");
+            }
+            finally
+            {
+                _rwls.ExitWriteLock();
+            }
         }
 
         private PermissionNode? Get(string path, bool edit = false, bool nullIfMissing = false)

Chat/Messaging/ChatMessageReader.cs

@@ -62,15 +62,15 @@ namespace TwitchChatTTS.Chat.Messaging
 
             var emoteUsage = GetEmoteUsage(fragments);
             var tasks = new List<Task>();
-            if (_obs.Streaming && _configuration.Twitch?.Slave != true)
+            if ((!_obs.Connected || _obs.Streaming) && !_user.Slave)
             {
                 if (emoteUsage.NewEmotes.Any())
                     tasks.Add(_hermes.SendEmoteDetails(emoteUsage.NewEmotes));
                 if (emoteUsage.EmotesUsed.Any() && messageId != null && chatterId != null)
                     tasks.Add(_hermes.SendEmoteUsage(messageId, chatterId.Value, emoteUsage.EmotesUsed));
-                if (!string.IsNullOrEmpty(chatterLogin) && chatterId != null && !_user.Chatters.Contains(chatterId.Value))
+                if (chatterId.HasValue && !_user.Chatters.Contains(chatterId.Value))
                 {
-                    tasks.Add(_hermes.SendChatterDetails(chatterId.Value, chatterLogin));
+                    tasks.Add(_hermes.SendChatterDetails(chatterId.Value, chatterLogin!));
                     _user.Chatters.Add(chatterId.Value);
                 }
             }
@@ -84,6 +84,7 @@ namespace TwitchChatTTS.Chat.Messaging
             var msg = FilterMessage(fragments, reply);
             string voiceSelected = chatterId == null ? _user.DefaultTTSVoice : GetSelectedVoiceFor(chatterId.Value);
             var messages = GetPartialTTSMessages(msg, voiceSelected).ToList();
+            _logger.Debug("TTS messages separated as: " + string.Join(" || ", messages.Select(m => m.Message ?? "<" + m.File + ">")));
             var groupedMessage = new TTSGroupedMessage(broadcasterId, chatterId, messageId, messages, DateTime.UtcNow, priority);
             _player.Add(groupedMessage, groupedMessage.Priority);
 
@@ -223,7 +224,7 @@ namespace TwitchChatTTS.Chat.Messaging
                 }];
             }
 
-            return matches.Cast<Match>().SelectMany(match =>
+            var messages = matches.Cast<Match>().SelectMany(match =>
             {
                 var m = match.Groups["message"].Value;
                 if (string.IsNullOrWhiteSpace(m))
@@ -233,6 +234,13 @@ namespace TwitchChatTTS.Chat.Messaging
                 voiceSelected = voiceSelected[0].ToString().ToUpper() + voiceSelected.Substring(1).ToLower();
                 return HandlePartialMessage(voiceSelected, m);
             });
+            string beforeMatch = message.Substring(0, matches.First().Index);
+            if (!string.IsNullOrEmpty(beforeMatch))
+                messages = HandlePartialMessage(defaultVoice, beforeMatch).Union(messages);
+
+            _logger.Debug("TTS message matches: " + string.Join(" || ", matches.Select(m => "(" + m.Length + " / " + m.Index + "): " + m.Value + " ")));
+
+            return messages;
         }
 
         private string GetSelectedVoiceFor(long chatterId)

Configuration.cs

@@ -15,7 +15,6 @@ namespace TwitchChatTTS
 
         public class TwitchConfiguration {
             public bool TtsWhenOffline;
-            public bool Slave;
             public string? WebsocketUrl;
             public string? ApiUrl;
         }

Hermes/Account.cs

@@ -1,6 +0,0 @@
-public class Account {
-  public string Id { get; set; }
-  public string Username { get; set; }
-  public string Role { get; set; }
-  public string BroadcasterId { get; set; }
-}

Hermes/HermesApiClient.cs

@@ -31,15 +31,4 @@ public class HermesApiClient
     {
         return await _web.GetJson<TTSVersion>($"https://{BASE_URL}/api/info/version");
     }
-
-    public async Task<Account> FetchHermesAccountDetails()
-    {
-        var account = await _web.GetJson<Account>($"https://{BASE_URL}/api/account", new JsonSerializerOptions()
-        {
-            PropertyNamingPolicy = JsonNamingPolicy.CamelCase
-        });
-        if (account == null || account.Id == null || account.Username == null)
-            throw new NullReferenceException("Invalid value found while fetching for hermes account data.");
-        return account;
-    }
 }

Hermes/Socket/Handlers/LoggingHandler.cs

@@ -0,0 +1,45 @@
+using CommonSocketLibrary.Abstract;
+using CommonSocketLibrary.Common;
+using HermesSocketLibrary.Socket.Data;
+using Serilog;
+
+namespace TwitchChatTTS.Hermes.Socket.Handlers
+{
+    public class LoggingHandler : IWebSocketHandler
+    {
+        private readonly ILogger _logger;
+        public int OperationCode { get; } = 5;
+
+        public LoggingHandler(ILogger logger)
+        {
+            _logger = logger;
+        }
+
+        public Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data data)
+        {
+            if (data is not LoggingMessage message || message == null)
+                return Task.CompletedTask;
+            
+            Action<Exception?, string> logging;
+            if (message.Level == HermesLoggingLevel.Trace)
+                logging = _logger.Verbose;
+            else if (message.Level == HermesLoggingLevel.Debug)
+                logging = _logger.Debug;
+            else if (message.Level == HermesLoggingLevel.Info)
+                logging = _logger.Information;
+            else if (message.Level == HermesLoggingLevel.Warn)
+                logging = _logger.Warning;
+            else if (message.Level == HermesLoggingLevel.Error)
+                logging = _logger.Error;
+            else if (message.Level == HermesLoggingLevel.Critical)
+                logging = _logger.Fatal;
+            else {
+                _logger.Warning("Failed to receive a logging level from client.");
+                return Task.CompletedTask;
+            }
+            
+            logging.Invoke(message.Exception, message.Message);
+            return Task.CompletedTask;
+        }
+    }
+}

Hermes/Socket/Handlers/LoginAckHandler.cs

@@ -1,8 +1,10 @@
+using System.Collections.Concurrent;
 using System.Text.RegularExpressions;
 using CommonSocketLibrary.Abstract;
 using CommonSocketLibrary.Common;
 using HermesSocketLibrary.Socket.Data;
 using Serilog;
+using TwitchChatTTS.Bus;
 
 namespace TwitchChatTTS.Hermes.Socket.Handlers
 {
@@ -10,13 +12,15 @@ namespace TwitchChatTTS.Hermes.Socket.Handlers
     {
         private readonly User _user;
         private readonly NightbotApiClient _nightbot;
+        private readonly ServiceBusCentral _bus;
         private readonly ILogger _logger;
         public int OperationCode { get; } = 2;
 
-        public LoginAckHandler(User user, NightbotApiClient nightbot, ILogger logger)
+        public LoginAckHandler(User user, NightbotApiClient nightbot, ServiceBusCentral bus, ILogger logger)
         {
             _user = user;
             _nightbot = nightbot;
+            _bus = bus;
             _logger = logger;
         }
 
@@ -29,8 +33,7 @@ namespace TwitchChatTTS.Hermes.Socket.Handlers
 
             if (message.AnotherClient)
             {
-                if (client.LoggedIn)
+                _logger.Warning($"Another client has connected to the same account via {(message.WebLogin ? "web login" : "application")}.");
-                    _logger.Warning($"Another client has connected to the same account via {(message.WebLogin ? "web login" : "application")}.");
                 return;
             }
             if (client.LoggedIn)
@@ -39,24 +42,38 @@ namespace TwitchChatTTS.Hermes.Socket.Handlers
                 return;
             }
 
-            _user.HermesUserId = message.UserId;
+            _user.Slave = message.Slave;
-            _user.OwnerId = message.OwnerId;
+            _logger.Information(_user.Slave ? "This client is not responsible for reacting to chat messages." : "This client is responsible for reacting to chat messages.");
-            _user.DefaultTTSVoice = message.DefaultTTSVoice;
-            _user.VoicesAvailable = message.TTSVoicesAvailable;
-            _user.VoicesEnabled = new HashSet<string>(message.EnabledTTSVoices);
-            _user.TwitchConnection = message.Connections.FirstOrDefault(c => c.Default && c.Type == "twitch");
-            _user.NightbotConnection = message.Connections.FirstOrDefault(c => c.Default && c.Type == "nightbot");
 
-            var filters = message.WordFilters.Where(f => f.Search != null && f.Replace != null).ToArray();
+            _user.HermesUserId = message.UserId;
+            _user.HermesUsername = message.UserName;
+            _user.TwitchUsername = message.UserName;
+            _user.TwitchUserId = long.Parse(message.ProviderAccountId);
+            _user.OwnerId = message.OwnerId;
+            _user.StreamElementsOverlayKey = message.StreamElementsOverlayKey;
+            _user.DefaultTTSVoice = message.DefaultTTSVoice;
+            _user.VoicesAvailable = new ConcurrentDictionary<string, string>(message.TTSVoicesAvailable);
+            _user.VoicesEnabled = new HashSet<string>(message.EnabledTTSVoices);
+            _user.TwitchConnection = message.Connections.FirstOrDefault(c => c.Default && c.Type == "twitch") ?? message.Connections.FirstOrDefault(c => c.Type == "twitch");
+            _user.NightbotConnection = message.Connections.FirstOrDefault(c => c.Default && c.Type == "nightbot") ?? message.Connections.FirstOrDefault(c => c.Type == "nightbot");
+            if (_user.TwitchConnection != null)
+            {
+                _logger.Debug("Twitch connection: " + _user.TwitchConnection.Name + " / " + _user.TwitchConnection.AccessToken);
+            }
+
+            var filters = message.WordFilters.Where(f => f.Search != null && f.Replace != null).ToList();
             foreach (var filter in filters)
             {
                 try
                 {
-                    var re = new Regex(filter.Search!, RegexOptions.Compiled);
+                    var re = new Regex(filter.Search, ((RegexOptions)filter.Flag) | RegexOptions.Compiled);
                     re.Match(string.Empty);
                     filter.Regex = re;
                 }
-                catch (Exception) { }
+                catch (Exception)
+                {
+                    _logger.Warning($"Failed to create a regular expression for a TTS filter [filter id: {filter.Search}]");
+                }
             }
             _user.RegexFilters = filters;
 
@@ -85,6 +102,8 @@ namespace TwitchChatTTS.Hermes.Socket.Handlers
 
             _logger.Information("TTS is now ready.");
             client.Ready = true;
+
+            _bus.Send(this, "tts_connected", _user);
         }
     }
 }

Hermes/Socket/Handlers/SlaveHandler.cs

@@ -0,0 +1,30 @@
+using CommonSocketLibrary.Abstract;
+using CommonSocketLibrary.Common;
+using HermesSocketLibrary.Socket.Data;
+using Serilog;
+
+namespace TwitchChatTTS.Hermes.Socket.Handlers
+{
+    public class SlaveHandler : IWebSocketHandler
+    {
+        private readonly User _user;
+        private readonly ILogger _logger;
+        public int OperationCode { get; } = 9;
+
+        public SlaveHandler(User user, ILogger logger)
+        {
+            _user = user;
+            _logger = logger;
+        }
+
+        public Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data data)
+        {
+            if (data is not SlaveMessage message || message == null)
+                return Task.CompletedTask;
+
+            _user.Slave = message.Slave;
+            _logger.Information(_user.Slave ? "Total chat message ownership was revoked." : "This client is now responsible for reacting to chat messages. Potential chat messages were missed while changing ownership.");
+            return Task.CompletedTask;
+        }
+    }
+}

Hermes/Socket/HermesSocketClient.cs

@@ -1,4 +1,3 @@
-using System.Net.WebSockets;
 using System.Text.Json;
 using System.Timers;
 using CommonSocketLibrary.Abstract;
@@ -9,6 +8,7 @@ using HermesSocketLibrary.Requests.Messages;
 using HermesSocketLibrary.Socket.Data;
 using Microsoft.Extensions.DependencyInjection;
 using Serilog;
+using TwitchChatTTS.Bus;
 using TwitchChatTTS.Hermes.Socket.Handlers;
 
 namespace TwitchChatTTS.Hermes.Socket
@@ -19,6 +19,7 @@ namespace TwitchChatTTS.Hermes.Socket
 
         private readonly User _user;
         private readonly Configuration _configuration;
+        private readonly ServiceBusCentral _bus;
         private readonly ICallbackManager<HermesRequestData> _callbackManager;
         private string URL;
 
@@ -27,16 +28,18 @@ namespace TwitchChatTTS.Hermes.Socket
         public string? UserId { get; set; }
         private readonly System.Timers.Timer _heartbeatTimer;
         private readonly IBackoff _backoff;
-        private readonly object _lock;
+        private readonly ReaderWriterLockSlim _rwls;
 
         public bool Connected { get; set; }
         public bool LoggedIn { get; set; }
         public bool Ready { get; set; }
 
 
+
         public HermesSocketClient(
             User user,
             Configuration configuration,
+            ServiceBusCentral bus,
             ICallbackManager<HermesRequestData> callbackManager,
             [FromKeyedServices("hermes")] IBackoff backoff,
             [FromKeyedServices("hermes")] IEnumerable<IWebSocketHandler> handlers,
@@ -50,6 +53,7 @@ namespace TwitchChatTTS.Hermes.Socket
         {
             _user = user;
             _configuration = configuration;
+            _bus = bus;
             _callbackManager = callbackManager;
             _backoff = backoff;
             _heartbeatTimer = new System.Timers.Timer(TimeSpan.FromSeconds(15));
@@ -58,29 +62,54 @@ namespace TwitchChatTTS.Hermes.Socket
             LastHeartbeatReceived = LastHeartbeatSent = DateTime.UtcNow;
             URL = $"wss://{BASE_URL}";
 
-            _lock = new object();
+            _rwls = new ReaderWriterLockSlim();
+
+            var ttsCreateUserVoice = _bus.GetTopic("tts.user.voice.create");
+            ttsCreateUserVoice.Subscribe(async data => await Send(3, new RequestMessage()
+            {
+                Type = "create_tts_user",
+                Data = (IDictionary<string, object>)data.Value!
+            }));
+
+            var ttsUpdateUserVoice = _bus.GetTopic("tts.user.voice.update");
+            ttsUpdateUserVoice.Subscribe(async data => await Send(3, new RequestMessage()
+            {
+                Type = "update_tts_user",
+                Data = (IDictionary<string, object>)data.Value!
+            }));
         }
 
 
         public override async Task Connect()
         {
-            lock (_lock)
+            _rwls.EnterReadLock();
+            try
             {
                 if (Connected)
                     return;
             }
+            finally
+            {
+                _rwls.ExitReadLock();
+            }
 
             _logger.Debug($"Attempting to connect to {URL}");
             await ConnectAsync(URL);
+
         }
 
         private async Task Disconnect()
         {
-            lock (_lock)
+            _rwls.EnterReadLock();
+            try
             {
                 if (!Connected)
                     return;
             }
+            finally
+            {
+                _rwls.ExitReadLock();
+            }
 
             await DisconnectAsync(new SocketDisconnectionEventArgs("Normal disconnection", "Disconnection was executed"));
         }
@@ -229,17 +258,15 @@ namespace TwitchChatTTS.Hermes.Socket
 
         public void Initialize()
         {
-            _logger.Information("Initializing Hermes websocket client.");
+            _logger.Information("Initializing Tom to Speech websocket client.");
 
             OnConnected += async (sender, e) =>
             {
-                lock (_lock)
+                if (Connected)
-                {
+                    return;
-                    if (Connected)
+                Connected = true;
-                        return;
+
-                    Connected = true;
+                _logger.Information("Tom to Speech websocket client connected.");
-                }
-                _logger.Information("Hermes websocket client connected.");
 
                 _heartbeatTimer.Enabled = true;
                 LastHeartbeatReceived = DateTime.UtcNow;
@@ -249,21 +276,21 @@ namespace TwitchChatTTS.Hermes.Socket
                     ApiKey = _configuration.Hermes!.Token!,
                     MajorVersion = TTS.MAJOR_VERSION,
                     MinorVersion = TTS.MINOR_VERSION,
+                    PatchVersion = TTS.PATCH_VERSION,
                 });
             };
 
             OnDisconnected += async (sender, e) =>
             {
-                lock (_lock)
+                if (!Connected)
-                {
+                    return;
-                    if (!Connected)
-                        return;
-                    Connected = false;
-                }
 
+                Connected = false;
                 LoggedIn = false;
                 Ready = false;
-                _logger.Warning("Hermes websocket client disconnected.");
+                _user.Slave = true;
+
+                _logger.Warning("Tom to Speech websocket client disconnected.");
 
                 _heartbeatTimer.Enabled = false;
                 await Reconnect(_backoff);
@@ -378,7 +405,7 @@ namespace TwitchChatTTS.Hermes.Socket
                     }
                     catch (Exception ex)
                     {
-                        _logger.Error(ex, "Failed to send a heartbeat back to the Hermes websocket server.");
+                        _logger.Error(ex, "Failed to send a heartbeat back to the Tom to Speech websocket server.");
                     }
                 }
                 else if (signalTime - LastHeartbeatReceived > TimeSpan.FromSeconds(120))
@@ -389,7 +416,7 @@ namespace TwitchChatTTS.Hermes.Socket
                     }
                     catch (Exception ex)
                     {
-                        _logger.Error(ex, "Failed to disconnect from Hermes websocket server.");
+                        _logger.Error(ex, "Failed to disconnect from Tom to Speech websocket server.");
                         Ready = false;
                         LoggedIn = false;
                         Connected = false;
@@ -403,10 +430,18 @@ namespace TwitchChatTTS.Hermes.Socket
 
         public new async Task Send<T>(int opcode, T message)
         {
-            if (!Connected)
+            _rwls.EnterReadLock();
+            try
             {
-                _logger.Warning("Hermes websocket client is not connected. Not sending a message.");
+                if (!Connected)
-                return;
+                {
+                    _logger.Warning("Tom to Speech websocket client is not connected. Not sending a message.");
+                    return;
+                }
+            }
+            finally
+            {
+                _rwls.ExitReadLock();
             }
 
             await base.Send(opcode, message);

Hermes/Socket/Requests/CreateGroupAck.cs

@@ -0,0 +1,49 @@
+using System.Text.Json;
+using HermesSocketLibrary.Requests.Messages;
+using Serilog;
+using TwitchChatTTS.Chat.Groups;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class CreateGroupAck : IRequestAck
+    {
+        public string Name => "create_group";
+        private readonly IChatterGroupManager _groups;
+        private readonly JsonSerializerOptions _options;
+        private readonly ILogger _logger;
+
+        public CreateGroupAck(IChatterGroupManager groups, JsonSerializerOptions options, ILogger logger)
+        {
+            _groups = groups;
+            _options = options;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            if (string.IsNullOrWhiteSpace(json))
+            {
+                _logger.Warning($"Group JSON data is null.");
+                return;
+            }
+
+            var group = JsonSerializer.Deserialize<Group>(json, _options);
+            if (group == null)
+            {
+                _logger.Warning($"Group data is null.");
+                return;
+            }
+
+            var exists = _groups.Get(group.Id);
+            if (exists != null)
+            {
+                _logger.Warning($"Group id already exists [group id: {exists.Id}][group name: {exists.Name} / {group.Name}][group priority: {exists.Priority} / {group.Priority}]");
+                return;
+            }
+
+            _logger.Debug($"Adding group [group id: {group.Id}][group name: {group.Name}][group priority: {group.Priority}]");
+            _groups.Add(group);
+            _logger.Information($"Group has been created [group id: {group.Id}]");
+        }
+    }
+}

Hermes/Socket/Requests/CreateGroupChatterAck.cs

@@ -0,0 +1,49 @@
+using System.Text.Json;
+using HermesSocketLibrary.Requests.Messages;
+using Serilog;
+using TwitchChatTTS.Chat.Groups;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class CreateGroupChatterAck : IRequestAck
+    {
+        public string Name => "create_group_chatter";
+        private readonly IChatterGroupManager _groups;
+        private readonly JsonSerializerOptions _options;
+        private readonly ILogger _logger;
+
+        public CreateGroupChatterAck(IChatterGroupManager groups, JsonSerializerOptions options, ILogger logger)
+        {
+            _groups = groups;
+            _options = options;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            if (string.IsNullOrWhiteSpace(json))
+            {
+                _logger.Warning($"Group Chatter JSON data is null.");
+                return;
+            }
+
+            var groupChatter = JsonSerializer.Deserialize<GroupChatter>(json, _options);
+            if (groupChatter == null)
+            {
+                _logger.Warning($"Group Chatter data is null.");
+                return;
+            }
+
+            var group = _groups.Get(groupChatter.GroupId);
+            if (group == null)
+            {
+                _logger.Warning($"Group id for chatter does not exists [group id: {groupChatter.GroupId}]");
+                return;
+            }
+
+            _logger.Debug($"Adding chatter to group [group id: {groupChatter.GroupId}][group name: {group.Name}][chatter id: {groupChatter.ChatterId}][chatter label: {groupChatter.ChatterLabel}]");
+            _groups.Add(groupChatter.ChatterId, groupChatter.GroupId);
+            _logger.Information($"Chatter has been added to group [group id: {groupChatter.GroupId}][group name: {group.Name}][chatter id: {groupChatter.ChatterId}][chatter label: {groupChatter.ChatterLabel}]");
+        }
+    }
+}

Hermes/Socket/Requests/CreateGroupPermissionAck.cs

@@ -0,0 +1,52 @@
+using System.Text.Json;
+using HermesSocketLibrary.Requests.Messages;
+using Serilog;
+using TwitchChatTTS.Chat.Groups;
+using TwitchChatTTS.Chat.Groups.Permissions;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class CreateGroupPermissionAck : IRequestAck
+    {
+        public string Name => "create_group_permission";
+        private readonly IChatterGroupManager _groups;
+        private readonly IGroupPermissionManager _permissions;
+        private readonly JsonSerializerOptions _options;
+        private readonly ILogger _logger;
+
+        public CreateGroupPermissionAck(IChatterGroupManager groups, IGroupPermissionManager permissions, JsonSerializerOptions options, ILogger logger)
+        {
+            _groups = groups;
+            _permissions = permissions;
+            _options = options;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            if (string.IsNullOrWhiteSpace(json))
+            {
+                _logger.Warning($"Group JSON data is null.");
+                return;
+            }
+
+            var permission = JsonSerializer.Deserialize<GroupPermission>(json, _options);
+            if (permission == null)
+            {
+                _logger.Warning($"Permission data is null.");
+                return;
+            }
+
+            var group = _groups.Get(permission.GroupId.ToString());
+            if (group == null)
+            {
+                _logger.Warning($"Group id does not exist [group id: {permission.GroupId}][permission id: {permission.Id}]");
+                return;
+            }
+
+            _logger.Debug($"Adding permission to group [permission id: {permission.Id}][group id: {permission.GroupId}][path: {permission.Path}][state: {permission.Allow?.ToString() ?? "Inherited"}]");
+            _permissions.Set(permission.Path, permission.Allow);
+            _logger.Information($"Permission has been added to group [path: {permission.Path}][state: {permission.Allow?.ToString() ?? "Inherited"}][group name: {group.Name}]");
+        }
+    }
+}

Hermes/Socket/Requests/CreatePolicyAck.cs

@@ -1,5 +1,5 @@
 using System.Text.Json;
-using HermesSocketServer.Models;
+using HermesSocketServer.Messages;
 using Serilog;
 using TwitchChatTTS.Chat.Commands.Limits;
 using TwitchChatTTS.Chat.Groups;
@@ -22,31 +22,30 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
-            if (requestData == null)
+            if (string.IsNullOrWhiteSpace(json)) {
-            {
+                _logger.Warning($"Policy JSON data is null.");
-                _logger.Warning("Request data is null.");
                 return;
             }
-
+            
-            var policy = JsonSerializer.Deserialize<PolicyMessage>(json, _options);
+            var policy = JsonSerializer.Deserialize<Policy>(json, _options);
             if (policy == null)
             {
-                _logger.Warning($"Policy data failed: null");
+                _logger.Warning($"Policy data is null.");
                 return;
             }
 
             var group = _groups.Get(policy.GroupId.ToString());
             if (group == null)
             {
-                _logger.Warning($"Policy data failed: group id not found [group id: {policy.GroupId}][policy id: {policy.Id}]");
+                _logger.Warning($"Policy's group id not found [group id: {policy.GroupId}][policy id: {policy.Id}]");
                 return;
             }
 
             _logger.Debug($"Policy data [policy id: {policy.Id}][path: {policy.Path}][group id: {policy.GroupId}][group name: {group.Name}]");
             _policies.Set(group.Name, policy.Path, policy.Usage, TimeSpan.FromMilliseconds(policy.Span));
-            _logger.Information($"Policy has been updated [policy id: {policy.Id}]");
+            _logger.Information($"Policy has been created [policy id: {policy.Id}]");
         }
     }
 }

Hermes/Socket/Requests/CreateRedeemableActionAck.cs

@@ -0,0 +1,41 @@
+using System.Text.Json;
+using HermesSocketLibrary.Requests.Messages;
+using Serilog;
+using TwitchChatTTS.Twitch.Redemptions;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class CreateRedeemableActionAck : IRequestAck
+    {
+        public string Name => "create_redeemable_action";
+        private readonly IRedemptionManager _redemptions;
+        private readonly JsonSerializerOptions _options;
+        private readonly ILogger _logger;
+
+        public CreateRedeemableActionAck(IRedemptionManager redemptions, JsonSerializerOptions options, ILogger logger)
+        {
+            _redemptions = redemptions;
+            _options = options;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            if (json == null)
+            {
+                _logger.Warning($"Redeemable action JSON data received is null.");
+                return;
+            }
+
+            var action = JsonSerializer.Deserialize<RedeemableAction>(json, _options);
+            if (action == null)
+            {
+                _logger.Warning($"Redeemable action data received is null.");
+                return;
+            }
+
+            _redemptions.Add(action);
+            _logger.Information($"A new redeemable action has been created [action name: {action.Name}]");
+        }
+    }
+}

Hermes/Socket/Requests/CreateRedemptionAck.cs

@@ -0,0 +1,41 @@
+using System.Text.Json;
+using HermesSocketLibrary.Requests.Messages;
+using Serilog;
+using TwitchChatTTS.Twitch.Redemptions;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class CreateRedemptionAck : IRequestAck
+    {
+        public string Name => "create_redemption";
+        private readonly IRedemptionManager _redemptions;
+        private readonly JsonSerializerOptions _options;
+        private readonly ILogger _logger;
+
+        public CreateRedemptionAck(IRedemptionManager redemptions, JsonSerializerOptions options, ILogger logger)
+        {
+            _redemptions = redemptions;
+            _options = options;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            if (json == null)
+            {
+                _logger.Warning($"Redemption JSON data received is null.");
+                return;
+            }
+
+            var redemption = JsonSerializer.Deserialize<Redemption>(json, _options);
+            if (redemption == null)
+            {
+                _logger.Warning($"Redemption data received is null.");
+                return;
+            }
+
+            _redemptions.Add(redemption);
+            _logger.Information($"A new redemption has been created [redemption id: {redemption.Id}][twitch redemption id: {redemption.RedemptionId}]");
+        }
+    }
+}

Hermes/Socket/Requests/CreateTTSFilterAck.cs

@@ -0,0 +1,59 @@
+using System.Text.Json;
+using System.Text.RegularExpressions;
+using HermesSocketLibrary.Requests.Messages;
+using Serilog;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class CreateTTSFilterAck : IRequestAck
+    {
+        public string Name => "create_tts_filter";
+        private readonly User _user;
+        private readonly JsonSerializerOptions _options;
+        private readonly ILogger _logger;
+
+        public CreateTTSFilterAck(User user, JsonSerializerOptions options, ILogger logger)
+        {
+            _user = user;
+            _options = options;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            if (json == null)
+            {
+                _logger.Warning($"TTS Filter JSON data received is null.");
+                return;
+            }
+
+            var filter = JsonSerializer.Deserialize<TTSWordFilter>(json, _options);
+            if (filter == null)
+            {
+                _logger.Warning($"TTS Filter data received is null.");
+                return;
+            }
+
+            if (_user.RegexFilters.Any(f => f.Id == filter.Id))
+            {
+                _logger.Warning($"Filter already exists [filter id: {filter.Id}]");
+                return;
+            }
+
+            try
+            {
+                var re = new Regex(filter.Search, ((RegexOptions)filter.Flag) | RegexOptions.Compiled);
+                re.Match(string.Empty);
+                filter.Regex = re;
+            }
+            catch (Exception)
+            {
+                _logger.Warning($"Failed to create a regular expression for a TTS filter [filter id: {filter.Search}]");
+            }
+
+            _logger.Debug($"Filter data [filter id: {filter.Id}][search: {filter.Search}][replace: {filter.Replace}]");
+            _user.RegexFilters.Add(filter);
+            _logger.Information($"Filter has been created [filter id: {filter.Id}]");
+        }
+    }
+}

Hermes/Socket/Requests/CreateTTSUserAck.cs

@@ -14,14 +14,14 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
             if (requestData == null)
             {
                 _logger.Warning("Request data is null.");
                 return;
             }
-            
+
             if (!long.TryParse(requestData["chatter"].ToString(), out long chatterId))
             {
                 _logger.Warning($"Failed to parse chatter id [chatter id: {requestData["chatter"]}]");
@@ -33,13 +33,7 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
                 return;
             }
 
-            var userId = requestData["user"].ToString();
             var voiceId = requestData["voice"].ToString();
-            if (string.IsNullOrEmpty(userId))
-            {
-                _logger.Warning("User Id is invalid.");
-                return;
-            }
             if (string.IsNullOrEmpty(voiceId))
             {
                 _logger.Warning("Voice Id is invalid.");
@@ -52,7 +46,7 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             }
 
             _user.VoicesSelected.Add(chatterId, voiceId);
-            _logger.Information($"Created a new TTS user [user id: {userId}][voice id: {voiceId}][voice name: {voiceName}].");
+            _logger.Information($"Created a new TTS user [chatter id: {_user.TwitchUserId}][chatter id: {chatterId}][voice id: {voiceId}][voice name: {voiceName}].");
         }
     }
 }

Hermes/Socket/Requests/CreateTTSVoiceAck.cs

@@ -14,14 +14,14 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
             if (requestData == null)
             {
                 _logger.Warning("Request data is null.");
                 return;
             }
-            
+
             var voice = requestData["voice"].ToString()!;
             var voiceId = json;
             if (string.IsNullOrEmpty(voice))

Hermes/Socket/Requests/DeleteGroupAck.cs

@@ -0,0 +1,45 @@
+using Serilog;
+using TwitchChatTTS.Chat.Groups;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class DeleteGroupAck : IRequestAck
+    {
+        public string Name => "delete_group";
+        private readonly IChatterGroupManager _groups;
+        private readonly ILogger _logger;
+
+        public DeleteGroupAck(IChatterGroupManager groups, ILogger logger)
+        {
+            _groups = groups;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            if (requestData == null)
+            {
+                _logger.Warning("Request data is null.");
+                return;
+            }
+
+            var groupId = requestData["group"].ToString();
+            if (string.IsNullOrEmpty(groupId))
+            {
+                _logger.Warning($"Action name is invalid [action name: {groupId}]");
+                return;
+            }
+
+            var group = _groups.Get(groupId);
+            if (group == null)
+            {
+                _logger.Warning($"Group id does not exist [group id: {group}]");
+                return;
+            }
+
+            _logger.Debug($"Removing group [group id: {group.Id}][group name: {group.Name}][group priority: {group.Priority}]");
+            _groups.Remove(group.Id);
+            _logger.Information($"Group has been updated [group id: {group.Id}]");
+        }
+    }
+}

Hermes/Socket/Requests/DeleteGroupChatterAck.cs

@@ -0,0 +1,51 @@
+using Serilog;
+using TwitchChatTTS.Chat.Groups;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class DeleteGroupChatterAck : IRequestAck
+    {
+        public string Name => "delete_group_chatter";
+        private readonly IChatterGroupManager _groups;
+        private readonly ILogger _logger;
+
+        public DeleteGroupChatterAck(IChatterGroupManager groups, ILogger logger)
+        {
+            _groups = groups;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            if (requestData == null)
+            {
+                _logger.Warning("Request data is null.");
+                return;
+            }
+
+            if (!long.TryParse(requestData["chatter"].ToString(), out var chatterId))
+            {
+                _logger.Warning($"Chatter Id is invalid [chatter id: {chatterId}]");
+                return;
+            }
+
+            var groupId = requestData["group"].ToString();
+            if (string.IsNullOrWhiteSpace(groupId))
+            {
+                _logger.Warning($"Group Id is invalid [group id: {groupId}]");
+                return;
+            }
+
+            var group = _groups.Get(groupId);
+            if (group == null)
+            {
+                _logger.Warning($"Group id does not exist [group id: {groupId}]");
+                return;
+            }
+
+            _logger.Debug($"Deleting chatter from group [group id: {group.Id}][chatter id: {chatterId}][group name: {group.Name}][group priority: {group.Priority}]");
+            _groups.Remove(chatterId, groupId);
+            _logger.Information($"Chatter has been deleted from group [group id: {group.Id}][chatter id: {chatterId}]");
+        }
+    }
+}

Hermes/Socket/Requests/DeleteGroupPermissionAck.cs

@@ -0,0 +1,64 @@
+using System.Text.Json;
+using HermesSocketLibrary.Requests.Messages;
+using Serilog;
+using TwitchChatTTS.Chat.Groups;
+using TwitchChatTTS.Chat.Groups.Permissions;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class DeleteGroupPermissionAck : IRequestAck
+    {
+        public string Name => "delete_group_permission";
+        private readonly IChatterGroupManager _groups;
+        private readonly IGroupPermissionManager _permissions;
+        private readonly JsonSerializerOptions _options;
+        private readonly ILogger _logger;
+
+        public DeleteGroupPermissionAck(IChatterGroupManager groups, IGroupPermissionManager permissions, JsonSerializerOptions options, ILogger logger)
+        {
+            _groups = groups;
+            _permissions = permissions;
+            _options = options;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            if (requestData == null)
+            {
+                _logger.Warning("Request data is null.");
+                return;
+            }
+
+            if (!requestData.TryGetValue("id", out var permissionId))
+            {
+                _logger.Warning($"Permission Id could not be found.");
+                return;
+            }
+
+            if (string.IsNullOrWhiteSpace(json))
+            {
+                _logger.Warning($"Group JSON data is null.");
+                return;
+            }
+
+            var permission = JsonSerializer.Deserialize<GroupPermission>(json, _options);
+            if (permission == null)
+            {
+                _logger.Warning($"Permission data is null.");
+                return;
+            }
+
+            var group = _groups.Get(permission.GroupId.ToString());
+            if (group == null)
+            {
+                _logger.Warning($"Group id does not exist [group id: {permission.GroupId}][permission id: {permission.Id}]");
+                return;
+            }
+
+            _logger.Debug($"Removing permission from group [permission id: {permission.Id}][group id: {permission.GroupId}][path: {permission.Path}][state: {permission.Allow?.ToString() ?? "Inherited"}]");
+            _permissions.Remove(permissionId.ToString()!);
+            _logger.Information($"Permission has been removed from group [path: {permission.Path}][state: {permission.Allow?.ToString() ?? "Inherited"}][group name: {group.Name}]");
+        }
+    }
+}

Hermes/Socket/Requests/DeletePolicyAck.cs

@@ -18,8 +18,14 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
+            if (json == null)
+            {
+                _logger.Warning("Policy JSON data is null.");
+                return;
+            }
+
             var data = json.Split('/');
             if (data.Length != 2)
             {

Hermes/Socket/Requests/DeleteRedeemableActionAck.cs

@@ -0,0 +1,39 @@
+using Serilog;
+using TwitchChatTTS.Twitch.Redemptions;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class DeleteRedeemableActionAck : IRequestAck
+    {
+        public string Name => "delete_redeemable_action";
+        private readonly IRedemptionManager _redemptions;
+        private readonly ILogger _logger;
+
+        public DeleteRedeemableActionAck(IRedemptionManager redemptions, ILogger logger)
+        {
+            _redemptions = redemptions;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            if (requestData == null)
+            {
+                _logger.Warning("Request data is null.");
+                return;
+            }
+
+            var name = requestData["name"].ToString();
+            if (string.IsNullOrEmpty(name))
+            {
+                _logger.Warning($"Action name is invalid [action name: {name}]");
+                return;
+            }
+
+            if (_redemptions.RemoveAction(name))
+                _logger.Information($"Deleted a redeemable action [action name: {name}]");
+            else
+                _logger.Warning($"Failed to delete a redeemable action [action name: {name}]");
+        }
+    }
+}

Hermes/Socket/Requests/DeleteRedemptionAck.cs

@@ -0,0 +1,39 @@
+using Serilog;
+using TwitchChatTTS.Twitch.Redemptions;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class DeleteRedemptionAck : IRequestAck
+    {
+        public string Name => "delete_redemption";
+        private readonly IRedemptionManager _redemptions;
+        private readonly ILogger _logger;
+
+        public DeleteRedemptionAck(IRedemptionManager redemptions, ILogger logger)
+        {
+            _redemptions = redemptions;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            if (requestData == null)
+            {
+                _logger.Warning("Request data is null.");
+                return;
+            }
+
+            var id = requestData["id"].ToString();
+            if (string.IsNullOrEmpty(id))
+            {
+                _logger.Warning($"Redemption Id is invalid [redemption id: {id}]");
+                return;
+            }
+
+            if (_redemptions.RemoveRedemption(id))
+                _logger.Information($"Deleted a redemption [redemption id: {id}]");
+            else
+                _logger.Warning($"Failed to delete a redemption [redemption id: {id}]");
+        }
+    }
+}

Hermes/Socket/Requests/DeleteTTSFilterAck.cs

@@ -0,0 +1,42 @@
+using Serilog;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class DeleteTTSFilterAck : IRequestAck
+    {
+        public string Name => "delete_tts_filter";
+        private readonly User _user;
+        private readonly ILogger _logger;
+
+        public DeleteTTSFilterAck(User user, ILogger logger)
+        {
+            _user = user;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            if (requestData == null)
+            {
+                _logger.Warning("Request data is null.");
+                return;
+            }
+
+            var id = requestData["id"].ToString();
+            if (string.IsNullOrEmpty(id))
+            {
+                _logger.Warning($"Filter Id is invalid [filter id: {id}]");
+                return;
+            }
+            var filter = _user.RegexFilters.FirstOrDefault(f => f.Id == id);
+            if (filter == null)
+            {
+                _logger.Warning($"Filter Id does not exist [filter id: {id}]");
+                return;
+            }
+
+            _user.RegexFilters.Remove(filter);
+            _logger.Information($"Deleted a filter [filter id: {id}][search: {filter.Search}][replace: {filter.Replace}]");
+        }
+    }
+}

Hermes/Socket/Requests/DeleteTTSVoiceAck.cs

@@ -14,14 +14,14 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
             if (requestData == null)
             {
                 _logger.Warning("Request data is null.");
                 return;
             }
-            
+
             var voice = requestData["voice"].ToString();
             if (string.IsNullOrEmpty(voice))
             {

Hermes/Socket/Requests/GetChatterIdsAck.cs

@@ -17,8 +17,14 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
+            if (json == null)
+            {
+                _logger.Warning("Chatters JSON is null.");
+                return;
+            }
+
             var chatters = JsonSerializer.Deserialize<IEnumerable<long>>(json, _options);
             if (chatters == null)
             {

Hermes/Socket/Requests/GetConnectionsAck.cs

@@ -29,8 +29,14 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
+            if (json == null)
+            {
+                _logger.Error("Connections JSON is null.");
+                return;
+            }
+
             var connections = JsonSerializer.Deserialize<IEnumerable<Connection>>(json, _options);
             if (connections == null)
             {

Hermes/Socket/Requests/GetDefaultTTSVoiceAck.cs

@@ -1,4 +1,3 @@
-using System.Text.Json;
 using Serilog;
 
 namespace TwitchChatTTS.Hermes.Socket.Requests
@@ -7,17 +6,15 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
     {
         public string Name => "get_default_tts_voice";
         private readonly User _user;
-        private readonly JsonSerializerOptions _options;
         private readonly ILogger _logger;
 
-        public GetDefaultTTSVoiceAck(User user, JsonSerializerOptions options, ILogger logger)
+        public GetDefaultTTSVoiceAck(User user,  ILogger logger)
         {
             _user = user;
-            _options = options;
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
             string? defaultVoice = json;
             if (defaultVoice != null)

Hermes/Socket/Requests/GetEmotesAck.cs

@@ -19,8 +19,14 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
+            if (json == null)
+            {
+                _logger.Warning("Emotes JSON is null.");
+                return;
+            }
+
             var data = JsonSerializer.Deserialize<IEnumerable<EmoteInfo>>(json, _options);
             if (data == null)
             {

Hermes/Socket/Requests/GetEnabledTTSVoices.cs

@@ -17,8 +17,14 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
+            if (json == null)
+            {
+                _logger.Warning("TTS Voices JSON is null.");
+                return;
+            }
+
             var enabledTTSVoices = JsonSerializer.Deserialize<IEnumerable<string>>(json, _options);
             if (enabledTTSVoices == null)
             {

Hermes/Socket/Requests/GetPermissionsAck.cs

@@ -26,12 +26,18 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
+            if (json == null)
+            {
+                _logger.Error("Failed to load groups & permissions: JSON is null.");
+                return;
+            }
+
             var groupInfo = JsonSerializer.Deserialize<GroupInfo>(json, _options);
             if (groupInfo == null)
             {
-                _logger.Error("Failed to load groups & permissions.");
+                _logger.Error("Failed to load groups & permissions: object is null.");
                 return;
             }
 
@@ -40,12 +46,15 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
 
             var groupsById = groupInfo.Groups.ToDictionary(g => g.Id, g => g);
             foreach (var group in groupInfo.Groups)
+            {
+                _logger.Debug($"Adding group [group id: {group.Id}][name: {group.Name}][priority: {group.Priority}]");
                 _groups.Add(group);
+            }
 
             foreach (var permission in groupInfo.GroupPermissions)
             {
                 _logger.Debug($"Adding group permission [permission id: {permission.Id}][group id: {permission.GroupId}][path: {permission.Path}][allow: {permission.Allow?.ToString() ?? "null"}]");
-                if (!groupsById.TryGetValue(permission.GroupId, out var group))
+                if (!groupsById.TryGetValue(permission.GroupId.ToString(), out var group))
                 {
                     _logger.Warning($"Failed to find group by id [permission id: {permission.Id}][group id: {permission.GroupId}][path: {permission.Path}]");
                     continue;
@@ -60,7 +69,7 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
 
             foreach (var chatter in groupInfo.GroupChatters)
                 if (groupsById.TryGetValue(chatter.GroupId, out var group))
-                    _groups.Add(chatter.ChatterId, group.Name);
+                    _groups.Add(chatter.ChatterId, group.Id);
             _logger.Information($"Users in each group [count: {groupInfo.GroupChatters.Count()}] have been loaded.");
         }
     }

Hermes/Socket/Requests/GetPoliciesAck.cs

@@ -1,5 +1,5 @@
 using System.Text.Json;
-using HermesSocketServer.Models;
+using HermesSocketServer.Messages;
 using Serilog;
 using TwitchChatTTS.Chat.Commands.Limits;
 using TwitchChatTTS.Chat.Groups;
@@ -26,13 +26,18 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
-            var policies = JsonSerializer.Deserialize<IEnumerable<PolicyMessage>>(json, _options);
+            if (json == null)
+            {
+                _logger.Error($"No policies have been found: JSON is null.");
+                return;
+            }
+
+            var policies = JsonSerializer.Deserialize<IEnumerable<Policy>>(json, _options);
             if (policies == null || !policies.Any())
             {
-                _logger.Information($"No policies have been found. Policies have been set to default.");
+                _logger.Error($"No policies have been found: object is null or empty.");
-                _policies.Set("everyone", "tts", 25, TimeSpan.FromSeconds(15));
                 return;
             }
 
@@ -41,7 +46,7 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
                 var group = _groups.Get(policy.GroupId.ToString());
                 if (group == null)
                 {
-                    _logger.Debug($"Policy data failed: group id not found [group id: {policy.GroupId}][policy id: {policy.Id}]");
+                    _logger.Debug($"Policy's group id not found [group id: {policy.GroupId}][policy id: {policy.Id}]");
                     continue;
                 }
                 _logger.Debug($"Policy data loaded [policy id: {policy.Id}][path: {policy.Path}][group id: {policy.GroupId}][group name: {group.Name}]");

Hermes/Socket/Requests/GetRedeemableActionsAck.cs

@@ -23,7 +23,7 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
             if (requestData == null)
             {
@@ -46,7 +46,8 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             }
 
             _logger.Information($"Redeemable actions loaded [count: {actions.Count()}]");
-            _bus.Send(this, "redemptions_initiation", new RedemptionInitiation() {
+            _bus.Send(this, "redemptions_initiation", new RedemptionInitiation()
+            {
                 Redemptions = redemptions,
                 Actions = actions.ToDictionary(a => a.Name, a => a)
             });

Hermes/Socket/Requests/GetRedemptionsAck.cs

@@ -23,7 +23,7 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
             HermesRequestData? hermesRequestData = null;
             if (!string.IsNullOrEmpty(requestId))

Hermes/Socket/Requests/GetTTSUsersAck.cs

@@ -18,7 +18,7 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
             var users = JsonSerializer.Deserialize<IDictionary<long, string>>(json, _options);
             if (users == null)
@@ -27,7 +27,7 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             var temp = new ConcurrentDictionary<long, string>();
             foreach (var entry in users)
                 temp.TryAdd(entry.Key, entry.Value);
-            
+
             _user.VoicesSelected = temp;
             _logger.Information($"Updated chatters' selected voice [count: {temp.Count()}]");
         }

Hermes/Socket/Requests/GetTTSVoicesAck.cs

@@ -19,9 +19,9 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
-            var voices = JsonSerializer.Deserialize<IEnumerable<VoiceDetails>>(json, _options);
+            var voices = JsonSerializer.Deserialize<IEnumerable<TTSVoice>>(json, _options);
             if (voices == null)
             {
                 _logger.Warning("Voices received is null.");

Hermes/Socket/Requests/GetTTSWordFiltersAck.cs

@@ -19,7 +19,7 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
             var wordFilters = JsonSerializer.Deserialize<IEnumerable<TTSWordFilter>>(json, _options);
             if (wordFilters == null)
@@ -28,19 +28,22 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
                 return;
             }
 
-            var filters = wordFilters.Where(f => f.Search != null && f.Replace != null).ToArray();
+            var filters = wordFilters.Where(f => f.Search != null && f.Replace != null).ToList();
             foreach (var filter in filters)
             {
                 try
                 {
-                    var re = new Regex(filter.Search!, RegexOptions.Compiled);
+                    var re = new Regex(filter.Search, ((RegexOptions)filter.Flag) | RegexOptions.Compiled);
                     re.Match(string.Empty);
                     filter.Regex = re;
                 }
-                catch (Exception) { }
+                catch (Exception)
+                {
+                    _logger.Warning($"Failed to create a regular expression for a TTS filter [filter id: {filter.Search}]");
+                }
             }
             _user.RegexFilters = filters;
-            _logger.Information($"TTS word filters [count: {_user.RegexFilters.Count()}] have been refreshed.");
+            _logger.Information($"TTS word filters [count: {_user.RegexFilters.Count}] have been refreshed.");
         }
     }
 }

Hermes/Socket/Requests/IRequestAck.cs

@@ -3,6 +3,6 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
     public interface IRequestAck
     {
         string Name { get; }
-        void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData);
+        void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData);
     }
 }

Hermes/Socket/Requests/UpdateDefaultTTSVoiceAck.cs

@@ -14,7 +14,7 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
             if (requestData == null)
             {

Hermes/Socket/Requests/UpdateGroupAck.cs

@@ -0,0 +1,49 @@
+using System.Text.Json;
+using HermesSocketLibrary.Requests.Messages;
+using Serilog;
+using TwitchChatTTS.Chat.Groups;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class UpdateGroupAck : IRequestAck
+    {
+        public string Name => "update_group";
+        private readonly IChatterGroupManager _groups;
+        private readonly JsonSerializerOptions _options;
+        private readonly ILogger _logger;
+
+        public UpdateGroupAck(IChatterGroupManager groups, JsonSerializerOptions options, ILogger logger)
+        {
+            _groups = groups;
+            _options = options;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            if (string.IsNullOrWhiteSpace(json))
+            {
+                _logger.Warning($"Group JSON data is null.");
+                return;
+            }
+
+            var group = JsonSerializer.Deserialize<Group>(json, _options);
+            if (group == null)
+            {
+                _logger.Warning($"Group data is null.");
+                return;
+            }
+
+            var exists = _groups.Get(group.Id);
+            if (exists == null)
+            {
+                _logger.Warning($"Group id does not exist [group id: {group.Id}][group name: {group.Name}][group priority: {group.Priority}]");
+                return;
+            }
+
+            _logger.Debug($"Updating group [group id: {group.Id}][group name: {group.Name}][group priority: {group.Priority}]");
+            _groups.Modify(group);
+            _logger.Information($"Group has been updated [group id: {group.Id}]");
+        }
+    }
+}

Hermes/Socket/Requests/UpdateGroupChatterAck.cs

@@ -0,0 +1,40 @@
+using System.Text.Json;
+using HermesSocketLibrary.Requests.Messages;
+using Serilog;
+using TwitchChatTTS.Chat.Groups;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class UpdateGroupChatterAck : IRequestAck
+    {
+        public string Name => "update_group_chatter";
+        private readonly IChatterGroupManager _groups;
+        private readonly JsonSerializerOptions _options;
+        private readonly ILogger _logger;
+
+        public UpdateGroupChatterAck(IChatterGroupManager groups, JsonSerializerOptions options, ILogger logger)
+        {
+            _groups = groups;
+            _options = options;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            if (string.IsNullOrWhiteSpace(json)) {
+                _logger.Warning($"Group Chatter JSON data is null.");
+                return;
+            }
+
+            var groupChatter = JsonSerializer.Deserialize<GroupChatter>(json, _options);
+            if (groupChatter == null)
+            {
+                _logger.Warning($"Group Chatter data is null.");
+                return;
+            }
+
+            _groups.Add(groupChatter.ChatterId, groupChatter.GroupId);
+            _logger.Information($"Chatter has been updated [chatter label: {groupChatter.ChatterLabel}]");
+        }
+    }
+}

Hermes/Socket/Requests/UpdateGroupPermissionAck.cs

@@ -0,0 +1,52 @@
+using System.Text.Json;
+using HermesSocketLibrary.Requests.Messages;
+using Serilog;
+using TwitchChatTTS.Chat.Groups;
+using TwitchChatTTS.Chat.Groups.Permissions;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class UpdateGroupPermissionAck : IRequestAck
+    {
+        public string Name => "update_group_permission";
+        private readonly IChatterGroupManager _groups;
+        private readonly IGroupPermissionManager _permissions;
+        private readonly JsonSerializerOptions _options;
+        private readonly ILogger _logger;
+
+        public UpdateGroupPermissionAck(IChatterGroupManager groups, IGroupPermissionManager permissions, JsonSerializerOptions options, ILogger logger)
+        {
+            _groups = groups;
+            _permissions = permissions;
+            _options = options;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            if (string.IsNullOrWhiteSpace(json))
+            {
+                _logger.Warning($"Group JSON data is null.");
+                return;
+            }
+
+            var permission = JsonSerializer.Deserialize<GroupPermission>(json, _options);
+            if (permission == null)
+            {
+                _logger.Warning($"Permission data is null.");
+                return;
+            }
+
+            var group = _groups.Get(permission.GroupId.ToString());
+            if (group == null)
+            {
+                _logger.Warning($"Group id does not exist [group id: {permission.GroupId}][permission id: {permission.Id}]");
+                return;
+            }
+
+            _logger.Debug($"Updating permission to group [permission id: {permission.Id}][group id: {permission.GroupId}][path: {permission.Path}][state: {permission.Allow?.ToString() ?? "Inherited"}]");
+            _permissions.Set(permission.Path, permission.Allow);
+            _logger.Information($"Permission on group has been updated [path: {permission.Path}][state: {permission.Allow?.ToString() ?? "Inherited"}][group name: {group.Name}]");
+        }
+    }
+}

Hermes/Socket/Requests/UpdatePolicyAck.cs

@@ -1,5 +1,5 @@
 using System.Text.Json;
-using HermesSocketServer.Models;
+using HermesSocketServer.Messages;
 using Serilog;
 using TwitchChatTTS.Chat.Commands.Limits;
 using TwitchChatTTS.Chat.Groups;
@@ -22,18 +22,24 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
-            var policy = JsonSerializer.Deserialize<PolicyMessage>(json, _options);
+            if (json == null)
+            {
+                _logger.Warning($"Policy JSON data is null.");
+                return;
+            }
+
+            var policy = JsonSerializer.Deserialize<Policy>(json, _options);
             if (policy == null)
             {
-                _logger.Warning($"Policy data failed: null");
+                _logger.Warning($"Policy data is null.");
                 return;
             }
             var group = _groups.Get(policy.GroupId.ToString());
             if (group == null)
             {
-                _logger.Warning($"Policy data failed: group id not found [group id: {policy.GroupId}][policy id: {policy.Id}]");
+                _logger.Warning($"Policy's group id not found [group id: {policy.GroupId}][policy id: {policy.Id}]");
                 return;
             }
 

Hermes/Socket/Requests/UpdateRedeemableActionAck.cs

@@ -0,0 +1,37 @@
+using System.Text.Json;
+using HermesSocketLibrary.Requests.Messages;
+using Serilog;
+using TwitchChatTTS.Twitch.Redemptions;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class UpdateRedeemableActionAck : IRequestAck
+    {
+        public string Name => "update_redeemable_action";
+        private readonly IRedemptionManager _redemptions;
+        private readonly JsonSerializerOptions _options;
+        private readonly ILogger _logger;
+
+        public UpdateRedeemableActionAck(IRedemptionManager redemptions, JsonSerializerOptions options, ILogger logger)
+        {
+            _redemptions = redemptions;
+            _options = options;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            var action = JsonSerializer.Deserialize<RedeemableAction>(json, _options);
+            if (action == null)
+            {
+                _logger.Warning($"Redeemable action data received is null.");
+                return;
+            }
+
+            if (_redemptions.Update(action))
+                _logger.Information($"A redeemable action has been updated [action name: {action.Name}]");
+            else
+                _logger.Warning($"Failed to update an existing redeemable action [action name: {action.Name}]");
+        }
+    }
+}

Hermes/Socket/Requests/UpdateRedeemptionAck.cs

@@ -0,0 +1,42 @@
+using System.Text.Json;
+using HermesSocketLibrary.Requests.Messages;
+using Serilog;
+using TwitchChatTTS.Twitch.Redemptions;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class UpdateRedemptionAck : IRequestAck
+    {
+        public string Name => "update_redemption";
+        private readonly IRedemptionManager _redemptions;
+        private readonly JsonSerializerOptions _options;
+        private readonly ILogger _logger;
+
+        public UpdateRedemptionAck(IRedemptionManager redemptions, JsonSerializerOptions options, ILogger logger)
+        {
+            _redemptions = redemptions;
+            _options = options;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            if (json == null) {
+                _logger.Warning($"Redemption JSON data received is null.");
+                return;
+            }
+
+            var redemption = JsonSerializer.Deserialize<Redemption>(json, _options);
+            if (redemption == null)
+            {
+                _logger.Warning($"Redemption data received is null.");
+                return;
+            }
+
+            if (_redemptions.Update(redemption))
+                _logger.Information($"A redemption has been updated [redemption id: {redemption.Id}][twitch redemption id: {redemption.RedemptionId}]");
+            else
+                _logger.Warning($"Failed to update an existing redemption [redemption id: {redemption.Id}][twitch redemption id: {redemption.RedemptionId}]");
+        }
+    }
+}

Hermes/Socket/Requests/UpdateTTSFilterAck.cs

@@ -0,0 +1,63 @@
+using System.Text.Json;
+using System.Text.RegularExpressions;
+using HermesSocketLibrary.Requests.Messages;
+using Serilog;
+
+namespace TwitchChatTTS.Hermes.Socket.Requests
+{
+    public class UpdateTTSFilterAck : IRequestAck
+    {
+        public string Name => "update_tts_filter";
+        private readonly User _user;
+        private readonly JsonSerializerOptions _options;
+        private readonly ILogger _logger;
+
+        public UpdateTTSFilterAck(User user, JsonSerializerOptions options, ILogger logger)
+        {
+            _user = user;
+            _options = options;
+            _logger = logger;
+        }
+
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
+        {
+            if (json == null)
+            {
+                _logger.Warning($"TTS Filter JSON data is null.");
+                return;
+            }
+
+            var filter = JsonSerializer.Deserialize<TTSWordFilter>(json, _options);
+            if (filter == null)
+            {
+                _logger.Warning($"TTS Filter data is null.");
+                return;
+            }
+
+            _logger.Debug($"Filter data [filter id: {filter.Id}][search: {filter.Search}][group id: {filter.Replace}]");
+            var current = _user.RegexFilters.FirstOrDefault(f => f.Id == filter.Id);
+            if (current == null)
+            {
+                _logger.Warning($"TTS Filter doest exist by id [filter id: {filter.Id}]");
+                return;
+            }
+
+            current.Search = filter.Search;
+            current.Replace = filter.Replace;
+            current.Flag = filter.Flag;
+
+            try
+            {
+                var re = new Regex(current.Search, ((RegexOptions)current.Flag) | RegexOptions.Compiled);
+                re.Match(string.Empty);
+                current.Regex = re;
+            }
+            catch (Exception)
+            {
+                _logger.Warning($"Failed to create a regular expression for a TTS filter [filter id: {filter.Search}]");
+            }
+
+            _logger.Information($"Filter has been updated [filter id: {filter.Id}]");
+        }
+    }
+}

Hermes/Socket/Requests/UpdateTTSUserAck.cs

@@ -14,7 +14,7 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
             if (requestData == null)
             {
@@ -33,13 +33,7 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
                 return;
             }
 
-            var userId = requestData["user"].ToString();
             var voiceId = requestData["voice"].ToString();
-            if (string.IsNullOrEmpty(userId))
-            {
-                _logger.Warning("User Id is invalid.");
-                return;
-            }
             if (string.IsNullOrEmpty(voiceId))
             {
                 _logger.Warning("Voice Id is invalid.");
@@ -52,7 +46,7 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             }
 
             _user.VoicesSelected[chatterId] = voiceId;
-            _logger.Information($"Updated a TTS user's voice [user id: {userId}][voice: {voiceId}][voice name: {voiceName}]");
+            _logger.Information($"Updated a TTS user's voice [user id: {_user.TwitchUserId}][voice: {voiceId}][voice name: {voiceName}]");
         }
     }
 }

Hermes/Socket/Requests/UpdateTTSVoiceAck.cs

@@ -14,7 +14,7 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
             if (requestData == null)
             {

Hermes/Socket/Requests/UpdateTTSVoiceStateAck.cs

@@ -14,7 +14,7 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
             _logger = logger;
         }
 
-        public void Acknowledge(string requestId, string json, IDictionary<string, object>? requestData)
+        public void Acknowledge(string requestId, string? json, IDictionary<string, object>? requestData)
         {
             if (requestData == null)
             {

Hermes/TTSVersion.cs

@@ -4,7 +4,8 @@ namespace TwitchChatTTS.Hermes
     {
         public int MajorVersion { get; set; }
         public int MinorVersion { get; set; }
-        public string Download { get; set; }
+        public int? PatchVersion { get; set; }
-        public string Changelog { get; set; }
+        public required string Download { get; set; }
+        public required string Changelog { get; set; }
     }
 }

Hermes/TwitchBotToken.cs

@@ -1,7 +0,0 @@
-public class TwitchBotToken {
-    public string? ClientId { get; set; }
-    public string? ClientSecret { get; set; }
-    public string? AccessToken { get; set; }
-    public string? RefreshToken { get; set; }
-    public string? BroadcasterId { get; set; }
-}

Hermes/TwitchConnection.cs

@@ -1,7 +0,0 @@
-public class TwitchConnection {
-    public string? Id { get; set; }
-    public string? Secret { get; set; }
-    public string? BroadcasterId { get; set; }
-    public string? Username { get; set; }
-    public string? UserId { get; set; }
-}

OBS/Socket/Data/EventMessage.cs

@@ -2,8 +2,8 @@ namespace TwitchChatTTS.OBS.Socket.Data
 {
     public class EventMessage
     {
-        public string EventType { get; set; }
+        public required string EventType { get; set; }
         public int EventIntent { get; set; }
-        public Dictionary<string, object> EventData { get; set; }
+        public Dictionary<string, object>? EventData { get; set; }
     }
 }

OBS/Socket/Data/HelloMessage.cs

@@ -2,13 +2,13 @@ namespace TwitchChatTTS.OBS.Socket.Data
 {
     public class HelloMessage
     {
-        public string ObsWebSocketVersion { get; set; }
+        public required string ObsWebSocketVersion { get; set; }
         public int RpcVersion { get; set; }
-        public AuthenticationMessage Authentication { get; set; }
+        public AuthenticationMessage? Authentication { get; set; }
     }
 
     public class AuthenticationMessage {
-        public string Challenge { get; set; }
+        public required string Challenge { get; set; }
-        public string Salt { get; set; }
+        public required string Salt { get; set; }
     }
 }

OBS/Socket/Data/OBSSceneItem.cs

@@ -2,9 +2,9 @@ namespace TwitchChatTTS.OBS.Socket.Data
 {
     public class OBSSceneItem
     {
-        public string SourceUuid { get; set; }
+        public required string SourceUuid { get; set; }
-        public string SourceName { get; set; }
+        public required string SourceName { get; set; }
-        public string SourceType { get; set; }
+        public required string SourceType { get; set; }
         public int SceneItemId { get; set; }
     }
 }

OBS/Socket/Data/RequestBatchMessage.cs

@@ -1,5 +1,3 @@
-using Newtonsoft.Json;
-
 namespace TwitchChatTTS.OBS.Socket.Data
 {
     public class RequestBatchMessage

OBS/Socket/Data/RequestBatchResponseMessage.cs

@@ -2,7 +2,7 @@ namespace TwitchChatTTS.OBS.Socket.Data
 {
     public class RequestBatchResponseMessage
     {
-        public string RequestId { get; set; }
+        public required string RequestId { get; set; }
-        public IEnumerable<object> Results { get; set; }
+        public required IEnumerable<object> Results { get; set; }
     }
 }

OBS/Socket/Data/RequestMessage.cs

@@ -3,7 +3,7 @@ namespace TwitchChatTTS.OBS.Socket.Data
     public class RequestMessage
     {
         public string RequestType { get; set; }
-        public string RequestId { get; set; }
+        public string? RequestId { get; set; }
         public Dictionary<string, object> RequestData { get; set; }
 
         public RequestMessage(string type, string id, Dictionary<string, object> data)

OBS/Socket/Data/RequestResponseMessage.cs

@@ -1,12 +1,10 @@
-using Newtonsoft.Json;
-
 namespace TwitchChatTTS.OBS.Socket.Data
 {
     public class RequestResponseMessage
     {
-        public string RequestType { get; set; }
+        public required string RequestType { get; set; }
-        public string RequestId { get; set; }
+        public required string RequestId { get; set; }
-        public object RequestStatus { get; set; }
+        public required object RequestStatus { get; set; }
-        public Dictionary<string, object> ResponseData { get; set; }
+        public Dictionary<string, object>? ResponseData { get; set; }
     }
 }

OBS/Socket/Data/TransformationData.cs

@@ -5,7 +5,7 @@ namespace TwitchChatTTS.OBS.Socket.Data
         public int Alignment { get; set; }
         public int BoundsAlignment { get; set; }
         public double BoundsHeight { get; set; }
-        public string BoundsType { get; set; }
+        public required string BoundsType { get; set; }
         public double BoundsWidth { get; set; }
         public int CropBottom { get; set; }
         public int CropLeft { get; set; }

OBS/Socket/Handlers/RequestResponseHandler.cs

@@ -68,7 +68,7 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
                             }
 
                             _logger.Debug($"Found the scene item by name [scene: {sceneName}][source: {sourceName}][id: {sceneItemId}][obs request id: {message.RequestId}].");
-                            obs.AddSourceId(sourceName.ToString()!, (long)sceneItemId);
+                            obs.AddSourceId(sourceName.ToString()!, long.Parse(sceneItemId.ToString()!));
 
                             requestData.ResponseValues = message.ResponseData;
                             break;

OBS/Socket/OBSSocketClient.cs

@@ -5,8 +5,7 @@ using Serilog;
 using System.Text.Json;
 using System.Collections.Concurrent;
 using TwitchChatTTS.OBS.Socket.Data;
-using System.Timers;
+using CommonSocketLibrary.Backoff;
-using System.Net.WebSockets;
 
 namespace TwitchChatTTS.OBS.Socket
 {
@@ -16,8 +15,8 @@ namespace TwitchChatTTS.OBS.Socket
         private readonly IDictionary<string, long> _sourceIds;
         private string? URL;
 
+        private readonly IBackoff _backoff;
         private readonly Configuration _configuration;
-        private System.Timers.Timer _reconnectTimer;
 
         public bool Connected { get; set; }
         public bool Identified { get; set; }
@@ -26,6 +25,7 @@ namespace TwitchChatTTS.OBS.Socket
 
         public OBSSocketClient(
             Configuration configuration,
+            [FromKeyedServices("hermes")] IBackoff backoff,
             [FromKeyedServices("obs")] IEnumerable<IWebSocketHandler> handlers,
             [FromKeyedServices("obs")] MessageTypeManager<IWebSocketHandler> typeManager,
             ILogger logger
@@ -35,12 +35,9 @@ namespace TwitchChatTTS.OBS.Socket
             PropertyNamingPolicy = JsonNamingPolicy.CamelCase
         }, logger)
         {
+            _backoff = backoff;
             _configuration = configuration;
 
-            _reconnectTimer = new System.Timers.Timer(TimeSpan.FromSeconds(30));
-            _reconnectTimer.Elapsed += async (sender, e) => await Reconnect(e);
-            _reconnectTimer.Enabled = false;
-
             _requests = new ConcurrentDictionary<string, RequestData>();
             _sourceIds = new Dictionary<string, long>();
         }
@@ -51,18 +48,19 @@ namespace TwitchChatTTS.OBS.Socket
             OnConnected += (sender, e) =>
             {
                 Connected = true;
-                _reconnectTimer.Enabled = false;
                 _logger.Information("OBS websocket client connected.");
             };
 
-            OnDisconnected += (sender, e) =>
+            OnDisconnected += async (sender, e) =>
             {
-                _reconnectTimer.Enabled = Identified;
                 _logger.Information($"OBS websocket client disconnected [status: {e.Status}][reason: {e.Reason}] " + (Identified ? "Will be attempting to reconnect every 30 seconds." : "Will not be attempting to reconnect."));
 
                 Connected = false;
                 Identified = false;
                 Streaming = false;
+
+                if (Identified)
+                    await Reconnect(_backoff);
             };
 
             if (!string.IsNullOrWhiteSpace(_configuration.Obs?.Host) && _configuration.Obs?.Port != null)
@@ -115,34 +113,6 @@ namespace TwitchChatTTS.OBS.Socket
             await handler.Execute(this, message);
         }
 
-        private async Task Reconnect(ElapsedEventArgs e)
-        {
-            if (Connected)
-            {
-                try
-                {
-                    await DisconnectAsync(new SocketDisconnectionEventArgs(WebSocketCloseStatus.Empty.ToString(), ""));
-                }
-                catch (Exception)
-                {
-                    _logger.Error("Failed to disconnect from OBS websocket server.");
-                }
-            }
-
-            try
-            {
-                await Connect();
-            }
-            catch (WebSocketException wse) when (wse.Message.Contains("502"))
-            {
-                _logger.Error($"OBS websocket server cannot be found. Be sure the server is on by looking at OBS > Tools > Websocket Server Settings [code: {wse.ErrorCode}]");
-            }
-            catch (Exception ex)
-            {
-                _logger.Error(ex, "Failed to reconnect to OBS websocket server.");
-            }
-        }
-
         public async Task Send(IEnumerable<RequestMessage> messages)
         {
             if (!Connected)

Seven/SevenApiClient.cs

@@ -23,12 +23,25 @@ public class SevenApiClient
         });
     }
 
-    public async Task<EmoteSet?> FetchChannelEmoteSet(string twitchId)
+    public async Task<EmoteSet?> FetchChannelEmoteSet(long twitchId)
     {
+        if (twitchId <= 0)
+        {
+            _logger.Warning("No valid Twitch Id was given for 7tv emotes.");
+            return null;
+        }
+
         try
         {
+            _logger.Debug($"Fetching 7tv information using Twitch Id [twitch id: {twitchId}]");
             var details = await _web.GetJson<UserDetails>($"{API_URL}/users/twitch/" + twitchId);
-            return details?.EmoteSet;
+            _logger.Information($"Fetched 7tv emotes [count: {details?.EmoteSet.EmoteCount ?? -1}]");
+            if (details?.EmoteSet == null)
+            {
+                _logger.Warning("Could not find 7tv emotes linked to your Twitch account.");
+                return null;
+            }
+            return details.EmoteSet;
         }
         catch (JsonException e)
         {

Seven/Socket/Data/ChangeMapMessage.cs

@@ -2,10 +2,10 @@ namespace TwitchChatTTS.Seven.Socket.Data
 {
     public class ChangeMapMessage
     {
-        public object Id { get; set; }
+        public required object Id { get; set; }
         public byte Kind { get; set; }
         public bool? Contextual { get; set; }
-        public object Actor { get; set; }
+        public required object Actor { get; set; }
         public IEnumerable<ChangeField>? Added { get; set; }
         public IEnumerable<ChangeField>? Updated { get; set; }
         public IEnumerable<ChangeField>? Removed { get; set; }
@@ -14,17 +14,17 @@ namespace TwitchChatTTS.Seven.Socket.Data
     }
 
     public class ChangeField {
-        public string Key { get; set; }
+        public required string Key { get; set; }
         public int? Index { get; set; }
         public bool Nested { get; set; }
-        public object OldValue { get; set; }
+        public required object OldValue { get; set; }
-        public object Value { get; set; }
+        public required object Value { get; set; }
     }
 
     public class EmoteField {
-        public string Id { get; set; }
+        public required string Id { get; set; }
-        public string Name { get; set; }
+        public required string Name { get; set; }
-        public string ActorId { get; set; }
+        public required string ActorId { get; set; }
         public int Flags { get; set; }
     }
 }

Seven/Socket/Data/DispatchMessage.cs

@@ -2,7 +2,7 @@ namespace TwitchChatTTS.Seven.Socket.Data
 {
     public class DispatchMessage
     {
-        public object EventType { get; set; }
+        public required object EventType { get; set; }
-        public ChangeMapMessage Body { get; set; }
+        public required ChangeMapMessage Body { get; set; }
     }
 }

Seven/Socket/Data/EndOfStreamMessage.cs

@@ -3,6 +3,6 @@ namespace TwitchChatTTS.Seven.Socket.Data
     public class EndOfStreamMessage
     {
         public int Code { get; set; }
-        public string Message { get; set; }
+        public required string Message { get; set; }
     }
 }

Seven/Socket/Data/ErrorMessage.cs

@@ -2,7 +2,7 @@ namespace TwitchChatTTS.Seven.Socket.Data
 {
     public class ErrorMessage
     {
-        public Exception Exception { get; set; }
+        public Exception? Exception { get; set; }
-        public string Message { get; set; }
+        public string? Message { get; set; }
     }
 }

Seven/Socket/Data/ReconnectMessage.cs

@@ -2,6 +2,6 @@ namespace TwitchChatTTS.Seven.Socket.Data
 {
     public class ReconnectMessage
     {
-        public string Reason { get; set; }
+        public required string Reason { get; set; }
     }
 }

Seven/Socket/Data/ResumeMessage.cs

@@ -2,6 +2,6 @@ namespace TwitchChatTTS.Seven.Socket.Data
 {
     public class ResumeMessage
     {
-        public string SessionId { get; set; }
+        public required string SessionId { get; set; }
     }
 }

Seven/Socket/Data/SevenHelloMessage.cs

@@ -3,7 +3,7 @@ namespace TwitchChatTTS.Seven.Socket.Data
     public class SevenHelloMessage
     {
         public uint HeartbeatInterval { get; set; }
-        public string SessionId { get; set; }
+        public required string SessionId { get; set; }
         public int SubscriptionLimit { get; set; }
     }
 }

Seven/Socket/Data/SubscribeMessage.cs

@@ -2,7 +2,7 @@ namespace TwitchChatTTS.Seven.Socket.Data
 {
     public class SubscribeMessage
     {
-        public string? Type { get; set; }
+        public required string Type { get; set; }
         public IDictionary<string, string>? Condition { get; set; }
     }
 }

Seven/Socket/Data/UnsubscribeMessage.cs

@@ -2,7 +2,7 @@ namespace TwitchChatTTS.Seven.Socket.Data
 {
     public class UnsubscribeMessage
     {
-        public string Type { get; set; }
+        public required string Type { get; set; }
         public IDictionary<string, string>? Condition { get; set; }
     }
 }

Seven/Socket/Handlers/DispatchHandler.cs

@@ -9,25 +9,28 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
 {
     public class DispatchHandler : IWebSocketHandler
     {
+        public int OperationCode { get; } = 0;
+
         private readonly ILogger _logger;
         private readonly IEmoteDatabase _emotes;
-        private readonly object _lock = new object();
+        private readonly Mutex _lock;
-        public int OperationCode { get; } = 0;
 
         public DispatchHandler(IEmoteDatabase emotes, ILogger logger)
         {
             _emotes = emotes;
             _logger = logger;
+            _lock = new Mutex();
         }
 
         public Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data data)
         {
-            if (data is not DispatchMessage message || message == null)
+            if (data is not DispatchMessage message || message == null || message.Body == null)
                 return Task.CompletedTask;
-            ApplyChanges(message?.Body?.Pulled, cf => cf.OldValue, true);
+
-            ApplyChanges(message?.Body?.Pushed, cf => cf.Value, false);
+            ApplyChanges(message.Body.Pulled, cf => cf.OldValue, true);
-            ApplyChanges(message?.Body?.Removed, cf => cf.OldValue, true);
+            ApplyChanges(message.Body.Pushed, cf => cf.Value, false);
-            ApplyChanges(message?.Body?.Updated, cf => cf.OldValue, false, cf => cf.Value);
+            ApplyChanges(message.Body.Removed, cf => cf.OldValue, true);
+            ApplyChanges(message.Body.Updated, cf => cf.OldValue, false, cf => cf.Value);
             return Task.CompletedTask;
         }
 
@@ -42,7 +45,7 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
                 if (value == null)
                     continue;
 
-                var o = JsonSerializer.Deserialize<EmoteField>(value.ToString(), new JsonSerializerOptions()
+                var o = JsonSerializer.Deserialize<EmoteField>(value.ToString()!, new JsonSerializerOptions()
                 {
                     PropertyNameCaseInsensitive = false,
                     PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower
@@ -50,8 +53,9 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
                 if (o == null)
                     continue;
 
-                lock (_lock)
+                try
                 {
+                    _lock.WaitOne();
                     if (removing)
                     {
                         if (_emotes.Get(o.Name) != o.Id)
@@ -71,8 +75,10 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
                         }
                         _emotes.Remove(o.Name);
                         var update = updater(val);
+                        if (update == null)
+                            continue;
 
-                        var u = JsonSerializer.Deserialize<EmoteField>(update.ToString(), new JsonSerializerOptions()
+                        var u = JsonSerializer.Deserialize<EmoteField>(update.ToString()!, new JsonSerializerOptions()
                         {
                             PropertyNameCaseInsensitive = false,
                             PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower
@@ -94,6 +100,10 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
                         _logger.Information($"Added 7tv emote [name: {o.Name}][id: {o.Id}]");
                     }
                 }
+                finally
+                {
+                    _lock.ReleaseMutex();
+                }
             }
         }
     }

Seven/Socket/Handlers/EndOfStreamHandler.cs

@@ -1,4 +1,3 @@
-using System.Net.WebSockets;
 using CommonSocketLibrary.Abstract;
 using CommonSocketLibrary.Common;
 using TwitchChatTTS.Seven.Socket.Data;
@@ -15,7 +14,7 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
                 return;
 
             var code = message.Code - 4000;
-            await sender.DisconnectAsync(new SocketDisconnectionEventArgs(WebSocketCloseStatus.Empty.ToString(), code.ToString()));
+            await sender.DisconnectAsync(new SocketDisconnectionEventArgs(message.Message, code.ToString()));
         }
     }
 }

Seven/Socket/Handlers/ErrorHandler.cs

@@ -17,13 +17,13 @@ namespace TwitchChatTTS.Seven.Socket.Handlers
 
         public Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data data)
         {
-            if (data is not ErrorMessage message || message == null)
+            if (data is not ErrorMessage message || message == null || message.Exception == null && message.Message == null)
                 return Task.CompletedTask;
 
             if (message.Exception != null)
-                _logger.Error(message.Exception, message.Message);
+                _logger.Error(message.Exception, message.Message ?? string.Empty);
             else
-                _logger.Error(message.Message);
+                _logger.Error(message.Message!);
             return Task.CompletedTask;
         }
     }

Seven/UserDetails.cs

@@ -4,18 +4,18 @@ namespace TwitchChatTTS.Seven
 {
     public class UserDetails
     {
-        public string Id { get; set; }
+        public required string Id { get; set; }
-        public string Platform { get; set; }
+        public required string Platform { get; set; }
-        public string Username { get; set; }
+        public required string DisplayName { get; set; }
         public int EmoteCapacity { get; set; }
-        public string EmoteSetId { get; set; }
+        public required string EmoteSetId { get; set; }
-        public EmoteSet EmoteSet { get; set; }
+        public required EmoteSet EmoteSet { get; set; }
-        public SevenUser User { get; set; }
+        public required SevenUser User { get; set; }
     }
 
     public class SevenUser
     {
-        public string Id { get; set; }
+        public required string Id { get; set; }
-        public string Username { get; set; }
+        public required string Username { get; set; }
     }
 }

Startup.cs

@@ -87,10 +87,22 @@ s.AddTransient<ICommandFactory, CommandFactory>();
 
 // Request acks
 s.AddSingleton<RequestAckManager>();
+s.AddTransient<IRequestAck, CreateGroupAck>();
+s.AddTransient<IRequestAck, CreateGroupChatterAck>();
+s.AddTransient<IRequestAck, CreateGroupPermissionAck>();
 s.AddTransient<IRequestAck, CreatePolicyAck>();
+s.AddTransient<IRequestAck, CreateRedeemableActionAck>();
+s.AddTransient<IRequestAck, CreateRedemptionAck>();
+s.AddTransient<IRequestAck, CreateTTSFilterAck>();
 s.AddTransient<IRequestAck, CreateTTSUserAck>();
 s.AddTransient<IRequestAck, CreateTTSVoiceAck>();
+s.AddTransient<IRequestAck, DeleteGroupAck>();
+s.AddTransient<IRequestAck, DeleteGroupChatterAck>();
+s.AddTransient<IRequestAck, DeleteGroupPermissionAck>();
 s.AddTransient<IRequestAck, DeletePolicyAck>();
+s.AddTransient<IRequestAck, DeleteRedeemableActionAck>();
+s.AddTransient<IRequestAck, DeleteRedemptionAck>();
+s.AddTransient<IRequestAck, DeleteTTSFilterAck>();
 s.AddTransient<IRequestAck, DeleteTTSVoiceAck>();
 s.AddTransient<IRequestAck, GetChatterIdsAck>();
 s.AddTransient<IRequestAck, GetConnectionsAck>();
@@ -104,8 +116,14 @@ s.AddTransient<IRequestAck, GetRedemptionsAck>();
 s.AddTransient<IRequestAck, GetTTSUsersAck>();
 s.AddTransient<IRequestAck, GetTTSVoicesAck>();
 s.AddTransient<IRequestAck, GetTTSWordFiltersAck>();
+s.AddTransient<IRequestAck, UpdateGroupAck>();
+s.AddTransient<IRequestAck, UpdateGroupChatterAck>();
+s.AddTransient<IRequestAck, UpdateGroupPermissionAck>();
 s.AddTransient<IRequestAck, UpdateDefaultTTSVoiceAck>();
 s.AddTransient<IRequestAck, UpdatePolicyAck>();
+s.AddTransient<IRequestAck, UpdateRedeemableActionAck>();
+s.AddTransient<IRequestAck, UpdateRedemptionAck>();
+s.AddTransient<IRequestAck, UpdateTTSFilterAck>();
 s.AddTransient<IRequestAck, UpdateTTSUserAck>();
 s.AddTransient<IRequestAck, UpdateTTSVoiceAck>();
 s.AddTransient<IRequestAck, UpdateTTSVoiceStateAck>();
@@ -129,6 +147,7 @@ s.AddSingleton<IChatterGroupManager, ChatterGroupManager>();
 s.AddSingleton<IGroupPermissionManager, GroupPermissionManager>();
 
 // OBS websocket
+s.AddKeyedSingleton<IBackoff>("obs", new ExponentialBackoff(1000, 120 * 1000));
 s.AddKeyedSingleton<IWebSocketHandler, HelloHandler>("obs");
 s.AddKeyedSingleton<IWebSocketHandler, IdentifiedHandler>("obs");
 s.AddKeyedSingleton<IWebSocketHandler, RequestResponseHandler>("obs");
@@ -165,7 +184,6 @@ s.AddKeyedTransient<SocketClient<TwitchWebsocketMessage>, TwitchWebsocketClient>
 {
     var factory = sp.GetRequiredService<ITwitchConnectionManager>();
     var client = factory.GetWorkingClient();
-    client.Connect().Wait();
     return client;
 });
 s.AddKeyedTransient<SocketClient<TwitchWebsocketMessage>, TwitchWebsocketClient>("twitch-create");
@@ -186,6 +204,7 @@ s.AddKeyedSingleton<ITwitchSocketHandler, ChannelFollowHandler>("twitch-notifica
 s.AddKeyedSingleton<ITwitchSocketHandler, ChannelRaidHandler>("twitch-notifications");
 s.AddKeyedSingleton<ITwitchSocketHandler, ChannelResubscriptionHandler>("twitch-notifications");
 s.AddKeyedSingleton<ITwitchSocketHandler, ChannelSubscriptionHandler>("twitch-notifications");
+s.AddKeyedSingleton<ITwitchSocketHandler, ChannelSubscriptionEndHandler>("twitch-notifications");
 s.AddKeyedSingleton<ITwitchSocketHandler, ChannelSubscriptionGiftHandler>("twitch-notifications");
 
 // hermes websocket
@@ -193,6 +212,8 @@ s.AddKeyedSingleton<IBackoff>("hermes", new ExponentialBackoff(1000, 15 * 1000))
 s.AddKeyedSingleton<IWebSocketHandler, HeartbeatHandler>("hermes");
 s.AddKeyedSingleton<IWebSocketHandler, LoginAckHandler>("hermes");
 s.AddKeyedSingleton<IWebSocketHandler, RequestAckHandler>("hermes");
+s.AddKeyedSingleton<IWebSocketHandler, LoggingHandler>("hermes");
+s.AddKeyedSingleton<IWebSocketHandler, SlaveHandler>("hermes");
 
 s.AddKeyedSingleton<MessageTypeManager<IWebSocketHandler>, HermesMessageTypeManager>("hermes");
 s.AddKeyedSingleton<SocketClient<WebSocketMessage>, HermesSocketClient>("hermes");

TTS.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Serilog;
-using NAudio.Wave.SampleProviders;
 using org.mariuszgromada.math.mxparser;
 using TwitchChatTTS.Hermes.Socket;
 using TwitchChatTTS.Seven.Socket;
@@ -13,15 +12,18 @@ using TwitchChatTTS.Twitch.Socket.Messages;
 using TwitchChatTTS.Twitch.Socket;
 using TwitchChatTTS.Chat.Commands;
 using System.Text;
-using TwitchChatTTS.Chat.Speech;
 using TwitchChatTTS.Veadotube;
+using TwitchChatTTS.Bus;
+using System.Reactive.Linq;
+using System.Net.WebSockets;
 
 namespace TwitchChatTTS
 {
     public class TTS : IHostedService
     {
         public const int MAJOR_VERSION = 4;
-        public const int MINOR_VERSION = 5;
+        public const int MINOR_VERSION = 9;
+        public const int PATCH_VERSION = 3;
 
         private readonly User _user;
         private readonly HermesApiClient _hermesApiClient;
@@ -34,8 +36,7 @@ namespace TwitchChatTTS
         private readonly ICommandFactory _commandFactory;
         private readonly ICommandManager _commandManager;
         private readonly IEmoteDatabase _emotes;
-        private readonly TTSPlayer _player;
+        private readonly ServiceBusCentral _bus;
-        private readonly AudioPlaybackEngine _playback;
         private readonly Configuration _configuration;
         private readonly ILogger _logger;
 
@@ -51,8 +52,7 @@ namespace TwitchChatTTS
             ICommandFactory commandFactory,
             ICommandManager commandManager,
             IEmoteDatabase emotes,
-            TTSPlayer player,
+            ServiceBusCentral bus,
-            AudioPlaybackEngine playback,
             Configuration configuration,
             ILogger logger
         )
@@ -68,9 +68,8 @@ namespace TwitchChatTTS
             _commandFactory = commandFactory;
             _commandManager = commandManager;
             _emotes = emotes;
+            _bus = bus;
             _configuration = configuration;
-            _player = player;
-            _playback = playback;
             _logger = logger;
         }
 
@@ -79,93 +78,107 @@ namespace TwitchChatTTS
             Console.Title = "TTS - Twitch Chat";
             Console.OutputEncoding = Encoding.UTF8;
             License.iConfirmCommercialUse("abcdef");
+            _user.Slave = true;
+
+            _logger.Information($"This is running on version {MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}.");
 
             if (string.IsNullOrWhiteSpace(_configuration.Hermes?.Token))
             {
-                _logger.Error("Hermes API token not set in the configuration file.");
+                _logger.Error("Tom to Speech API token not set in the configuration file.");
                 return;
             }
 
-            var hermesVersion = await _hermesApiClient.GetLatestTTSVersion();
-            if (hermesVersion == null)
-            {
-                _logger.Error("Failed to fetch latest TTS version. Something went wrong.");
-                return;
-            }
-            if (hermesVersion.MajorVersion > TTS.MAJOR_VERSION || hermesVersion.MajorVersion == TTS.MAJOR_VERSION && hermesVersion.MinorVersion > TTS.MINOR_VERSION)
-            {
-                _logger.Information($"A new update for TTS is avaiable! Version {hermesVersion.MajorVersion}.{hermesVersion.MinorVersion} is available at {hermesVersion.Download}");
-                var changes = hermesVersion.Changelog.Split("\n");
-                if (changes != null && changes.Any())
-                    _logger.Information("Changelog:\n  - " + string.Join("\n  - ", changes) + "\n\n");
-                await Task.Delay(15 * 1000);
-            }
-
-            await InitializeHermesWebsocket();
             try
             {
-                var hermesAccount = await _hermesApiClient.FetchHermesAccountDetails();
+                var hermesVersion = await _hermesApiClient.GetLatestTTSVersion();
-                _user.HermesUserId = hermesAccount.Id;
+                if (hermesVersion == null)
-                _user.HermesUsername = hermesAccount.Username;
-                _user.TwitchUsername = hermesAccount.Username;
-                _user.TwitchUserId = long.Parse(hermesAccount.BroadcasterId);
-            }
-            catch (ArgumentNullException)
-            {
-                _logger.Error("Ensure you have your Twitch account linked to TTS.");
-                await Task.Delay(TimeSpan.FromSeconds(30));
-                return;
-            }
-            catch (FormatException)
-            {
-                _logger.Error("Ensure you have your Twitch account linked to TTS.");
-                await Task.Delay(TimeSpan.FromSeconds(30));
-                return;
-            }
-            catch (Exception ex)
-            {
-                _logger.Error(ex, "Failed to initialize properly. Restart app please.");
-                await Task.Delay(TimeSpan.FromSeconds(30));
-                return;
-            }
-
-            _playback.AddOnMixerInputEnded((object? s, SampleProviderEventArgs e) =>
-            {
-                if (_player.Playing?.Audio == e.SampleProvider)
                 {
-                    _player.Playing = null;
+                    _logger.Error("Failed to fetch latest TTS version. Something went wrong.");
+                    return;
+                }
+                if (hermesVersion.MajorVersion > MAJOR_VERSION || hermesVersion.MajorVersion == MAJOR_VERSION && (hermesVersion.MinorVersion > MINOR_VERSION || hermesVersion.MinorVersion == MINOR_VERSION && (hermesVersion.PatchVersion == null || hermesVersion.PatchVersion > PATCH_VERSION)))
+                {
+                    _logger.Information($"A new update for TTS is avaiable! Version {hermesVersion.MajorVersion}.{hermesVersion.MinorVersion}.{hermesVersion.PatchVersion} is available at {hermesVersion.Download}");
+                    var changes = hermesVersion.Changelog.Split("\n");
+                    if (changes != null && changes.Any())
+                        _logger.Information("Changelog:\n  - " + string.Join("\n  - ", changes) + "\n\n");
+                    await Task.Delay(15 * 1000);
                 }
-            });
-
-            try
-            {
-                _veado.Initialize();
-                await _veado.Connect();
             }
-            catch (Exception e) {
+            catch
-                _logger.Warning(e, "Failed to connect to Veado websocket server.");
+            {
+                _logger.Warning("Failed to check for version updates.");
             }
 
-            try
+            var disposables = new List<IDisposable>();
-            {
+            var connected = _bus.GetTopic("tts_connected");
-                await _twitch.Connect();
-            }
-            catch (Exception e)
-            {
-                _logger.Error(e, "Failed to connect to Twitch websocket server.");
-                await Task.Delay(TimeSpan.FromSeconds(30));
-                return;
-            }
 
-            var emoteSet = await _sevenApiClient.FetchChannelEmoteSet(_user.TwitchUserId.ToString());
+            // 7tv
-            if (emoteSet != null)
+            disposables.Add(connected.FirstAsync().Subscribe(async (data) =>
-                _user.SevenEmoteSetId = emoteSet.Id;
+            {
+                if (data.Value is not User user)
+                {
+                    _logger.Warning("Something went wrong. Unable to fetch 7tv data.");
+                    return;
+                }
+                if (user.TwitchUserId == default)
+                {
+                    _logger.Warning("Unable to fetch 7tv data. If this is wrong, ensure your Tom to Speech token is valid.");
+                    return;
+                }
+
+                var emoteSet = await _sevenApiClient.FetchChannelEmoteSet(_user.TwitchUserId);
+                if (emoteSet != null)
+                {
+                    _user.SevenEmoteSetId = emoteSet.Id;
+                    _logger.Debug($"Fetched the 7tv emote set id [emote set id: {emoteSet.Id}]");
+                }
+
+                await InitializeEmotes(_sevenApiClient, emoteSet);
+                await InitializeSevenTv();
+            }));
+
+            disposables.Add(connected.FirstAsync().Subscribe(async (data) =>
+            {
+                if (data.Value is not User user)
+                {
+                    _logger.Warning("Something went wrong. Not connecting to Twitch.");
+                    return;
+                }
+                if (user.TwitchUserId == default)
+                {
+                    _logger.Warning("Not connecting to Twitch. If this is wrong, ensure your Tom to Speech token is valid.");
+                    return;
+                }
+
+                try
+                {
+                    await _twitch.Connect();
+                }
+                catch (Exception e)
+                {
+                    _logger.Error(e, "Failed to connect to Twitch websocket server.");
+                }
+            }));
 
             _commandManager.Update(_commandFactory);
 
-            await InitializeEmotes(_sevenApiClient, emoteSet);
+            await InitializeVeadotube();
-            await InitializeSevenTv();
+            await InitializeHermesWebsocket();
             await InitializeObs();
+
+            // Check if user has successfully connected.
+            await Task.Run(async () =>
+            {
+                await Task.Delay(TimeSpan.FromSeconds(5));
+                if (_user.TwitchUserId == default)
+                {
+                    _logger.Warning("Ensure your Tom to Speech token in the tts.config.yml file is valid.");
+                    _logger.Warning("Re-open the application once you have made sure the token is valid.");
+                }
+
+                disposables.ForEach(d => d.Dispose());
+            });
         }
 
         public Task StopAsync(CancellationToken cancellationToken)
@@ -184,6 +197,10 @@ namespace TwitchChatTTS
                 _hermes.Initialize();
                 await _hermes.Connect();
             }
+            catch (WebSocketException e) when (e.Message.Contains("The server returned status code '502'"))
+            {
+                _logger.Error("Could not connect to Tom to Speech server.");
+            }
             catch (Exception e)
             {
                 _logger.Error(e, "Connecting to hermes failed. Skipping hermes websockets.");
@@ -216,6 +233,19 @@ namespace TwitchChatTTS
             }
         }
 
+        private async Task InitializeVeadotube()
+        {
+            try
+            {
+                _veado.Initialize();
+                await _veado.Connect();
+            }
+            catch (Exception e)
+            {
+                _logger.Warning(e, "Failed to connect to Veado websocket server.");
+            }
+        }
+
         private async Task InitializeEmotes(SevenApiClient sevenapi, EmoteSet? channelEmotes)
         {
             var globalEmotes = await sevenapi.FetchGlobalSevenEmotes();

TTSListening.cs

@@ -11,25 +11,37 @@ namespace TwitchChatTTS
 {
     public class TTSListening : IHostedService
     {
+        private const string TTS_API_URL = "https://api.streamelements.com/kappa/v2/speech";
+
         private readonly AudioPlaybackEngine _playback;
         private readonly TTSPlayer _player;
         private readonly TTSConsumer _consumer;
         private readonly IDisposable _subscription;
+        private readonly User _user;
         private readonly ILogger _logger;
 
 
-        public TTSListening(AudioPlaybackEngine playback, TTSPlayer player, TTSPublisher publisher, TTSConsumer consumer, ILogger logger)
+        public TTSListening(AudioPlaybackEngine playback, TTSPlayer player, TTSPublisher publisher, TTSConsumer consumer, User user, ILogger logger)
         {
             _playback = playback;
             _player = player;
             _consumer = consumer;
             _subscription = publisher.Subscribe(consumer);
+            _user = user;
             _logger = logger;
         }
 
 
         public Task StartAsync(CancellationToken cancellationToken)
         {
+            _playback.AddOnMixerInputEnded((object? s, SampleProviderEventArgs e) =>
+            {
+                if (_player.Playing?.Audio == e.SampleProvider)
+                {
+                    _player.Playing = null;
+                }
+            });
+            
             Task.Run(async () =>
             {
                 while (true)
@@ -107,7 +119,7 @@ namespace TwitchChatTTS
 
                         try
                         {
-                            string url = $"https://api.streamelements.com/kappa/v2/speech?voice={message.Voice}&text={HttpUtility.UrlEncode(message.Message.Trim())}";
+                            string url = $"{TTS_API_URL}?key={_user.StreamElementsOverlayKey}&voice={message.Voice}&text={HttpUtility.UrlEncode(message.Message.Trim())}";
                             var nws = new NetworkWavSound(url);
                             var provider = new CachedWavProvider(nws);
                             var data = _playback.ConvertSound(provider);

Twitch/Redemptions/IRedemptionManager.cs

@@ -1,11 +1,18 @@
 using HermesSocketLibrary.Requests.Messages;
+using TwitchChatTTS.Twitch.Socket.Messages;
 
 namespace TwitchChatTTS.Twitch.Redemptions
 {
     public interface IRedemptionManager
     {
-        Task Execute(RedeemableAction action, string senderDisplayName, long senderId);
+        void Add(RedeemableAction action);
-        IList<RedeemableAction> Get(string twitchRedemptionId);
+        void Add(Redemption redemption);
-        void Initialize(IEnumerable<Redemption> redemptions, IDictionary<string, RedeemableAction> actions);
+        Task Execute(RedeemableAction action, string senderDisplayName, long senderId, string senderMessage);
+        IEnumerable<RedeemableAction> Get(string twitchRedemptionId);
+        void Initialize();
+        bool RemoveAction(string actionName);
+        bool RemoveRedemption(string redemptionId);
+        bool Update(Redemption redemption);
+        bool Update(RedeemableAction action);
     }
 }

Twitch/Redemptions/RedemptionManager.cs

@@ -7,7 +7,6 @@ using org.mariuszgromada.math.mxparser;
 using Serilog;
 using TwitchChatTTS.Bus;
 using TwitchChatTTS.Bus.Data;
-using TwitchChatTTS.Hermes.Socket;
 using TwitchChatTTS.OBS.Socket;
 using TwitchChatTTS.OBS.Socket.Data;
 using TwitchChatTTS.Veadotube;
@@ -16,59 +15,160 @@ namespace TwitchChatTTS.Twitch.Redemptions
 {
     public class RedemptionManager : IRedemptionManager
     {
-        private readonly IDictionary<string, IList<RedeemableAction>> _store;
+        private readonly IDictionary<string, RedeemableAction> _actions;
+        private readonly IDictionary<string, Redemption> _redemptions;
+        // twitch redemption id -> redemption ids
+        private readonly IDictionary<string, IList<string>> _redeems;
         private readonly ServiceBusCentral _bus;
         private readonly User _user;
         private readonly OBSSocketClient _obs;
-        private readonly HermesSocketClient _hermes;
         private readonly VeadoSocketClient _veado;
         private readonly NightbotApiClient _nightbot;
         private readonly AudioPlaybackEngine _playback;
         private readonly ILogger _logger;
         private readonly Random _random;
-        private bool _isReady;
+        private readonly ReaderWriterLockSlim _rwls;
 
 
         public RedemptionManager(
             ServiceBusCentral bus,
             User user,
             [FromKeyedServices("obs")] SocketClient<WebSocketMessage> obs,
-            [FromKeyedServices("hermes")] SocketClient<WebSocketMessage> hermes,
             [FromKeyedServices("veadotube")] SocketClient<object> veado,
             NightbotApiClient nightbot,
             AudioPlaybackEngine playback,
             ILogger logger)
         {
-            _store = new Dictionary<string, IList<RedeemableAction>>();
+            _actions = new Dictionary<string, RedeemableAction>();
+            _redemptions = new Dictionary<string, Redemption>();
+            _redeems = new Dictionary<string, IList<string>>();
             _bus = bus;
             _user = user;
             _obs = (obs as OBSSocketClient)!;
-            _hermes = (hermes as HermesSocketClient)!;
             _veado = (veado as VeadoSocketClient)!;
             _nightbot = nightbot;
             _playback = playback;
             _logger = logger;
             _random = new Random();
-            _isReady = false;
+            _rwls = new ReaderWriterLockSlim();
 
             var topic = _bus.GetTopic("redemptions_initiation");
-            topic.Subscribe(new ServiceBusObserver(data =>
+            topic.Subscribe(data =>
             {
-                if (data.Value is RedemptionInitiation obj)
+                if (data.Value is not RedemptionInitiation init)
-                    Initialize(obj.Redemptions, obj.Actions);
+                    return;
-            }, _logger));
+
+                if (init.Actions == null)
+                    init.Actions = new Dictionary<string, RedeemableAction>();
+                if (init.Redemptions == null)
+                    init.Redemptions = new List<Redemption>();
+
+                if (!init.Actions.Any())
+                    _logger.Warning("No redeemable actions were loaded.");
+
+                if (!init.Redemptions.Any())
+                    _logger.Warning("No redemptions were loaded.");
+
+                foreach (var action in init.Actions.Values)
+                    Add(action);
+
+                foreach (var redemption in init.Redemptions)
+                    Add(redemption);
+
+                Initialize();
+            });
         }
 
-        private void Add(string twitchRedemptionId, RedeemableAction action)
+        public void Add(RedeemableAction action)
         {
-            if (!_store.TryGetValue(twitchRedemptionId, out var actions))
+            if (!_actions.ContainsKey(action.Name))
-                _store.Add(twitchRedemptionId, actions = new List<RedeemableAction>());
+            {
-
+                _actions.Add(action.Name, action);
-            actions.Add(action);
+                _logger.Debug($"Added redeemable action to redemption manager [action name: {action.Name}]");
-            _logger.Debug($"Added redemption action [name: {action.Name}][type: {action.Type}]");
+            }
+            else
+            {
+                _actions[action.Name] = action;
+                _logger.Debug($"Updated redeemable action to redemption manager [action name: {action.Name}]");
+            }
         }
 
-        public async Task Execute(RedeemableAction action, string senderDisplayName, long senderId)
+        public void Add(Redemption redemption)
+        {
+            if (!_redemptions.ContainsKey(redemption.Id))
+            {
+                _redemptions.Add(redemption.Id, redemption);
+                _logger.Debug($"Added redemption to redemption manager [redemption id: {redemption.Id}]");
+            }
+            else
+            {
+                _redemptions[redemption.Id] = redemption;
+                _logger.Debug($"Updated redemption to redemption manager [redemption id: {redemption.Id}]");
+            }
+            Add(redemption.RedemptionId, redemption);
+        }
+
+        private void Add(string twitchRedemptionId, string redemptionId)
+        {
+            if (!_redeems.TryGetValue(twitchRedemptionId, out var redeems))
+                _redeems.Add(twitchRedemptionId, redeems = new List<string>());
+
+            var item = _redemptions.TryGetValue(redemptionId, out var r) ? r : null;
+            if (item == null)
+                return;
+
+            var redemptions = redeems.Select(r => _redemptions.TryGetValue(r, out var rr) ? rr : null);
+            bool added = false;
+            for (int i = 0; i < redeems.Count; i++)
+            {
+                if (redeems[i] != null && _redemptions.TryGetValue(redeems[i], out var rr))
+                {
+                    if (item.Order > rr.Order)
+                    {
+                        redeems.Insert(i, redemptionId);
+                        added = true;
+                        break;
+                    }
+                }
+            }
+            if (!added)
+                redeems.Add(redemptionId);
+            _logger.Debug($"Added redemption action [redemption id: {redemptionId}][twitch redemption id: {twitchRedemptionId}]");
+        }
+
+        private void Add(string twitchRedemptionId, Redemption item)
+        {
+            _rwls.EnterWriteLock();
+            try
+            {
+                if (!_redeems.TryGetValue(twitchRedemptionId, out var redemptionNames))
+                    _redeems.Add(twitchRedemptionId, redemptionNames = new List<string>());
+
+                var redemptions = redemptionNames.Select(r => _redemptions.TryGetValue(r, out var rr) ? rr : null);
+                bool added = false;
+                for (int i = 0; i < redemptionNames.Count; i++)
+                {
+                    if (redemptionNames[i] != null && _redemptions.TryGetValue(redemptionNames[i], out var rr))
+                    {
+                        if (item.Order > rr.Order)
+                        {
+                            redemptionNames.Insert(i, item.Id);
+                            added = true;
+                            break;
+                        }
+                    }
+                }
+                if (!added)
+                    redemptionNames.Add(item.Id);
+            }
+            finally
+            {
+                _rwls.ExitWriteLock();
+            }
+            _logger.Debug($"Added redemption action [redemption id: {item.Id}][twitch redemption id: {twitchRedemptionId}]");
+        }
+
+        public async Task Execute(RedeemableAction action, string senderDisplayName, long senderId, string senderMessage)
         {
             _logger.Debug($"Executing an action for a redemption [action: {action.Name}][action type: {action.Type}][chatter: {senderDisplayName}][chatter id: {senderId}]");
 
@@ -83,15 +183,33 @@ namespace TwitchChatTTS.Twitch.Redemptions
                 switch (action.Type)
                 {
                     case "WRITE_TO_FILE":
-                        Directory.CreateDirectory(Path.GetDirectoryName(action.Data["file_path"])!);
+                        {
-                        await File.WriteAllTextAsync(action.Data["file_path"], ReplaceContentText(action.Data["file_content"], senderDisplayName));
+                            string path = action.Data["file_path"];
-                        _logger.Debug($"Overwritten text to file [file: {action.Data["file_path"]}][chatter: {senderDisplayName}][chatter id: {senderId}]");
+                            if (string.IsNullOrWhiteSpace(path))
-                        break;
+                                return;
+
+                            string? directory = Path.GetDirectoryName(path);
+                            if (!string.IsNullOrWhiteSpace(directory))
+                                Directory.CreateDirectory(directory);
+
+                            await File.WriteAllTextAsync(path, ReplaceContentText(action.Data["file_content"], senderDisplayName, senderId, senderMessage));
+                            _logger.Debug($"Overwritten text to file [file: {action.Data["file_path"]}][chatter: {senderDisplayName}][chatter id: {senderId}]");
+                            break;
+                        }
                     case "APPEND_TO_FILE":
-                        Directory.CreateDirectory(Path.GetDirectoryName(action.Data["file_path"])!);
+                        {
-                        await File.AppendAllTextAsync(action.Data["file_path"], ReplaceContentText(action.Data["file_content"], senderDisplayName));
+                            string path = action.Data["file_path"];
-                        _logger.Debug($"Appended text to file [file: {action.Data["file_path"]}][chatter: {senderDisplayName}][chatter id: {senderId}]");
+                            if (string.IsNullOrWhiteSpace(path))
-                        break;
+                                return;
+
+                            string? directory = Path.GetDirectoryName(path);
+                            if (!string.IsNullOrWhiteSpace(directory))
+                                Directory.CreateDirectory(directory);
+
+                            await File.AppendAllTextAsync(path, ReplaceContentText(action.Data["file_content"], senderDisplayName, senderId, senderMessage));
+                            _logger.Debug($"Appended text to file [file: {action.Data["file_path"]}][chatter: {senderDisplayName}][chatter id: {senderId}]");
+                            break;
+                        }
                     case "OBS_TRANSFORM":
                         var type = typeof(OBSTransformationData);
                         await _obs.UpdateTransformation(action.Data["scene_name"], action.Data["scene_item_name"], (d) =>
@@ -147,6 +265,11 @@ namespace TwitchChatTTS.Twitch.Redemptions
                         break;
                     case "SPECIFIC_TTS_VOICE":
                     case "RANDOM_TTS_VOICE":
+                        if (_user.Slave)
+                        {
+                            _logger.Debug($"Ignoring channel redemption due to being a slave client [chatter id: {senderId}][source: redemption][chatter: {senderDisplayName}][chatter id: {senderId}]");
+                            break;
+                        }
                         string voiceId = string.Empty;
                         bool specific = action.Type == "SPECIFIC_TTS_VOICE";
 
@@ -192,12 +315,12 @@ namespace TwitchChatTTS.Twitch.Redemptions
 
                         if (_user.VoicesSelected.ContainsKey(senderId))
                         {
-                            await _hermes.UpdateTTSUser(senderId, voiceId);
+                            _bus.Send(this, "tts.user.voice.update", new Dictionary<string, object>() { { "chatter", senderId }, { "voice", voiceId } });
                             _logger.Debug($"Sent request to update chat TTS voice [voice: {voiceName}][chatter id: {senderId}][source: redemption][chatter: {senderDisplayName}][chatter id: {senderId}]");
                         }
                         else
                         {
-                            await _hermes.CreateTTSUser(senderId, voiceId);
+                            _bus.Send(this, "tts.user.voice.create", new Dictionary<string, object>() { { "chatter", senderId }, { "voice", voiceId } });
                             _logger.Debug($"Sent request to create chat TTS voice [voice: {voiceName}][chatter id: {senderId}][source: redemption][chatter: {senderDisplayName}][chatter id: {senderId}]");
                         }
                         break;
@@ -211,24 +334,50 @@ namespace TwitchChatTTS.Twitch.Redemptions
                         _logger.Debug($"Played an audio file for channel point redeem [file: {action.Data["file_path"]}][chatter: {senderDisplayName}][chatter id: {senderId}]");
                         break;
                     case "NIGHTBOT_PLAY":
+                        if (_user.Slave)
+                        {
+                            _logger.Debug($"Ignoring channel redemption due to being a slave client [chatter id: {senderId}][source: redemption][chatter: {senderDisplayName}][chatter id: {senderId}]");
+                            break;
+                        }
                         await _nightbot.Play();
                         break;
                     case "NIGHTBOT_PAUSE":
+                        if (_user.Slave)
+                        {
+                            _logger.Debug($"Ignoring channel redemption due to being a slave client [chatter id: {senderId}][source: redemption][chatter: {senderDisplayName}][chatter id: {senderId}]");
+                            break;
+                        }
                         await _nightbot.Pause();
                         break;
                     case "NIGHTBOT_SKIP":
+                        if (_user.Slave)
+                        {
+                            _logger.Debug($"Ignoring channel redemption due to being a slave client [chatter id: {senderId}][source: redemption][chatter: {senderDisplayName}][chatter id: {senderId}]");
+                            break;
+                        }
                         await _nightbot.Skip();
                         break;
                     case "NIGHTBOT_CLEAR_PLAYLIST":
+                        if (_user.Slave)
+                        {
+                            _logger.Debug($"Ignoring channel redemption due to being a slave client [chatter id: {senderId}][source: redemption][chatter: {senderDisplayName}][chatter id: {senderId}]");
+                            break;
+                        }
                         await _nightbot.ClearPlaylist();
                         break;
                     case "NIGHTBOT_CLEAR_QUEUE":
+                        if (_user.Slave)
+                        {
+                            _logger.Debug($"Ignoring channel redemption due to being a slave client [chatter id: {senderId}][source: redemption][chatter: {senderDisplayName}][chatter id: {senderId}]");
+                            break;
+                        }
                         await _nightbot.ClearQueue();
                         break;
                     case "VEADOTUBE_SET_STATE":
                         {
                             var state = _veado.GetStateId(action.Data["state"]);
-                            if (state == null) {
+                            if (state == null)
+                            {
                                 _logger.Warning($"Could not find the state named '{action.Data["state"]}'.");
                                 break;
                             }
@@ -238,7 +387,8 @@ namespace TwitchChatTTS.Twitch.Redemptions
                     case "VEADOTUBE_PUSH_STATE":
                         {
                             var state = _veado.GetStateId(action.Data["state"]);
-                            if (state == null) {
+                            if (state == null)
+                            {
                                 _logger.Warning($"Could not find the state named '{action.Data["state"]}'.");
                                 break;
                             }
@@ -248,7 +398,8 @@ namespace TwitchChatTTS.Twitch.Redemptions
                     case "VEADOTUBE_POP_STATE":
                         {
                             var state = _veado.GetStateId(action.Data["state"]);
-                            if (state == null) {
+                            if (state == null)
+                            {
                                 _logger.Warning($"Could not find the state named '{action.Data["state"]}'.");
                                 break;
                             }
@@ -256,7 +407,7 @@ namespace TwitchChatTTS.Twitch.Redemptions
                             break;
                         }
                     default:
-                        _logger.Warning($"Unknown redeemable action has occured. Update needed? [type: {action.Type}][chatter: {senderDisplayName}][chatter id: {senderId}]");
+                        _logger.Warning($"Unknown redeemable action has occured [type: {action.Type}][chatter: {senderDisplayName}][chatter id: {senderId}]");
                         break;
                 }
             }
@@ -266,53 +417,189 @@ namespace TwitchChatTTS.Twitch.Redemptions
             }
         }
 
-        public IList<RedeemableAction> Get(string twitchRedemptionId)
+        public IEnumerable<RedeemableAction> Get(string twitchRedemptionId)
         {
-            if (!_isReady)
+            _rwls.EnterReadLock();
-                throw new InvalidOperationException("Not ready");
+            try
-
+            {
-            if (_store.TryGetValue(twitchRedemptionId, out var actions))
+                if (_redeems.TryGetValue(twitchRedemptionId, out var redemptionIds))
-                return actions;
+                    return redemptionIds.Select(r => _redemptions.TryGetValue(r, out var redemption) ? redemption : null)
-            return new List<RedeemableAction>(0);
+                        .Where(r => r != null)
+                        .Select(r => _actions.TryGetValue(r!.ActionName, out var action) ? action : null)
+                        .Where(a => a != null)!;
+            }
+            finally
+            {
+                _rwls.ExitReadLock();
+            }
+            return [];
         }
 
-        public void Initialize(IEnumerable<Redemption> redemptions, IDictionary<string, RedeemableAction> actions)
+        public void Initialize()
         {
-            _store.Clear();
+            _rwls.EnterWriteLock();
-
+            try
-            var ordered = redemptions.Where(r => r != null).OrderBy(r => r.Order);
-            foreach (var redemption in ordered)
             {
-                if (redemption.ActionName == null)
+                _logger.Debug($"Redemption manager is about to initialize [redemption count: {_redemptions.Count()}][action count: {_actions.Count}]");
-                {
+                _redeems.Clear();
-                    _logger.Warning("Null value found for the action name of a redemption.");
-                    continue;
-                }
 
-                try
+                var ordered = _redemptions.Select(r => r.Value).Where(r => r != null).OrderBy(r => r.Order);
+                foreach (var redemption in ordered)
                 {
-                    if (actions.TryGetValue(redemption.ActionName, out var action) && action != null)
+                    if (redemption.ActionName == null)
                     {
-                        _logger.Debug($"Fetched a redemption action [redemption id: {redemption.Id}][redemption action: {redemption.ActionName}][order: {redemption.Order}]");
+                        _logger.Warning("Null value found for the action name of a redemption.");
-                        Add(redemption.RedemptionId, action);
+                        continue;
+                    }
+
+                    try
+                    {
+                        if (_actions.ContainsKey(redemption.ActionName))
+                        {
+                            _logger.Debug($"Fetched a redeemable action [redemption id: {redemption.Id}][redemption action: {redemption.ActionName}][order: {redemption.Order}]");
+                            Add(redemption.RedemptionId, redemption.Id);
+                        }
+                        else
+                            _logger.Warning($"Could not find redeemable action [redemption id: {redemption.Id}][redemption action: {redemption.ActionName}][order: {redemption.Order}]");
+                    }
+                    catch (Exception e)
+                    {
+                        _logger.Error(e, $"Failed to add a redemption [redemption id: {redemption.Id}][redemption action: {redemption.ActionName}][order: {redemption.Order}]");
                     }
-                    else
-                        _logger.Warning($"Could not find redemption action [redemption id: {redemption.Id}][redemption action: {redemption.ActionName}][order: {redemption.Order}]");
-                }
-                catch (Exception e)
-                {
-                    _logger.Error(e, $"Failed to add a redemption [redemption id: {redemption.Id}][redemption action: {redemption.ActionName}][order: {redemption.Order}]");
                 }
             }
+            finally
+            {
+                _rwls.ExitWriteLock();
+            }
 
-            _isReady = true;
             _logger.Debug("All redemptions added. Redemption Manager is ready.");
         }
 
-        private string ReplaceContentText(string content, string username)
+        public bool RemoveAction(string actionName)
         {
-            return content.Replace("%USER%", username)
+            _rwls.EnterWriteLock();
+            try
+            {
+                return _actions.Remove(actionName);
+            }
+            finally
+            {
+                _rwls.ExitWriteLock();
+            }
+        }
+
+        public bool RemoveRedemption(string redemptionId)
+        {
+            _rwls.EnterWriteLock();
+            try
+            {
+                if (!_redemptions.TryGetValue(redemptionId, out var redemption))
+                {
+                    return false;
+                }
+
+                _redemptions.Remove(redemptionId);
+                if (_redeems.TryGetValue(redemption.RedemptionId, out var redeem))
+                {
+                    redeem.Remove(redemptionId);
+                    if (!redeem.Any())
+                        _redeems.Remove(redemption.RedemptionId);
+                    return true;
+                }
+            }
+            finally
+            {
+                _rwls.ExitWriteLock();
+            }
+
+            return false;
+        }
+
+        private string ReplaceContentText(string content, string chatter, long chatterId, string message)
+        {
+            return content.Replace("%USER%", chatter)
+                .Replace("%chatter%", chatter)
+                .Replace("%chatterid%", chatterId.ToString())
+                .Replace("%broadcaster%", _user.TwitchUsername)
+                .Replace("%broadcasterid%", _user.TwitchUserId.ToString())
+                .Replace("%message%", message)
                 .Replace("\\n", "\n");
         }
+
+        public bool Update(Redemption redemption)
+        {
+            _rwls.EnterWriteLock();
+            try
+            {
+                if (_redemptions.TryGetValue(redemption.Id, out var r))
+                {
+                    if (r.Order != redemption.Order && _redeems.TryGetValue(redemption.RedemptionId, out var redeems) && redeems.Count > 1)
+                    {
+                        var redemptions = redeems.Select(r => _redemptions.TryGetValue(r, out var rr) ? rr : null).ToArray();
+                        int index = redeems.IndexOf(redemption.Id), i;
+                        if (r.Order < redemption.Order)
+                        {
+                            for (i = index; i >= 1; i--)
+                            {
+                                if (redemptions[i - 1] == null || redemption.Order < redemptions[i - 1]!.Order)
+                                    redeems[i] = redeems[i - 1];
+                                else
+                                    break;
+                            }
+                        }
+                        else
+                        {
+                            for (i = index; i < redeems.Count - 1; i++)
+                            {
+                                if (redemptions[i + 1] == null || redemption.Order > redemptions[i + 1]!.Order)
+                                    redeems[i] = redeems[i + 1];
+                                else
+                                    break;
+                            }
+                        }
+                        redeems[i] = redemption.Id;
+                    }
+                    else
+                    {
+                        r.ActionName = redemption.ActionName;
+                        r.State = redemption.State;
+                        r.RedemptionId = redemption.RedemptionId;
+                        r.Order = redemption.Order;
+                    }
+                    _logger.Debug($"Updated redemption in redemption manager [redemption id: {redemption.Id}][redemption action: {redemption.ActionName}]");
+                    return true;
+                }
+            }
+            finally
+            {
+                _rwls.ExitWriteLock();
+            }
+
+            _logger.Warning($"Cannot find redemption by name [redemption id: {redemption.Id}][redemption action: {redemption.ActionName}]");
+            return false;
+        }
+
+        public bool Update(RedeemableAction action)
+        {
+            _rwls.EnterWriteLock();
+            try
+            {
+                if (_actions.TryGetValue(action.Name, out var a))
+                {
+                    a.Type = action.Type;
+                    a.Data = action.Data;
+                    _logger.Debug($"Updated redeemable action in redemption manager [action name: {action.Name}]");
+                    return true;
+                }
+            }
+            finally
+            {
+                _rwls.ExitWriteLock();
+            }
+
+            _logger.Warning($"Cannot find redeemable action by name [action name: {action.Name}]");
+            return false;
+        }
     }
 }

Twitch/Socket/Handlers/ChannelAdBreakBeginHandler.cs

@@ -25,19 +25,19 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
             if (message.IsAutomatic)
                 _logger.Information($"Ad break has begun [duration: {message.DurationSeconds} seconds][automatic: true]");
             else
-                _logger.Information($"Ad break has begun [duration: {message.DurationSeconds} seconds][requester: {message.RequesterUserLogin}][requester id: {message.RequesterUserId}]");
+                _logger.Information($"Ad break has begun [duration: {message.DurationSeconds} seconds][automatic: false][requester: {message.RequesterUserLogin}][requester id: {message.RequesterUserId}]");
 
             try
             {
                 var actions = _redemptionManager.Get("adbreak_begin");
-                if (!actions.Any())
+                if (actions.Any())
                 {
-                    _logger.Debug($"Found {actions.Count} actions for this Twitch ad break");
+                    _logger.Debug($"Found {actions.Count()} actions for this Twitch ad break begin");
 
                     foreach (var action in actions)
                         try
                         {
-                            await _redemptionManager.Execute(action, message.RequesterUserLogin, long.Parse(message.RequesterUserId));
+                            await _redemptionManager.Execute(action, message.RequesterUserLogin, long.Parse(message.RequesterUserId), string.Empty);
                         }
                         catch (Exception ex)
                         {
@@ -46,25 +46,32 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
                 }
                 else
                     _logger.Debug($"No redeemable actions for ad break begin was found");
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex, $"Failed to fetch the redeemable actions for ad break begin");
+            }
 
 #pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-                Task.Run(async () =>
+            Task.Run(async () =>
+            {
+                try
                 {
                     await Task.Delay(TimeSpan.FromSeconds(message.DurationSeconds));
                     if (message.IsAutomatic)
                         _logger.Information($"Ad break has ended [duration: {message.DurationSeconds} seconds][automatic: true]");
                     else
-                        _logger.Information($"Ad break has ended [duration: {message.DurationSeconds} seconds][requester: {message.RequesterUserLogin}][requester id: {message.RequesterUserId}]");
+                        _logger.Information($"Ad break has ended [duration: {message.DurationSeconds} seconds][automatic: false][requester: {message.RequesterUserLogin}][requester id: {message.RequesterUserId}]");
-                    
+
-                    actions = _redemptionManager.Get("adbreak_end");
+                    var actions = _redemptionManager.Get("adbreak_end");
-                    if (!actions.Any())
+                    if (actions.Any())
                     {
-                        _logger.Debug($"Found {actions.Count} actions for this Twitch ad break");
+                        _logger.Debug($"Found {actions.Count()} actions for this Twitch ad break end");
 
                         foreach (var action in actions)
                             try
                             {
-                                await _redemptionManager.Execute(action, message.RequesterUserLogin, long.Parse(message.RequesterUserId));
+                                await _redemptionManager.Execute(action, message.RequesterUserLogin, long.Parse(message.RequesterUserId), string.Empty);
                             }
                             catch (Exception ex)
                             {
@@ -73,13 +80,13 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
                     }
                     else
                         _logger.Debug($"No redeemable actions for ad break end was found");
-                });
+                }
+                catch (Exception ex)
+                {
+                    _logger.Error(ex, $"Failed to fetch the redeemable actions for ad break end");
+                }
+            });
 #pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-            }
-            catch (Exception ex)
-            {
-                _logger.Error(ex, $"Failed to fetch the redeemable actions for ad break begin");
-            }
         }
     }
 }

Twitch/Socket/Handlers/ChannelChatMessageHandler.cs

@@ -1,4 +1,5 @@
 using Serilog;
+using TwitchChatTTS.Bus;
 using TwitchChatTTS.Chat.Commands;
 using TwitchChatTTS.Chat.Commands.Limits;
 using TwitchChatTTS.Chat.Groups;
@@ -13,11 +14,12 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
         public string Name => "channel.chat.message";
 
         private readonly IChatMessageReader _reader;
-        private readonly User _user;
         private readonly ICommandManager _commands;
         private readonly IGroupPermissionManager _permissionManager;
         private readonly IUsagePolicy<long> _permissionPolicy;
         private readonly IChatterGroupManager _chatterGroupManager;
+        private readonly ServiceBusCentral _bus;
+        private readonly User _user;
         private readonly ILogger _logger;
 
 
@@ -27,21 +29,19 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
             IGroupPermissionManager permissionManager,
             IUsagePolicy<long> permissionPolicy,
             IChatterGroupManager chatterGroupManager,
+            ServiceBusCentral bus,
             User user,
             ILogger logger
         )
         {
             _reader = reader;
-            _user = user;
             _commands = commands;
             _permissionManager = permissionManager;
             _permissionPolicy = permissionPolicy;
-
             _chatterGroupManager = chatterGroupManager;
+            _bus = bus;
+            _user = user;
             _logger = logger;
-
-            _permissionPolicy.Set("everyone", "tts", 100, TimeSpan.FromSeconds(15));
-            _permissionPolicy.Set("everyone", "tts.chat.messages.read", 3, TimeSpan.FromMilliseconds(15000));
         }
 
 
@@ -58,9 +58,16 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
             var groups = GetGroups(message.Badges, chatterId);
             var bits = GetTotalBits(fragments);
 
-            var commandResult = await CheckForChatCommand(message.Message.Text, message, groups);
+            if (message.ChannelPointsCustomRewardId == null && !_user.Slave)
-            if (commandResult != ChatCommandResult.Unknown)
+            {
-                return;
+                var commandResult = await CheckForChatCommand(message.Message.Text, message, groups);
+                if (commandResult != ChatCommandResult.Unknown)
+                    return;
+            }
+            else if (message.ChannelPointsCustomRewardId != null)
+            {
+                _bus.Send(this, "chat_message_redemption", message);
+            }
 
             string permission = GetPermissionPath(message.ChannelPointsCustomRewardId, bits);
             if (!HasPermission(chatterId, groups, permission))
@@ -106,15 +113,14 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
         {
             var defaultGroups = new string[] { "everyone" };
             var badgesGroups = badges.Select(b => b.SetId).Select(GetGroupNameByBadgeName);
-            var customGroups = _chatterGroupManager.GetGroupNamesFor(chatterId);
+            var customGroups = _chatterGroupManager.GetGroupNamesFor(chatterId).ToArray();
             return defaultGroups.Union(badgesGroups).Union(customGroups);
         }
 
         private int GetTotalBits(TwitchChatFragment[] fragments)
         {
             return fragments.Where(f => f.Type == "cheermote" && f.Cheermote != null)
-                .Select(f => f.Cheermote!.Bits)
+                .Sum(f => f.Cheermote!.Bits);
-                .Sum();
         }
 
         private string GetPermissionPath(string? customRewardId, int bits)
@@ -129,7 +135,7 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
 
         private bool HasPermission(long chatterId, IEnumerable<string> groups, string permissionPath)
         {
-            return chatterId == _user.OwnerId ? true : _permissionManager.CheckIfAllowed(groups, permissionPath) == true;
+            return chatterId == _user.OwnerId || _permissionManager.CheckIfAllowed(groups, permissionPath) == true;
         }
     }
 }

Twitch/Socket/Handlers/ChannelCustomRedemptionHandler.cs

@@ -1,4 +1,5 @@
 using Serilog;
+using TwitchChatTTS.Bus;
 using TwitchChatTTS.Twitch.Redemptions;
 using TwitchChatTTS.Twitch.Socket.Messages;
 
@@ -8,16 +9,38 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
     {
         public string Name => "channel.channel_points_custom_reward_redemption.add";
 
+        private readonly IDictionary<string, ChannelChatMessage> _messages;
         private readonly IRedemptionManager _redemptionManager;
+        private readonly ServiceBusCentral _bus;
         private readonly ILogger _logger;
 
         public ChannelCustomRedemptionHandler(
             IRedemptionManager redemptionManager,
+            ServiceBusCentral bus,
             ILogger logger
         )
         {
+            _messages = new Dictionary<string, ChannelChatMessage>();
             _redemptionManager = redemptionManager;
+            _bus = bus;
             _logger = logger;
+
+            var topic = _bus.GetTopic("chat_message_redemption");
+            topic.Subscribe((d) =>
+            {
+                var message = d.Value as ChannelChatMessage;
+
+                if (message != null && !string.IsNullOrEmpty(message.ChannelPointsCustomRewardId))
+                {
+                    _messages.Add(message.ChannelPointsCustomRewardId, message);
+
+                    Task.Run(async () =>
+                    {
+                        await Task.Delay(TimeSpan.FromMilliseconds(5000));
+                        _messages.Remove(message.ChannelPointsCustomRewardId);
+                    });
+                }
+            });
         }
 
         public async Task Execute(TwitchWebsocketClient sender, object data)
@@ -35,12 +58,34 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
                     _logger.Debug($"No redeemable actions for this redeem was found [redeem: {message.Reward.Title}][redeem id: {message.Reward.Id}][transaction: {message.Id}]");
                     return;
                 }
-                _logger.Debug($"Found {actions.Count} actions for this Twitch channel point redemption [redeem: {message.Reward.Title}][redeem id: {message.Reward.Id}][transaction: {message.Id}]");
+                _logger.Debug($"Found {actions.Count()} actions for this Twitch channel point redemption [redeem: {message.Reward.Title}][redeem id: {message.Reward.Id}][transaction: {message.Id}]");
+
+                ChannelChatMessage? chatMessage = null;
+                if (actions.Any(a => a.HasMessage))
+                {
+                    if (!_messages.TryGetValue(message.Reward.Id, out chatMessage))
+                    {
+                        DateTime start = DateTime.Now;
+                        _logger.Debug("Waiting on redemption message...");
+                        while (DateTime.Now - start < TimeSpan.FromMilliseconds(1000) && !_messages.ContainsKey(message.Reward.Id))
+                            await Task.Delay(100);
+
+                        if (!_messages.TryGetValue(message.Reward.Id, out chatMessage))
+                        {
+                            _logger.Warning("Chat message was not found within a second of the channel redemption being received. Skipping all redeemable actions.");
+                            return;
+                        }
+                    }
+
+                    if (chatMessage != null)
+                        _logger.Information($"Linked redemption to chat message [redemption id: {message.Reward.Id}][message id: {chatMessage.MessageId}].");
+                }
 
                 foreach (var action in actions)
                     try
                     {
-                        await _redemptionManager.Execute(action, message.UserName, long.Parse(message.UserId));
+
+                        await _redemptionManager.Execute(action, message.UserName, long.Parse(message.UserId), message.UserInput);
                     }
                     catch (Exception ex)
                     {

Twitch/Socket/Handlers/ChannelFollowHandler.cs

@@ -31,12 +31,12 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
                     _logger.Debug($"No redeemable actions for follow was found");
                     return;
                 }
-                _logger.Debug($"Found {actions.Count} actions for this Twitch follow");
+                _logger.Debug($"Found {actions.Count()} actions for this Twitch follow");
 
                 foreach (var action in actions)
                     try
                     {
-                        await _redemptionManager.Execute(action, message.UserName, long.Parse(message.UserId));
+                        await _redemptionManager.Execute(action, message.UserName, long.Parse(message.UserId), string.Empty);
                     }
                     catch (Exception ex)
                     {

Twitch/Socket/Handlers/ChannelResubscriptionHandler.cs

@@ -38,15 +38,15 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
                 var actions = _redemptionManager.Get("subscription");
                 if (!actions.Any())
                 {
-                    _logger.Debug($"No redeemable actions for this subscription was found [message: {message.Message.Text}]");
+                    _logger.Debug($"No redeemable actions for this subscription was found [chatter id: {message.UserId}][chatter: {message.UserName}][message: {message.Message.Text}]");
                     return;
                 }
-                _logger.Debug($"Found {actions.Count} actions for this Twitch subscription [message: {message.Message.Text}]");
+                _logger.Debug($"Found {actions.Count()} actions for this Twitch subscription [chatter id: {message.UserId}][chatter: {message.UserName}][message: {message.Message.Text}]");
 
                 foreach (var action in actions)
                     try
                     {
-                        await _redemptionManager.Execute(action, message.UserName!, long.Parse(message.UserId!));
+                        await _redemptionManager.Execute(action, message.UserName!, long.Parse(message.UserId!), message.Message.Text);
                     }
                     catch (Exception ex)
                     {

Twitch/Socket/Handlers/ChannelSubscriptionEndHandler.cs

@@ -0,0 +1,52 @@
+using Serilog;
+using TwitchChatTTS.Twitch.Redemptions;
+using TwitchChatTTS.Twitch.Socket.Messages;
+
+namespace TwitchChatTTS.Twitch.Socket.Handlers
+{
+    public class ChannelSubscriptionEndHandler : ITwitchSocketHandler
+    {
+        public string Name => "channel.subscription.end";
+
+        private readonly IRedemptionManager _redemptionManager;
+        private readonly ILogger _logger;
+
+        public ChannelSubscriptionEndHandler(IRedemptionManager redemptionManager, ILogger logger)
+        {
+            _redemptionManager = redemptionManager;
+            _logger = logger;
+        }
+
+        public async Task Execute(TwitchWebsocketClient sender, object data)
+        {
+            if (data is not ChannelSubscriptionEndMessage message)
+                return;
+
+            _logger.Information($"Subscription ended [chatter: {message.UserLogin}][chatter id: {message.UserId}][Tier: {message.Tier}]");
+            try
+            {
+                var actions = _redemptionManager.Get("subscription.end");
+                if (!actions.Any())
+                {
+                    _logger.Debug($"No redeemable actions for this subscription was found [subscriber: {message.UserLogin}][subscriber id: {message.UserId}]");
+                    return;
+                }
+                _logger.Debug($"Found {actions.Count()} actions for this Twitch subscription [subscriber: {message.UserLogin}][subscriber id: {message.UserId}]");
+
+                foreach (var action in actions)
+                    try
+                    {
+                        await _redemptionManager.Execute(action, message.UserName!, long.Parse(message.UserId!), string.Empty);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.Error(ex, $"Failed to execute redeemable action [action: {action.Name}][action type: {action.Type}][redeem: subscription][subscriber: {message.UserLogin}][subscriber id: {message.UserId}]");
+                    }
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex, $"Failed to fetch the redeemable actions for subscription [subscriber: {message.UserLogin}][subscriber id: {message.UserId}]");
+            }
+        }
+    }
+}

Twitch/Socket/Handlers/ChannelSubscriptionGiftHandler.cs

@@ -35,12 +35,12 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
                     _logger.Debug($"No redeemable actions for this gifted subscription was found");
                     return;
                 }
-                _logger.Debug($"Found {actions.Count} actions for this Twitch gifted subscription [gifted: {message.UserLogin}][gifted id: {message.UserId}][Anonymous: {message.IsAnonymous}][cumulative: {message.CumulativeTotal ?? -1}]");
+                _logger.Debug($"Found {actions.Count()} actions for this Twitch gifted subscription [gifted: {message.UserLogin}][gifted id: {message.UserId}][Anonymous: {message.IsAnonymous}][cumulative: {message.CumulativeTotal ?? -1}]");
 
                 foreach (var action in actions)
                     try
                     {
-                        await _redemptionManager.Execute(action, message.UserName ?? "Anonymous", message.UserId == null ? 0 : long.Parse(message.UserId));
+                        await _redemptionManager.Execute(action, message.UserName ?? "Anonymous", message.UserId == null ? 0 : long.Parse(message.UserId), string.Empty);
                     }
                     catch (Exception ex)
                     {

Twitch/Socket/Handlers/ChannelSubscriptionHandler.cs

@@ -33,12 +33,12 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
                     _logger.Debug($"No redeemable actions for this subscription was found [subscriber: {message.UserLogin}][subscriber id: {message.UserId}]");
                     return;
                 }
-                _logger.Debug($"Found {actions.Count} actions for this Twitch subscription [subscriber: {message.UserLogin}][subscriber id: {message.UserId}]");
+                _logger.Debug($"Found {actions.Count()} actions for this Twitch subscription [subscriber: {message.UserLogin}][subscriber id: {message.UserId}]");
 
                 foreach (var action in actions)
                     try
                     {
-                        await _redemptionManager.Execute(action, message.UserName!, long.Parse(message.UserId!));
+                        await _redemptionManager.Execute(action, message.UserName!, long.Parse(message.UserId!), string.Empty);
                     }
                     catch (Exception ex)
                     {

Twitch/Socket/Handlers/NotificationHandler.cs

@@ -37,11 +37,12 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
             _messageTypes.Add("channel.chat.clear_user_messages", typeof(ChannelChatClearUserMessage));
             _messageTypes.Add("channel.chat.message_delete", typeof(ChannelChatDeleteMessage));
             _messageTypes.Add("channel.channel_points_custom_reward_redemption.add", typeof(ChannelCustomRedemptionMessage));
-            _messageTypes.Add("channel.raid", typeof(ChannelRaidMessage));
             _messageTypes.Add("channel.follow", typeof(ChannelFollowMessage));
+            _messageTypes.Add("channel.raid", typeof(ChannelRaidMessage));
             _messageTypes.Add("channel.subscribe", typeof(ChannelSubscriptionMessage));
-            _messageTypes.Add("channel.subscription.message", typeof(ChannelResubscriptionMessage));
+            _messageTypes.Add("channel.subscription.end", typeof(ChannelSubscriptionEndMessage));
             _messageTypes.Add("channel.subscription.gift", typeof(ChannelSubscriptionGiftMessage));
+            _messageTypes.Add("channel.subscription.message", typeof(ChannelResubscriptionMessage));
         }
 
         public Task Execute(TwitchWebsocketClient sender, object data)

Twitch/Socket/Handlers/SessionWelcomeHandler.cs

@@ -29,18 +29,9 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
                 return;
             }
 
-            int waited = 0;
+            var twitchConnection = _user.TwitchConnection!;
-            while ((_user.TwitchUserId <= 0 || _user.TwitchConnection == null) && ++waited < 5)
+            _api.Initialize(twitchConnection.ClientId, twitchConnection.AccessToken);
-                await Task.Delay(TimeSpan.FromSeconds(1));
+            var span = twitchConnection.ExpiresAt - DateTime.Now;
-
-            if (_user.TwitchConnection == null)
-            {
-                _logger.Error("Ensure you have linked either your Twitch account or TTS' bot to your TTS account. Twitch client will not be connecting.");
-                return;
-            }
-
-            _api.Initialize(_user.TwitchConnection.ClientId, _user.TwitchConnection.AccessToken);
-            var span = _user.TwitchConnection.ExpiresAt - DateTime.Now;
             var timeLeft = span.Days >= 2 ? span.Days + " days" : (span.Hours >= 2 ? span.Hours + " hours" : span.Minutes + " minutes");
             if (span.Days >= 3)
                 _logger.Information($"Twitch connection has {timeLeft} before it is revoked.");
@@ -48,7 +39,7 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
                 _logger.Warning($"Twitch connection has {timeLeft} before it is revoked. Refreshing the token is soon required.");
             else
             {
-                _logger.Error("Twitch connection has its permissions revoked. Refresh the token. Twith client will not be connecting.");
+                _logger.Error($"Twitch connection has its permissions revoked. Refresh the token. Twitch client will not be connecting. [expired at: {twitchConnection.ExpiresAt}]");
                 return;
             }
 
@@ -61,6 +52,7 @@ namespace TwitchChatTTS.Twitch.Socket.Handlers
                     "channel.chat.clear",
                     "channel.chat.clear_user_messages",
                     "channel.subscribe",
+                    "channel.subscription.end",
                     "channel.subscription.gift",
                     "channel.subscription.message",
                     "channel.ad_break.begin",