Changed command dictionary to a command tree. Fixed various requests. OBS reconnection added if identified previously.
This commit is contained in:
@ -2,19 +2,18 @@ using CommonSocketLibrary.Abstract;
|
||||
using CommonSocketLibrary.Common;
|
||||
using Serilog;
|
||||
using TwitchChatTTS.OBS.Socket.Data;
|
||||
using TwitchChatTTS.OBS.Socket.Manager;
|
||||
|
||||
namespace TwitchChatTTS.OBS.Socket.Handlers
|
||||
{
|
||||
public class EventMessageHandler : IWebSocketHandler
|
||||
{
|
||||
private readonly OBSManager _manager;
|
||||
private readonly ILogger _logger;
|
||||
public int OperationCode { get; } = 5;
|
||||
|
||||
public EventMessageHandler(OBSManager manager, ILogger logger)
|
||||
public EventMessageHandler(
|
||||
ILogger logger
|
||||
)
|
||||
{
|
||||
_manager = manager;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
@ -22,6 +21,8 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
|
||||
{
|
||||
if (data is not EventMessage message || message == null)
|
||||
return;
|
||||
if (sender is not OBSSocketClient obs)
|
||||
return;
|
||||
|
||||
switch (message.EventType)
|
||||
{
|
||||
@ -31,10 +32,10 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
|
||||
|
||||
string? raw_state = message.EventData["outputState"].ToString();
|
||||
string? state = raw_state?.Substring(21).ToLower();
|
||||
_manager.Streaming = message.EventData["outputActive"].ToString().ToLower() == "true";
|
||||
obs.Streaming = message.EventData["outputActive"].ToString()!.ToLower() == "true";
|
||||
_logger.Warning("Stream " + (state != null && state.EndsWith("ing") ? "is " : "has ") + state + ".");
|
||||
|
||||
if (_manager.Streaming == false && state != null && !state.EndsWith("ing"))
|
||||
if (obs.Streaming == false && state != null && !state.EndsWith("ing"))
|
||||
{
|
||||
// Stream ended
|
||||
}
|
||||
|
Reference in New Issue
Block a user