From 03d24b09057ee2b87ae5fcf66415173f8473e96f Mon Sep 17 00:00:00 2001
From: Tom <mail@goblincaves.com>
Date: Sat, 18 Jan 2025 22:45:36 +0000
Subject: [PATCH] Fixed more group stuffs.

---
 Chat/Groups/ChatterGroupManager.cs          | 13 ++++++++-----
 Hermes/Socket/Requests/DeleteGroupAck.cs    | 12 ++++++------
 Hermes/Socket/Requests/GetPermissionsAck.cs |  3 +++
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Chat/Groups/ChatterGroupManager.cs b/Chat/Groups/ChatterGroupManager.cs
index cf0e577..cce52b3 100644
--- a/Chat/Groups/ChatterGroupManager.cs
+++ b/Chat/Groups/ChatterGroupManager.cs
@@ -27,8 +27,10 @@ namespace TwitchChatTTS.Chat.Groups
         public void Add(long chatterId, string groupId)
         {
             if (_chatters.TryGetValue(chatterId, out var list))
+            {
                 if (!list.Contains(groupId))
                     list.Add(groupId);
+            }
             else
                 _chatters.Add(chatterId, new List<string>() { groupId });
         }
@@ -37,8 +39,9 @@ namespace TwitchChatTTS.Chat.Groups
         {
             if (_chatters.TryGetValue(chatter, out var list))
             {
-                foreach (var group in groupIds)
-                    list.Add(group);
+                foreach (var groupId in groupIds)
+                    if (!list.Contains(groupId))
+                        list.Add(groupId);
             }
             else
                 _chatters.Add(chatter, groupIds);
@@ -85,7 +88,7 @@ namespace TwitchChatTTS.Chat.Groups
 
         public void Modify(Group group)
         {
-            _groups[group.Name] = group;
+            _groups[group.Id] = group;
         }
 
         public bool Remove(string groupId)
@@ -104,10 +107,10 @@ namespace TwitchChatTTS.Chat.Groups
             if (_chatters.TryGetValue(chatterId, out var groups))
             {
                 groups.Remove(groupId);
-                _logger.Debug($"Removed chatter from group [chatter id: {chatterId}][group name: {_groups[groupId]}][group id: {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]}][group id: {groupId}]");
+            _logger.Debug($"Failed to remove chatter from group [chatter id: {chatterId}][group name: {_groups[groupId].Name}][group id: {groupId}]");
             return false;
         }
     }
diff --git a/Hermes/Socket/Requests/DeleteGroupAck.cs b/Hermes/Socket/Requests/DeleteGroupAck.cs
index a0e9709..88111b0 100644
--- a/Hermes/Socket/Requests/DeleteGroupAck.cs
+++ b/Hermes/Socket/Requests/DeleteGroupAck.cs
@@ -33,16 +33,16 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
                 return;
             }
 
-            var exists = _groups.Get(groupId);
-            if (exists == null)
+            var group = _groups.Get(groupId);
+            if (group == null)
             {
-                _logger.Warning($"Group id does not exist [group id: {exists}]");
+                _logger.Warning($"Group id does not exist [group id: {group}]");
                 return;
             }
 
-            _logger.Debug($"Removing group [group id: {exists.Id}][group name: {exists.Name}][group priority: {exists.Priority}]");
-            _groups.Remove(exists.Id);
-            _logger.Information($"Group has been updated [group id: {exists.Id}]");
+            _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}]");
         }
     }
 }
\ No newline at end of file
diff --git a/Hermes/Socket/Requests/GetPermissionsAck.cs b/Hermes/Socket/Requests/GetPermissionsAck.cs
index 4a4f0ab..50b935e 100644
--- a/Hermes/Socket/Requests/GetPermissionsAck.cs
+++ b/Hermes/Socket/Requests/GetPermissionsAck.cs
@@ -46,7 +46,10 @@ 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)
             {