Fixed a lot of compiler warnings. Fixed 7tv connection.

This commit is contained in:
Tom
2025-01-17 00:54:47 +00:00
parent b8d0e8cfd8
commit 5e33d594d2
78 changed files with 314 additions and 235 deletions

View File

@ -5,11 +5,11 @@ namespace TwitchChatTTS.Twitch.Socket.Messages
public int DurationSeconds { get; set; }
public DateTime StartedAt { get; set; }
public bool IsAutomatic { get; set; }
public string BroadcasterUserId { get; set; }
public string BroadcasterUserLogin { get; set; }
public string BroadcasterUserName { get; set; }
public string RequesterUserId { get; set; }
public string RequesterUserLogin { get; set; }
public string RequesterUserName { get; set; }
public required string BroadcasterUserId { get; set; }
public required string BroadcasterUserLogin { get; set; }
public required string BroadcasterUserName { get; set; }
public required string RequesterUserId { get; set; }
public required string RequesterUserLogin { get; set; }
public required string RequesterUserName { get; set; }
}
}

View File

@ -2,16 +2,16 @@ namespace TwitchChatTTS.Twitch.Socket.Messages
{
public class ChannelBanMessage
{
public string UserId { get; set; }
public string UserLogin { get; set; }
public string UserName { get; set; }
public string BroadcasterUserId { get; set; }
public string BroadcasterUserLogin { get; set; }
public string BroadcasterUserName { get; set; }
public string ModeratorUserId { get; set; }
public string ModeratorUserLogin { get; set; }
public string ModeratorUserName { get; set; }
public string Reason { get; set; }
public required string UserId { get; set; }
public required string UserLogin { get; set; }
public required string UserName { get; set; }
public required string BroadcasterUserId { get; set; }
public required string BroadcasterUserLogin { get; set; }
public required string BroadcasterUserName { get; set; }
public required string ModeratorUserId { get; set; }
public required string ModeratorUserLogin { get; set; }
public required string ModeratorUserName { get; set; }
public required string Reason { get; set; }
public DateTime BannedAt { get; set; }
public DateTime? EndsAt { get; set; }
public bool IsPermanent { get; set; }

View File

@ -2,8 +2,8 @@ namespace TwitchChatTTS.Twitch.Socket.Messages
{
public class ChannelChatClearMessage
{
public string BroadcasterUserId { get; set; }
public string BroadcasterUserLogin { get; set; }
public string BroadcasterUserName { get; set; }
public required string BroadcasterUserId { get; set; }
public required string BroadcasterUserLogin { get; set; }
public required string BroadcasterUserName { get; set; }
}
}

View File

@ -2,8 +2,8 @@ namespace TwitchChatTTS.Twitch.Socket.Messages
{
public class ChannelChatClearUserMessage : ChannelChatClearMessage
{
public string TargetUserId { get; set; }
public string TargetUserLogin { get; set; }
public string TargetUserName { get; set; }
public required string TargetUserId { get; set; }
public required string TargetUserLogin { get; set; }
public required string TargetUserName { get; set; }
}
}

View File

@ -2,6 +2,6 @@ namespace TwitchChatTTS.Twitch.Socket.Messages
{
public class ChannelChatDeleteMessage : ChannelChatClearUserMessage
{
public string MessageId { get; set; }
public required string MessageId { get; set; }
}
}

View File

@ -2,16 +2,16 @@ namespace TwitchChatTTS.Twitch.Socket.Messages
{
public class ChannelChatMessage
{
public string BroadcasterUserId { get; set; }
public string BroadcasterUserLogin { get; set; }
public string BroadcasterUserName { get; set; }
public string ChatterUserId { get; set; }
public string ChatterUserLogin { get; set; }
public string ChatterUserName { get; set; }
public string MessageId { get; set; }
public TwitchChatMessageInfo Message { get; set; }
public string MessageType { get; set; }
public TwitchBadge[] Badges { get; set; }
public required string BroadcasterUserId { get; set; }
public required string BroadcasterUserLogin { get; set; }
public required string BroadcasterUserName { get; set; }
public required string ChatterUserId { get; set; }
public required string ChatterUserLogin { get; set; }
public required string ChatterUserName { get; set; }
public required string MessageId { get; set; }
public required TwitchChatMessageInfo Message { get; set; }
public required string MessageType { get; set; }
public required TwitchBadge[] Badges { get; set; }
public TwitchReplyInfo? Reply { get; set; }
public string? ChannelPointsCustomRewardId { get; set; }
public string? ChannelPointsAnimationId { get; set; }
@ -19,14 +19,14 @@ namespace TwitchChatTTS.Twitch.Socket.Messages
public class TwitchChatMessageInfo
{
public string Text { get; set; }
public TwitchChatFragment[] Fragments { get; set; }
public required string Text { get; set; }
public required TwitchChatFragment[] Fragments { get; set; }
}
public class TwitchChatFragment
{
public string Type { get; set; }
public string Text { get; set; }
public required string Type { get; set; }
public required string Text { get; set; }
public TwitchCheerInfo? Cheermote { get; set; }
public TwitchEmoteInfo? Emote { get; set; }
public TwitchMentionInfo? Mention { get; set; }
@ -34,42 +34,42 @@ namespace TwitchChatTTS.Twitch.Socket.Messages
public class TwitchCheerInfo
{
public string Prefix { get; set; }
public required string Prefix { get; set; }
public int Bits { get; set; }
public int Tier { get; set; }
}
public class TwitchEmoteInfo
{
public string Id { get; set; }
public string EmoteSetId { get; set; }
public string OwnerId { get; set; }
public string[] Format { get; set; }
public required string Id { get; set; }
public required string EmoteSetId { get; set; }
public required string OwnerId { get; set; }
public required string[] Format { get; set; }
}
public class TwitchMentionInfo
{
public string UserId { get; set; }
public string UserName { get; set; }
public string UserLogin { get; set; }
public required string UserId { get; set; }
public required string UserName { get; set; }
public required string UserLogin { get; set; }
}
public class TwitchBadge
{
public string SetId { get; set; }
public string Id { get; set; }
public string Info { get; set; }
public required string SetId { get; set; }
public required string Id { get; set; }
public required string Info { get; set; }
}
public class TwitchReplyInfo
{
public string ParentMessageId { get; set; }
public string ParentMessageBody { get; set; }
public string ParentUserId { get; set; }
public string ParentUserName { get; set; }
public string ParentUserLogin { get; set; }
public string ThreadMessageId { get; set; }
public string ThreadUserName { get; set; }
public string ThreadUserLogin { get; set; }
public required string ParentMessageId { get; set; }
public required string ParentMessageBody { get; set; }
public required string ParentUserId { get; set; }
public required string ParentUserName { get; set; }
public required string ParentUserLogin { get; set; }
public required string ThreadMessageId { get; set; }
public required string ThreadUserName { get; set; }
public required string ThreadUserLogin { get; set; }
}
}

View File

@ -2,23 +2,23 @@ namespace TwitchChatTTS.Twitch.Socket.Messages
{
public class ChannelCustomRedemptionMessage
{
public string BroadcasterUserId { get; set; }
public string BroadcasterUserLogin { get; set; }
public string BroadcasterUserName { get; set; }
public string Id { get; set; }
public string UserId { get; set; }
public string UserLogin { get; set; }
public string UserName { get; set; }
public string Status { get; set; }
public required string BroadcasterUserId { get; set; }
public required string BroadcasterUserLogin { get; set; }
public required string BroadcasterUserName { get; set; }
public required string Id { get; set; }
public required string UserId { get; set; }
public required string UserLogin { get; set; }
public required string UserName { get; set; }
public required string Status { get; set; }
public DateTime RedeemedAt { get; set; }
public RedemptionReward Reward { get; set; }
public required RedemptionReward Reward { get; set; }
}
public class RedemptionReward
{
public string Id { get; set; }
public string Title { get; set; }
public string Prompt { get; set; }
public required string Id { get; set; }
public required string Title { get; set; }
public required string Prompt { get; set; }
public int Cost { get; set; }
}
}

View File

@ -2,12 +2,12 @@ namespace TwitchChatTTS.Twitch.Socket.Messages
{
public class ChannelFollowMessage
{
public string BroadcasterUserId { get; set; }
public string BroadcasterUserLogin { get; set; }
public string BroadcasterUserName { get; set; }
public string UserId { get; set; }
public string UserLogin { get; set; }
public string UserName { get; set; }
public required string BroadcasterUserId { get; set; }
public required string BroadcasterUserLogin { get; set; }
public required string BroadcasterUserName { get; set; }
public required string UserId { get; set; }
public required string UserLogin { get; set; }
public required string UserName { get; set; }
public DateTime FollowedAt { get; set; }
}
}

View File

@ -2,12 +2,12 @@ namespace TwitchChatTTS.Twitch.Socket.Messages
{
public class ChannelRaidMessage
{
public string FromBroadcasterUserId { get; set; }
public string FromBroadcasterUserLogin { get; set; }
public string FromBroadcasterUserName { get; set; }
public string ToBroadcasterUserId { get; set; }
public string ToBroadcasterUserLogin { get; set; }
public string ToBroadcasterUserName { get; set; }
public required string FromBroadcasterUserId { get; set; }
public required string FromBroadcasterUserLogin { get; set; }
public required string FromBroadcasterUserName { get; set; }
public required string ToBroadcasterUserId { get; set; }
public required string ToBroadcasterUserLogin { get; set; }
public required string ToBroadcasterUserName { get; set; }
public int Viewers { get; set; }
}
}

View File

@ -2,7 +2,7 @@ namespace TwitchChatTTS.Twitch.Socket.Messages
{
public class ChannelResubscriptionMessage : ChannelSubscriptionData
{
public TwitchChatMessageInfo Message { get; set; }
public required TwitchChatMessageInfo Message { get; set; }
public int CumulativeMonths { get; set; }
public int StreakMonths { get; set; }
public int DurationMonths { get; set; }

View File

@ -5,10 +5,10 @@ namespace TwitchChatTTS.Twitch.Socket.Messages
public string? UserId { get; set; }
public string? UserLogin { get; set; }
public string? UserName { get; set; }
public string BroadcasterUserId { get; set; }
public string BroadcasterUserLogin { get; set; }
public string BroadcasterUserName { get; set; }
public string Tier { get; set; }
public required string BroadcasterUserId { get; set; }
public required string BroadcasterUserLogin { get; set; }
public required string BroadcasterUserName { get; set; }
public required string Tier { get; set; }
}
public class ChannelSubscriptionMessage : ChannelSubscriptionData

View File

@ -2,8 +2,8 @@ namespace TwitchChatTTS.Twitch.Socket.Messages
{
public class ChatterMessage
{
public string UserId { get; set; }
public string UserLogin { get; set; }
public string UserName { get; set; }
public required string UserId { get; set; }
public required string UserLogin { get; set; }
public required string UserName { get; set; }
}
}

View File

@ -2,14 +2,14 @@ namespace TwitchChatTTS.Twitch.Socket.Messages
{
public class NotificationMessage
{
public NotificationInfo Subscription { get; set; }
public object Event { get; set; }
public required NotificationInfo Subscription { get; set; }
public required object Event { get; set; }
}
public class NotificationInfo : EventSubscriptionMessage
{
public string Id { get; set; }
public string Status { get; set; }
public required string Id { get; set; }
public required string Status { get; set; }
public DateTime CreatedAt { get; set; }
public object? Event { get; set; }
}

View File

@ -2,11 +2,11 @@ namespace TwitchChatTTS.Twitch.Socket.Messages
{
public class SessionWelcomeMessage
{
public TwitchSocketSession Session { get; set; }
public required TwitchSocketSession Session { get; set; }
public class TwitchSocketSession {
public string Id { get; set; }
public string Status { get; set; }
public required string Id { get; set; }
public required string Status { get; set; }
public DateTime ConnectedAt { get; set; }
public int? KeepaliveTimeoutSeconds { get; set; }
public string? ReconnectUrl { get; set; }

View File

@ -2,13 +2,13 @@ namespace TwitchChatTTS.Twitch.Socket.Messages
{
public class TwitchWebsocketMessage
{
public TwitchMessageMetadata Metadata { get; set; }
public required TwitchMessageMetadata Metadata { get; set; }
public object? Payload { get; set; }
}
public class TwitchMessageMetadata {
public string MessageId { get; set; }
public string MessageType { get; set; }
public required string MessageId { get; set; }
public required string MessageType { get; set; }
public DateTime MessageTimestamp { get; set; }
}

View File

@ -20,13 +20,13 @@ namespace TwitchChatTTS.Twitch.Socket
private bool _disconnected;
private readonly object _lock;
public event EventHandler<EventArgs> OnIdentified;
public event EventHandler<EventArgs>? OnIdentified;
public string UID { get; }
public string URL;
public bool Connected { get; private set; }
public bool Identified { get; private set; }
public string SessionId { get; private set; }
public string? SessionId { get; private set; }
public bool ReceivedReconnecting { get; set; }
public bool TwitchReconnected { get; set; }