From edbbdc9ca5acb7b62f2c1472c8e1cd1b102ff12c Mon Sep 17 00:00:00 2001
From: user <user@inference.local>
Date: Fri, 4 Sep 2026 05:52:26 +0000
Subject: [PATCH] style: satisfy golangci-lint on the round-6 changes

nolintlint: gosec was not firing on the deferred Close.
nonamedreturns + varnamelen in collapseUserModeOps.
---
 internal/ircserver/conn.go  |  2 +-
 internal/service/service.go | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/internal/ircserver/conn.go b/internal/ircserver/conn.go
index 06060b6..12b330e 100644
--- a/internal/ircserver/conn.go
+++ b/internal/ircserver/conn.go
@@ -161,7 +161,7 @@ func (c *Conn) Disconnect(reason string) {
 func (c *Conn) notifyKilledAndClose(
 	nick, host, reason string,
 ) {
-	defer c.conn.Close() //nolint:errcheck,gosec
+	defer c.conn.Close() //nolint:errcheck
 
 	c.sendWithin(
 		killWriteWindow,
diff --git a/internal/service/service.go b/internal/service/service.go
index b4c3a49..6ba7302 100644
--- a/internal/service/service.go
+++ b/internal/service/service.go
@@ -1070,20 +1070,22 @@ func isKnownUserModeChar(modeChar rune) bool {
 // defence-in-depth only.
 func collapseUserModeOps(
 	ops []userModeOp,
-) (wallops, oper *bool, err error) {
+) (*bool, *bool, error) {
 	unknownFlag := &IRCError{
 		Code:    irc.ErrUmodeUnknownFlag,
 		Params:  nil,
 		Message: "Unknown MODE flag",
 	}
 
-	for _, op := range ops {
-		switch op.char {
+	var wallops, oper *bool
+
+	for _, modeOp := range ops {
+		switch modeOp.char {
 		case 'w':
-			val := op.adding
+			val := modeOp.adding
 			wallops = &val
 		case 'o':
-			if op.adding {
+			if modeOp.adding {
 				return nil, nil, unknownFlag
 			}