From d13cd71ac01f8d2036bbfdbf57069cf1262bc2a0 Mon Sep 17 00:00:00 2001 From: Tom Date: Sat, 18 Jan 2025 21:52:15 +0000 Subject: [PATCH] Minor logging changes. --- Hermes/Socket/Requests/CreatePolicyAck.cs | 2 +- Hermes/Socket/Requests/GetPermissionsAck.cs | 2 +- Hermes/Socket/Requests/GetPoliciesAck.cs | 2 +- Hermes/Socket/Requests/UpdatePolicyAck.cs | 10 ++++++++-- Hermes/Socket/Requests/UpdateTTSFilterAck.cs | 8 +++++++- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Hermes/Socket/Requests/CreatePolicyAck.cs b/Hermes/Socket/Requests/CreatePolicyAck.cs index cce259f..3516afc 100644 --- a/Hermes/Socket/Requests/CreatePolicyAck.cs +++ b/Hermes/Socket/Requests/CreatePolicyAck.cs @@ -39,7 +39,7 @@ namespace TwitchChatTTS.Hermes.Socket.Requests var group = _groups.Get(policy.GroupId.ToString()); if (group == null) { - _logger.Warning($"Policy data is 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; } diff --git a/Hermes/Socket/Requests/GetPermissionsAck.cs b/Hermes/Socket/Requests/GetPermissionsAck.cs index b747633..4a4f0ab 100644 --- a/Hermes/Socket/Requests/GetPermissionsAck.cs +++ b/Hermes/Socket/Requests/GetPermissionsAck.cs @@ -66,7 +66,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."); } } diff --git a/Hermes/Socket/Requests/GetPoliciesAck.cs b/Hermes/Socket/Requests/GetPoliciesAck.cs index a49f019..8c62913 100644 --- a/Hermes/Socket/Requests/GetPoliciesAck.cs +++ b/Hermes/Socket/Requests/GetPoliciesAck.cs @@ -46,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}]"); diff --git a/Hermes/Socket/Requests/UpdatePolicyAck.cs b/Hermes/Socket/Requests/UpdatePolicyAck.cs index c2f75a1..f33d0c0 100644 --- a/Hermes/Socket/Requests/UpdatePolicyAck.cs +++ b/Hermes/Socket/Requests/UpdatePolicyAck.cs @@ -24,16 +24,22 @@ namespace TwitchChatTTS.Hermes.Socket.Requests public void Acknowledge(string requestId, string? json, IDictionary? requestData) { + if (json == null) + { + _logger.Warning($"Policy JSON data is null."); + return; + } + var policy = JsonSerializer.Deserialize(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; } diff --git a/Hermes/Socket/Requests/UpdateTTSFilterAck.cs b/Hermes/Socket/Requests/UpdateTTSFilterAck.cs index 9ef5787..27f8790 100644 --- a/Hermes/Socket/Requests/UpdateTTSFilterAck.cs +++ b/Hermes/Socket/Requests/UpdateTTSFilterAck.cs @@ -21,10 +21,16 @@ namespace TwitchChatTTS.Hermes.Socket.Requests public void Acknowledge(string requestId, string? json, IDictionary? requestData) { + if (json == null) + { + _logger.Warning($"TTS Filter JSON data is null."); + return; + } + var filter = JsonSerializer.Deserialize(json, _options); if (filter == null) { - _logger.Warning($"TTS Filter data failed: null"); + _logger.Warning($"TTS Filter data is null."); return; }