From d5a99ada51cec6320f9fd4ed75736893e6cabd2a Mon Sep 17 00:00:00 2001 From: IllusionMan1212 Date: Fri, 15 Aug 2025 21:18:40 +0200 Subject: [PATCH] fix: better formatting for ERR_NEEDMOREPARAMS; display better information for LOCALUSERS and GLOBALUSERS --- irc/handler/handler.go | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/irc/handler/handler.go b/irc/handler/handler.go index 99c192c..cd8d38f 100644 --- a/irc/handler/handler.go +++ b/irc/handler/handler.go @@ -434,7 +434,13 @@ func handleLUSERME(msg irc.Message, client *irc.Client) { } func handleLOCALUSERS(msg irc.Message, client *irc.Client) { - message := msg.Parameters[1] + message := "" + + if len(msg.Parameters) > 2 { + message = msg.Parameters[3] + } else { + message = msg.Parameters[1] + } msgOpts := irc.MsgFmtOpts{ WithTimestamp: true, @@ -445,7 +451,13 @@ func handleLOCALUSERS(msg irc.Message, client *irc.Client) { } func handleGLOBALUSERS(msg irc.Message, client *irc.Client) { - message := msg.Parameters[1] + message := "" + + if len(msg.Parameters) > 2 { + message = msg.Parameters[3] + } else { + message = msg.Parameters[1] + } msgOpts := irc.MsgFmtOpts{ WithTimestamp: true, @@ -683,11 +695,11 @@ func handleNONICKNAMEGIVEN(msg irc.Message, client *irc.Client) { } func handleNEEDMOREPARAMS(msg irc.Message, client *irc.Client) { - message := msg.Parameters[1] + " " + msg.Parameters[2] + message := msg.Parameters[1] + ": " + msg.Parameters[2] msgOpts := irc.MsgFmtOpts{ WithTimestamp: true, - AsServerMsg: true, + AsErrorMsg: true, } client.Channels[0].AppendMsg(msg.Timestamp, message, msgOpts)