Merge pull request #305 from rGunti/bugfix/timer-messages-not-working

Fixed a bug that caused timer messages to be sent to all Twitch channels

src/FloppyBot.Chat.Agent/ChatAgent.cs

@@ -69,6 +69,16 @@ private void OnMessageReceived(IChatInterface sourceInterface, ChatMessage chatM
     private void OnReplyReceived(ChatMessage message)
     {
         _logger.LogTrace("Received reply message {@Message}", message);
+        if (!_chatInterface.CanHandleMessageAsResponse(message))
+        {
+            _logger.LogDebug(
+                "Received reply message that cannot be handled by {ChatInterface} (Message Identifier={@MessageIdentifier})",
+                _chatInterface.Name,
+                message.Identifier
+            );
+            return;
+        }
+
         _chatInterface.SendMessage(message.Identifier, message.Content);
     }
 }

src/FloppyBot.Chat.Twitch/TwitchChatInterface.cs

@@ -88,12 +88,32 @@ public void Disconnect()
 
     public void SendMessage(ChatMessageIdentifier referenceMessage, string message)
     {
+        if (referenceMessage.IsNewMessage)
+        {
+            _logger.LogDebug("Message is not linked to a request, sending it as a new one instead");
+            SendMessage(referenceMessage.GetChannel(), message);
+            return;
+        }
+
+        _logger.LogTrace(
+            "Sending reply message to channel {TwitchChannel} referring to message {ReplyMessageId}: {ChatMessage}",
+            referenceMessage.Channel,
+            referenceMessage.ToString(),
+            message
+        );
         LineSplitter(
             message,
             line => _client.SendReply(referenceMessage.Channel, referenceMessage.MessageId, line)
         );
     }
 
+    public bool CanHandleMessageAsResponse(ChatMessage message)
+    {
+        var msgIdentifier = message.Identifier;
+        return msgIdentifier.Interface == IF_NAME
+            && msgIdentifier.Channel == _configuration.Channel;
+    }
+
     public event ChatMessageReceivedDelegate? MessageReceived;
 
     public void Dispose()
@@ -110,6 +130,11 @@ public void SendMessage(string message)
     public void SendMessage(ChannelIdentifier channel, string message)
     {
         var twitchChannel = channel.Channel.ToLowerInvariant();
+        _logger.LogTrace(
+            "Sending message to channel {TwitchChannel}: {ChatMessage}",
+            twitchChannel,
+            message
+        );
         LineSplitter(message, line => _client.SendMessage(twitchChannel, line));
     }
 

src/FloppyBot.Chat/Entities/Identifiers/ChatMessageIdentifier.cs

@@ -10,6 +10,8 @@ public record ChatMessageIdentifier(string Interface, string Channel, string Mes
 {
     public const string NEW_MESSAGE_ID = "new";
 
+    public bool IsNewMessage => MessageId == NEW_MESSAGE_ID;
+
     public static implicit operator string(ChatMessageIdentifier identifier) =>
         identifier.ToString();
 

src/FloppyBot.Chat/IChatInterface.cs

@@ -1,3 +1,4 @@
+using FloppyBot.Chat.Entities;
 using FloppyBot.Chat.Entities.Identifiers;
 
 namespace FloppyBot.Chat;
@@ -12,5 +13,10 @@ public interface IChatInterface : IDisposable
 
     void SendMessage(ChatMessageIdentifier referenceMessage, string message);
 
+    bool CanHandleMessageAsResponse(ChatMessage message)
+    {
+        return message.Identifier.Interface == Name;
+    }
+
     event ChatMessageReceivedDelegate MessageReceived;
 }

src/FloppyBot.Chat/Mock/MockChatInterface.cs

@@ -54,6 +54,11 @@ public void SendMessage(ChatMessageIdentifier _, string message)
         SendMessage(message);
     }
 
+    public bool CanHandleMessageAsResponse(ChatMessage message)
+    {
+        return true;
+    }
+
     public event ChatMessageReceivedDelegate? MessageReceived;
 
     public void Dispose()