fix !blist

Author: CO2-code

MedalBOT/BotContext.cs

@@ -53,6 +53,10 @@ 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();
+
         private readonly object _voicedLock = new();
         private readonly object _muteLock = new();
         private const string MutedIdsFile = "muted_ids.txt";
@@ -251,5 +255,25 @@ 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

@@ -17,7 +17,7 @@ public class ChanServCommand : ICommand
                 return (true, "You must be an admin to use ChanServ commands.");
 
             if (message.StartsWith("!blist"))
-                return HandleBanList(ctx, senderNick);
+                return HandleBanList(ctx, senderNick, false);
 
             if (message.StartsWith("!addban"))
                 return HandleAddBan(ctx, senderNick, message);
@@ -31,10 +31,36 @@ public class ChanServCommand : ICommand
             return (false, null);
         }
 
-        private (bool, string) HandleBanList(BotContext ctx, string senderNick)
+        public (bool handled, string response) ProcessDiscord(BotContext ctx, string senderNick, string message)
         {
+            if (!message.StartsWith("!blist") && !message.StartsWith("!addban") && 
+                !message.StartsWith("!delban") && !message.StartsWith("!tb"))
+                return (false, null);
+
+            if (!ctx.Admins.Contains(senderNick))
+                return (true, "You must be an admin to use ChanServ commands.");
+
+            if (message.StartsWith("!blist"))
+                return HandleBanList(ctx, senderNick, true);
+
+            if (message.StartsWith("!addban"))
+                return HandleAddBan(ctx, senderNick, message);
+
+            if (message.StartsWith("!delban"))
+                return HandleDelBan(ctx, senderNick, message);
+
+            if (message.StartsWith("!tb"))
+                return HandleTimedBan(ctx, senderNick, message);
+
+            return (false, null);
+        }
+
+        private (bool, string) HandleBanList(BotContext ctx, string senderNick, bool isDiscord)
+        {
+            string commandId = $"blist_{DateTime.UtcNow.Ticks}";
+            ctx.TrackServiceRequest(commandId, senderNick, isDiscord);
             ctx.Writer?.WriteLine($"PRIVMSG ChanServ :bans {ctx.Channel}");
-            ctx.Logger?.Log($"[CHANSERV] {senderNick} requested banlist for {ctx.Channel}");
+            ctx.Logger?.Log($"[CHANSERV] {senderNick} requested banlist for {ctx.Channel} (ID: {commandId})");
             return (false, null);
         }
 
@@ -82,3 +108,5 @@ public class ChanServCommand : ICommand
     }
 }
 
+
+

MedalBOT/Program.cs

@@ -140,14 +140,32 @@ static async Task Main()
                     ParseWhoResponse(ctx, line);
                 }
 
-                // Relay ChanServ/SpamServ NOTICE replies to channel
+                // Relay ChanServ/SpamServ NOTICE replies to channel or Discord
                 if (line.Contains("NOTICE") && line.Contains("ChanServ"))
                 {
                     string message = MessageParser.GetMessage(line);
                     if (!string.IsNullOrWhiteSpace(message))
                     {
-                        writer.WriteLine($"PRIVMSG {ctx.Channel} :{message}");
-                        ctx.Logger?.Log($"[CHANSERV RELAY] {message}");
+                        // Extract last command ID - simple FIFO approach for recent requests
+                        var lastRequest = ctx.PendingServiceRequests.LastOrDefault();
+                        if (lastRequest.Key != null && ctx.GetServiceRequest(lastRequest.Key, out string requesterNick, out bool isDiscord))
+                        {
+                            ctx.Logger?.Log($"[CHANSERV RELAY] Sending to {(isDiscord ? "Discord" : "IRC")}: {message}");
+                            if (isDiscord)
+                            {
+                                await ctx.Discord?.SendMessage($"**{requesterNick}** - {message}");
+                            }
+                            else
+                            {
+                                writer.WriteLine($"PRIVMSG {ctx.Channel} :{message}");
+                            }
+                        }
+                        else
+                        {
+                            // No pending request, relay to IRC channel
+                            writer.WriteLine($"PRIVMSG {ctx.Channel} :{message}");
+                            ctx.Logger?.Log($"[CHANSERV RELAY] {message}");
+                        }
                     }
                 }
 

MedalBOT/Services/DiscordBotService.cs

@@ -13,12 +13,14 @@ public class DiscordBotService
         private ISocketMessageChannel _channel;
         private readonly ulong _channelId;
         private SayCommand _sayCommand;
+        private ChanServCommand _chanServCommand;
 
         public DiscordBotService(BotContext ctx, ulong channelId)
         {
             _ctx = ctx;
             _channelId = channelId;
             _sayCommand = new SayCommand();
+            _chanServCommand = new ChanServCommand();
 
             _client = new DiscordSocketClient(new DiscordSocketConfig
             {
@@ -58,11 +60,20 @@ private async Task OnMessageReceived(SocketMessage msg)
 
             if (content.StartsWith("!"))
             {
+                // Check for ChanServ commands from Discord
+                var (handled, response) = _chanServCommand.ProcessDiscord(_ctx, msg.Author.Username, content);
+                if (handled && !string.IsNullOrEmpty(response))
+                {
+                    await msg.Channel.SendMessageAsync(response);
+                    return;
+                }
+
+                // Regular command processing
                 var commandManager = new CommandManager();
-                string response = commandManager.TryProcess(_ctx, msg.Author.Username, content, content);
+                string cmdResponse = commandManager.TryProcess(_ctx, msg.Author.Username, content, content);
 
-                if (!string.IsNullOrEmpty(response))
-                    await msg.Channel.SendMessageAsync(response);
+                if (!string.IsNullOrEmpty(cmdResponse))
+                    await msg.Channel.SendMessageAsync(cmdResponse);
             }
 
             if (!_ctx.RelayDiscordToIrc) return;