From e7a3b2a3675571085ddeb13a4a90da2b121131bc Mon Sep 17 00:00:00 2001 From: Tom Date: Fri, 17 Jan 2025 04:38:03 +0000 Subject: [PATCH] Added TTS Voice & TTS Voice State data classes. Renamed certain classes. Fixed some compiler warnings. --- Requests/Messages/EmoteInfo.cs | 4 ++-- Requests/Messages/Group.cs | 5 +++-- Requests/Messages/GroupChatter.cs | 4 +++- Requests/Messages/GroupInfo.cs | 6 +++--- Requests/Messages/GroupPermission.cs | 7 ++++--- .../Messages/Policy.cs | 8 ++++---- Requests/Messages/RedeemableAction.cs | 7 ++++--- Requests/Messages/Redemption.cs | 7 ++++--- Requests/Messages/TTSVoice.cs | 8 ++++++++ Requests/Messages/TTSVoiceState.cs | 9 +++++++++ Requests/Messages/TTSWordFilter.cs | 15 +++++---------- Requests/Messages/VoiceDetails.cs | 8 -------- Socket/Data/ChatterMessage.cs | 4 ++-- Socket/Data/Connection.cs | 13 +++++++------ Socket/Data/EmoteDetailsMessage.cs | 2 +- Socket/Data/EmoteUsageMessage.cs | 4 ++-- Socket/Data/HermesLoginMessage.cs | 4 ++-- Socket/Data/LoginAckMessage.cs | 5 ++++- Socket/Data/RequestAckMessage.cs | 1 + Socket/Data/RequestMessage.cs | 4 ++-- 20 files changed, 70 insertions(+), 55 deletions(-) rename Socket/Data/PolicyMessage.cs => Requests/Messages/Policy.cs (51%) create mode 100644 Requests/Messages/TTSVoice.cs create mode 100644 Requests/Messages/TTSVoiceState.cs delete mode 100644 Requests/Messages/VoiceDetails.cs diff --git a/Requests/Messages/EmoteInfo.cs b/Requests/Messages/EmoteInfo.cs index c4c8e1c..0cf104e 100644 --- a/Requests/Messages/EmoteInfo.cs +++ b/Requests/Messages/EmoteInfo.cs @@ -2,7 +2,7 @@ namespace HermesSocketLibrary.Requests.Messages { public class EmoteInfo { - public string Id { get; set; } - public string Name { get; set; } + public required string Id { get; set; } + public required string Name { get; set; } } } \ No newline at end of file diff --git a/Requests/Messages/Group.cs b/Requests/Messages/Group.cs index b1a3894..5d1544a 100644 --- a/Requests/Messages/Group.cs +++ b/Requests/Messages/Group.cs @@ -2,8 +2,9 @@ namespace HermesSocketLibrary.Requests.Messages { public class Group { - public string Id { get; set; } - public string Name { get; set; } + public required string Id { get; set; } + public required string UserId { get; set; } + public required string Name { get; set; } public int Priority { get; set; } } } \ No newline at end of file diff --git a/Requests/Messages/GroupChatter.cs b/Requests/Messages/GroupChatter.cs index 50c5f35..5ac6e7b 100644 --- a/Requests/Messages/GroupChatter.cs +++ b/Requests/Messages/GroupChatter.cs @@ -2,7 +2,9 @@ namespace HermesSocketLibrary.Requests.Messages { public class GroupChatter { - public string GroupId { get; set; } + public required string UserId { get; set; } + public required string GroupId { get; set; } public long ChatterId { get; set;} + public required string ChatterLabel { get; set; } } } \ No newline at end of file diff --git a/Requests/Messages/GroupInfo.cs b/Requests/Messages/GroupInfo.cs index 66903ff..ae49a4c 100644 --- a/Requests/Messages/GroupInfo.cs +++ b/Requests/Messages/GroupInfo.cs @@ -2,8 +2,8 @@ namespace HermesSocketLibrary.Requests.Messages { public class GroupInfo { - public IEnumerable Groups { get; set; } - public IEnumerable GroupChatters { get; set; } - public IEnumerable GroupPermissions { get; set; } + public required IEnumerable Groups { get; set; } + public required IEnumerable GroupChatters { get; set; } + public required IEnumerable GroupPermissions { get; set; } } } \ No newline at end of file diff --git a/Requests/Messages/GroupPermission.cs b/Requests/Messages/GroupPermission.cs index 4d7b21d..704c0ae 100644 --- a/Requests/Messages/GroupPermission.cs +++ b/Requests/Messages/GroupPermission.cs @@ -2,9 +2,10 @@ namespace HermesSocketLibrary.Requests.Messages { public class GroupPermission { - public string Id { get; set; } - public string GroupId { get; set; } - public string Path { get; set; } + public required string Id { get; set; } + public required string UserId { get; set; } + public required string GroupId { get; set; } + public required string Path { get; set; } public bool? Allow { get; set; } } } \ No newline at end of file diff --git a/Socket/Data/PolicyMessage.cs b/Requests/Messages/Policy.cs similarity index 51% rename from Socket/Data/PolicyMessage.cs rename to Requests/Messages/Policy.cs index 29edffc..bdebcf6 100644 --- a/Socket/Data/PolicyMessage.cs +++ b/Requests/Messages/Policy.cs @@ -1,11 +1,11 @@ -namespace HermesSocketServer.Models +namespace HermesSocketServer.Messages { - public class PolicyMessage + public class Policy { public Guid Id { get; set; } - public string UserId { get; set; } + public required string UserId { get; set; } public Guid GroupId { get; set; } - public string Path { get; set; } + public required string Path { get; set; } public int Usage { get; set; } public int Span { get; set; } } diff --git a/Requests/Messages/RedeemableAction.cs b/Requests/Messages/RedeemableAction.cs index e3689ec..ea666bf 100644 --- a/Requests/Messages/RedeemableAction.cs +++ b/Requests/Messages/RedeemableAction.cs @@ -2,8 +2,9 @@ namespace HermesSocketLibrary.Requests.Messages { public class RedeemableAction { - public string Name { get; set; } - public string Type { get; set; } - public IDictionary Data { get; set; } + public required string UserId { get; set; } + public required string Name { get; set; } + public required string Type { get; set; } + public required IDictionary Data { get; set; } } } \ No newline at end of file diff --git a/Requests/Messages/Redemption.cs b/Requests/Messages/Redemption.cs index 5046700..95b158a 100644 --- a/Requests/Messages/Redemption.cs +++ b/Requests/Messages/Redemption.cs @@ -2,9 +2,10 @@ namespace HermesSocketLibrary.Requests.Messages { public class Redemption { - public string Id { get; set; } - public string RedemptionId { get; set; } - public string ActionName { get; set; } + public required string Id { get; set; } + public required string UserId { get; set; } + public required string RedemptionId { get; set; } + public required string ActionName { get; set; } public int Order { get; set; } public bool State { get; set; } } diff --git a/Requests/Messages/TTSVoice.cs b/Requests/Messages/TTSVoice.cs new file mode 100644 index 0000000..e63740b --- /dev/null +++ b/Requests/Messages/TTSVoice.cs @@ -0,0 +1,8 @@ +namespace HermesSocketLibrary.Requests.Messages +{ + public class TTSVoice + { + public required string Id { get; set; } + public required string Name { get; set; } + } +} \ No newline at end of file diff --git a/Requests/Messages/TTSVoiceState.cs b/Requests/Messages/TTSVoiceState.cs new file mode 100644 index 0000000..9938bd8 --- /dev/null +++ b/Requests/Messages/TTSVoiceState.cs @@ -0,0 +1,9 @@ +namespace HermesSocketLibrary.Requests.Messages +{ + public class TTSVoiceState + { + public required string Id { get; set; } + public required string UserId { get; set; } + public bool Enabled { get; set; } + } +} \ No newline at end of file diff --git a/Requests/Messages/TTSWordFilter.cs b/Requests/Messages/TTSWordFilter.cs index c5a1de7..9c1a9ff 100644 --- a/Requests/Messages/TTSWordFilter.cs +++ b/Requests/Messages/TTSWordFilter.cs @@ -5,17 +5,12 @@ namespace HermesSocketLibrary.Requests.Messages { public class TTSWordFilter { - public string? Id { get; set; } - public string? Search { get; set; } - public string? Replace { get; set; } + public required string Id { get; set; } + public required string UserId { get; set; } + public required string Search { get; set; } + public required string Replace { get; set; } + public int Flag { get; set; } [JsonIgnore] public Regex? Regex { get; set; } - public bool IsRegex { get; set; } - - - public TTSWordFilter() - { - IsRegex = true; - } } } \ No newline at end of file diff --git a/Requests/Messages/VoiceDetails.cs b/Requests/Messages/VoiceDetails.cs deleted file mode 100644 index b89b1a6..0000000 --- a/Requests/Messages/VoiceDetails.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace HermesSocketLibrary.Requests.Messages -{ - public class VoiceDetails - { - public string Id { get; set; } - public string Name { get; set; } - } -} \ No newline at end of file diff --git a/Socket/Data/ChatterMessage.cs b/Socket/Data/ChatterMessage.cs index 0de9b54..e871820 100644 --- a/Socket/Data/ChatterMessage.cs +++ b/Socket/Data/ChatterMessage.cs @@ -2,7 +2,7 @@ namespace HermesSocketLibrary.Socket.Data { public class ChatterMessage { - public long Id { get; set; } - public string Name { get; set; } + public required long Id { get; set; } + public required string Name { get; set; } } } \ No newline at end of file diff --git a/Socket/Data/Connection.cs b/Socket/Data/Connection.cs index e91e93a..1f37e39 100644 --- a/Socket/Data/Connection.cs +++ b/Socket/Data/Connection.cs @@ -2,12 +2,13 @@ namespace HermesSocketLibrary.Socket.Data { public class Connection { - public string Name { get; set; } - public string Type { get; set; } - public string ClientId { get; set; } - public string AccessToken { get; set; } - public string GrantType { get; set; } - public string Scope { get; set; } + public required string UserId { get; set; } + public required string Name { get; set; } + public required string Type { get; set; } + public required string ClientId { get; set; } + public required string AccessToken { get; set; } + public required string GrantType { get; set; } + public required string Scope { get; set; } public DateTime ExpiresAt { get; set; } public bool Default { get; set; } } diff --git a/Socket/Data/EmoteDetailsMessage.cs b/Socket/Data/EmoteDetailsMessage.cs index b2c9cff..0316293 100644 --- a/Socket/Data/EmoteDetailsMessage.cs +++ b/Socket/Data/EmoteDetailsMessage.cs @@ -2,6 +2,6 @@ namespace HermesSocketLibrary.Socket.Data { public class EmoteDetailsMessage { - public IDictionary Emotes { get; set; } + public required IDictionary Emotes { get; set; } } } \ No newline at end of file diff --git a/Socket/Data/EmoteUsageMessage.cs b/Socket/Data/EmoteUsageMessage.cs index d5fcf9d..f727aaa 100644 --- a/Socket/Data/EmoteUsageMessage.cs +++ b/Socket/Data/EmoteUsageMessage.cs @@ -2,10 +2,10 @@ namespace HermesSocketLibrary.Socket.Data { public class EmoteUsageMessage { - public string MessageId { get; set; } + public required string MessageId { get; set; } public DateTime DateTime { get; set; } public long BroadcasterId { get; set; } - public ICollection Emotes { get; set; } + public required ICollection Emotes { get; set; } public long ChatterId { get; set; } } } \ No newline at end of file diff --git a/Socket/Data/HermesLoginMessage.cs b/Socket/Data/HermesLoginMessage.cs index c1ffad4..d17026c 100644 --- a/Socket/Data/HermesLoginMessage.cs +++ b/Socket/Data/HermesLoginMessage.cs @@ -2,8 +2,8 @@ namespace HermesSocketLibrary.Socket.Data { public class HermesLoginMessage { - public string ApiKey { get; set; } - public string Password { get; set; } + public required string ApiKey { get; set; } + public string? Password { get; set; } public bool WebLogin { get; set; } public int? MajorVersion { get; set; } public int? MinorVersion { get; set; } diff --git a/Socket/Data/LoginAckMessage.cs b/Socket/Data/LoginAckMessage.cs index 161961f..c091c11 100644 --- a/Socket/Data/LoginAckMessage.cs +++ b/Socket/Data/LoginAckMessage.cs @@ -5,6 +5,9 @@ namespace HermesSocketLibrary.Socket.Data public class LoginAckMessage { public string UserId { get; set; } + public string ProviderAccountId { get; set; } + public string SessionId { get; set; } + public string UserName { get; set; } public bool AnotherClient { get; set; } public long? OwnerId { get; set; } public bool Admin { get; set; } @@ -14,7 +17,7 @@ namespace HermesSocketLibrary.Socket.Data public IList EnabledTTSVoices { get; set; } public IDictionary TTSVoicesAvailable { get; set; } - public IList WordFilters { get; set; } + public IEnumerable WordFilters { get; set; } public IList Connections { get; set; } } diff --git a/Socket/Data/RequestAckMessage.cs b/Socket/Data/RequestAckMessage.cs index 4e78142..169108a 100644 --- a/Socket/Data/RequestAckMessage.cs +++ b/Socket/Data/RequestAckMessage.cs @@ -5,5 +5,6 @@ namespace HermesSocketLibrary.Socket.Data public RequestMessage? Request { get; set; } public string? Nounce { get; set; } public object? Data { get; set; } + public string? Error { get; set; } } } \ No newline at end of file diff --git a/Socket/Data/RequestMessage.cs b/Socket/Data/RequestMessage.cs index f2a7e68..6cb30f9 100644 --- a/Socket/Data/RequestMessage.cs +++ b/Socket/Data/RequestMessage.cs @@ -2,8 +2,8 @@ namespace HermesSocketLibrary.Socket.Data { public class RequestMessage { - public string RequestId { get; set; } - public string? Type { get; set; } + public string? RequestId { get; set; } + public required string Type { get; set; } public IDictionary? Data { get; set; } public string? Nounce { get; set; } }