...

Author: CO2-code

MedalBOT/BotContext.cs

@@ -65,9 +65,6 @@ public class BotContext
         public Dictionary<string, DateTime> ServiceResponseTimeouts { get; set; }
             = new();
 
-        // Current active service request ID (one at a time)
-        public string CurrentServiceRequestId { get; set; }
-
         private readonly object _voicedLock = new();
         private readonly object _muteLock = new();
         private const string MutedIdsFile = "muted_ids.txt";

MedalBOT/Commands/ChanServCommand.cs

@@ -65,8 +65,8 @@ public class ChanServCommand : ICommand
         private (bool, string) HandleBanList(BotContext ctx, string senderNick, bool isDiscord)
         {
             string commandId = $"blist_{DateTime.UtcNow.Ticks}_{senderNick}";
-            ctx.CurrentServiceRequestId = commandId;
             ctx.TrackServiceRequest(commandId, senderNick, isDiscord);
+            ctx.ServiceResponseTimeouts[commandId] = DateTime.UtcNow;
             ctx.Writer?.WriteLine($"PRIVMSG ChanServ :bans {ctx.Channel}");
             ctx.Logger?.Log($"[CHANSERV] {senderNick} requested banlist for {ctx.Channel} (ID: {commandId})");
             return (false, null);

MedalBOT/Commands/SpamServCommand.cs

@@ -79,8 +79,8 @@ public class SpamServCommand : ICommand
         private (bool, string) HandleWordList(BotContext ctx, string senderNick, bool isDiscord)
         {
             string commandId = $"wordlist_{DateTime.UtcNow.Ticks}_{senderNick}";
-            ctx.CurrentServiceRequestId = commandId;
             ctx.TrackServiceRequest(commandId, senderNick, isDiscord);
+            ctx.ServiceResponseTimeouts[commandId] = DateTime.UtcNow;
             ctx.Writer?.WriteLine($"PRIVMSG SpamServ :listbadwords {ctx.Channel}");
             ctx.Logger?.Log($"[SPAMSERV] {senderNick} requested badwords list for {ctx.Channel} (ID: {commandId})");
             return (false, null);

MedalBOT/Program.cs

@@ -141,23 +141,26 @@ static async Task Main()
                 }
 
                 // Capture ChanServ/SpamServ NOTICE replies (sent to bot nick for service requests)
-                if (line.Contains("NOTICE") && (line.Contains("ChanServ") || line.Contains("SpamServ")) && !string.IsNullOrWhiteSpace(ctx.CurrentServiceRequestId))
+                if (line.Contains("NOTICE") && (line.Contains("ChanServ") || line.Contains("SpamServ")) && ctx.PendingServiceRequests.Count > 0)
                 {
                     string noticeContent = MessageParser.GetMessage(line);
                     if (!string.IsNullOrWhiteSpace(noticeContent))
                     {
-                        string requestId = ctx.CurrentServiceRequestId;
-                        
-                        // Initialize buffer if needed
-                        if (!ctx.ServiceResponseBuffer.ContainsKey(requestId))
-                            ctx.ServiceResponseBuffer[requestId] = new System.Collections.Generic.List<string>();
-                        
-                        // Add to buffer
-                        ctx.ServiceResponseBuffer[requestId].Add(noticeContent);
-                        ctx.Logger?.Log($"[SERVICE] Buffering response ({ctx.ServiceResponseBuffer[requestId].Count} lines): {noticeContent}");
+                        // Append to ALL active request buffers (ChanServ replies are sequential)
+                        foreach (var requestId in ctx.PendingServiceRequests.Keys.ToList())
+                        {
+                            // Initialize buffer if needed
+                            if (!ctx.ServiceResponseBuffer.ContainsKey(requestId))
+                                ctx.ServiceResponseBuffer[requestId] = new System.Collections.Generic.List<string>();
+                            
+                            // Add to buffer
+                            ctx.ServiceResponseBuffer[requestId].Add(noticeContent);
+                            
+                            // Update timeout for this request
+                            ctx.ServiceResponseTimeouts[requestId] = DateTime.UtcNow;
+                        }
 
-                        // Reset timeout - update last received time
-                        ctx.ServiceResponseTimeouts[requestId] = DateTime.UtcNow;
+                        ctx.Logger?.Log($"[SERVICE] Buffering response to {ctx.PendingServiceRequests.Count} active request(s): {noticeContent}");
                     }
                     continue;
                 }
@@ -178,13 +181,13 @@ static async Task Main()
                         string requesterNick = requestInfo.RequesterNick;
                         bool isDiscord = requestInfo.IsDiscord;
 
-                        ctx.Logger?.Log($"[SERVICE TIMEOUT] Response complete: {responses.Count} lines for {requesterNick}");
+                        ctx.Logger?.Log($"[SERVICE TIMEOUT] Request {requestId} complete: {responses.Count} lines for {requesterNick}");
 
                         string fullResponse = string.Join("\n", responses);
 
                         if (isDiscord)
                         {
-                            ctx.Logger?.Log($"[SERVICE RELAY] Sending to Discord...");
+                            ctx.Logger?.Log($"[SERVICE RELAY] Sending to Discord for {requesterNick}...");
                             await ctx.Discord?.SendMessage($"**{requesterNick}**:\n```\n{fullResponse}\n```");
                         }
                         else
@@ -195,11 +198,10 @@ static async Task Main()
                             }
                         }
 
-                        // Clean up
+                        // Clean up this specific request
                         ctx.PendingServiceRequests.Remove(requestId);
                         ctx.ServiceResponseBuffer.Remove(requestId);
                         ctx.ServiceResponseTimeouts.Remove(requestId);
-                        ctx.CurrentServiceRequestId = null;
                     }
                 }