refactor notice handling

Author: CO2-code

MedalBOT/BotContext.cs

@@ -53,18 +53,6 @@ public class BotContext
         public Dictionary<string, DateTime> TimedMutes { get; set; }
             = new(StringComparer.OrdinalIgnoreCase);
 
-        // Track pending service requests (command ID → requester info)
-        public Dictionary<string, (string RequesterNick, bool IsDiscord)> PendingServiceRequests { get; set; }
-            = new();
-
-        // Buffer for accumulating ChanServ responses
-        public Dictionary<string, System.Collections.Generic.List<string>> ServiceResponseBuffer { get; set; }
-            = new();
-
-        // Track timeout for each pending request (requestId → lastReceivedTime)
-        public Dictionary<string, DateTime> ServiceResponseTimeouts { get; set; }
-            = new();
-
         private readonly object _voicedLock = new();
         private readonly object _muteLock = new();
         private const string MutedIdsFile = "muted_ids.txt";
@@ -263,25 +251,5 @@ private string ExtractIdent(string hostmask)
             if (at <= 0) return null;
             return hostmask.Substring(0, at);
         }
-
-        public void TrackServiceRequest(string commandId, string requesterNick, bool isDiscord)
-        {
-            PendingServiceRequests[commandId] = (requesterNick, isDiscord);
-        }
-
-        public bool GetServiceRequest(string commandId, out string requesterNick, out bool isDiscord)
-        {
-            requesterNick = null;
-            isDiscord = false;
-            
-            if (PendingServiceRequests.TryGetValue(commandId, out var request))
-            {
-                requesterNick = request.RequesterNick;
-                isDiscord = request.IsDiscord;
-                PendingServiceRequests.Remove(commandId);
-                return true;
-            }
-            return false;
-        }
     }
 }

MedalBOT/Commands/ChanServCommand.cs

@@ -64,11 +64,8 @@ public class ChanServCommand : ICommand
 
         private (bool, string) HandleBanList(BotContext ctx, string senderNick, bool isDiscord)
         {
-            string commandId = $"blist_{DateTime.UtcNow.Ticks}_{senderNick}";
-            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})");
+            ctx.Logger?.Log($"[CHANSERV] {senderNick} requested banlist for {ctx.Channel}");
             return (false, null);
         }
 

MedalBOT/Commands/SpamServCommand.cs

@@ -78,11 +78,8 @@ public class SpamServCommand : ICommand
 
         private (bool, string) HandleWordList(BotContext ctx, string senderNick, bool isDiscord)
         {
-            string commandId = $"wordlist_{DateTime.UtcNow.Ticks}_{senderNick}";
-            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})");
+            ctx.Logger?.Log($"[SPAMSERV] {senderNick} requested badwords list for {ctx.Channel}");
             return (false, null);
         }
 

MedalBOT/Program.cs

@@ -140,71 +140,18 @@ static async Task Main()
                     ParseWhoResponse(ctx, line);
                 }
 
-                // Capture ChanServ/SpamServ NOTICE replies (sent to bot nick for service requests)
-                if (line.Contains("NOTICE") && (line.Contains("ChanServ") || line.Contains("SpamServ")) && ctx.PendingServiceRequests.Count > 0)
+                // Forward ChanServ/SpamServ NOTICE messages directly to Discord
+                if (line.Contains("NOTICE") && (line.Contains("ChanServ") || line.Contains("SpamServ")))
                 {
                     string noticeContent = MessageParser.GetMessage(line);
                     if (!string.IsNullOrWhiteSpace(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;
-                        }
-                        
-                        ctx.Logger?.Log($"[SERVICE] Buffering response to {ctx.PendingServiceRequests.Count} active request(s): {noticeContent}");
+                        ctx.Logger?.Log($"[SERVICE NOTICE] {noticeContent}");
+                        await ctx.Discord?.SendMessage($"[SERVICE] {noticeContent}");
                     }
                     continue;
                 }
 
-                // Check for timed-out service responses (2 second timeout)
-                const int timeoutMs = 2000;
-                var expiredRequests = ctx.ServiceResponseTimeouts
-                    .Where(kvp => (DateTime.UtcNow - kvp.Value).TotalMilliseconds > timeoutMs)
-                    .Select(kvp => kvp.Key)
-                    .ToList();
-
-                foreach (var requestId in expiredRequests)
-                {
-                    if (ctx.PendingServiceRequests.TryGetValue(requestId, out var requestInfo) && 
-                        ctx.ServiceResponseBuffer.TryGetValue(requestId, out var responses) && 
-                        responses.Count > 0)
-                    {
-                        string requesterNick = requestInfo.RequesterNick;
-                        bool isDiscord = requestInfo.IsDiscord;
-
-                        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 for {requesterNick}...");
-                            await ctx.Discord?.SendMessage($"**{requesterNick}**:\n```\n{fullResponse}\n```");
-                        }
-                        else
-                        {
-                            foreach (var resp in responses)
-                            {
-                                writer.WriteLine($"PRIVMSG {ctx.Channel} :{resp}");
-                            }
-                        }
-
-                        // Clean up this specific request
-                        ctx.PendingServiceRequests.Remove(requestId);
-                        ctx.ServiceResponseBuffer.Remove(requestId);
-                        ctx.ServiceResponseTimeouts.Remove(requestId);
-                    }
-                }
-
                 if (line.Contains(" QUIT "))
                 {
                     string quitter = MessageParser.GetNick(line);