X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/67d1f7231b807771b57c8f0e63dd796a03130eaf..a6216dd89252fa01dc176f98f1e4ecfd3f637566:/hotline/client_conn.go?ds=sidebyside

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index f92c1cd..f73265d 100644
--- a/hotline/client_conn.go
+++ b/hotline/client_conn.go
@@ -3,9 +3,9 @@ package hotline
 import (
 	"encoding/binary"
 	"fmt"
-	"go.uber.org/zap"
 	"golang.org/x/crypto/bcrypt"
 	"io"
+	"log/slog"
 	"math/big"
 	"sort"
 	"strings"
@@ -44,7 +44,7 @@ type ClientConn struct {
 	transfersMU sync.Mutex
 	transfers   map[int]map[[4]byte]*FileTransfer
 
-	logger *zap.SugaredLogger
+	logger *slog.Logger
 }
 
 func (cc *ClientConn) sendAll(t int, fields ...Field) {
@@ -61,7 +61,7 @@ func (cc *ClientConn) handleTransaction(transaction Transaction) error {
 
 			// Validate that required field is present
 			if field.ID == nil {
-				cc.logger.Errorw(
+				cc.logger.Error(
 					"Missing required field",
 					"RequestType", handler.Name, "FieldID", reqField.ID,
 				)
@@ -69,7 +69,7 @@ func (cc *ClientConn) handleTransaction(transaction Transaction) error {
 			}
 
 			if len(field.Data) < reqField.minLen {
-				cc.logger.Infow(
+				cc.logger.Info(
 					"Field does not meet minLen",
 					"RequestType", handler.Name, "FieldID", reqField.ID,
 				)
@@ -77,7 +77,7 @@ func (cc *ClientConn) handleTransaction(transaction Transaction) error {
 			}
 		}
 
-		cc.logger.Debugw("Received Transaction", "RequestType", handler.Name)
+		cc.logger.Debug("Received Transaction", "RequestType", handler.Name)
 
 		transactions, err := handler.Handler(cc, &transaction)
 		if err != nil {
@@ -87,7 +87,7 @@ func (cc *ClientConn) handleTransaction(transaction Transaction) error {
 			cc.Server.outbox <- t
 		}
 	} else {
-		cc.logger.Errorw(
+		cc.logger.Error(
 			"Unimplemented transaction type received", "RequestID", requestNum)
 	}
 
@@ -102,7 +102,7 @@ func (cc *ClientConn) handleTransaction(transaction Transaction) error {
 		// the user is no longer away
 		if cc.Idle {
 			flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(cc.Flags)))
-			flagBitmap.SetBit(flagBitmap, userFlagAway, 0)
+			flagBitmap.SetBit(flagBitmap, UserFlagAway, 0)
 			binary.BigEndian.PutUint16(cc.Flags, uint16(flagBitmap.Int64()))
 			cc.Idle = false
 
@@ -149,7 +149,7 @@ func (cc *ClientConn) Disconnect() {
 	}
 
 	if err := cc.Connection.Close(); err != nil {
-		cc.Server.Logger.Errorw("error closing client connection", "RemoteAddr", cc.RemoteAddr)
+		cc.Server.Logger.Error("error closing client connection", "RemoteAddr", cc.RemoteAddr)
 	}
 }
 
@@ -254,5 +254,5 @@ func (cc *ClientConn) String() string {
 		"None.\n",
 	)
 
-	return strings.Replace(template, "\n", "\r", -1)
+	return strings.ReplaceAll(template, "\n", "\r")
 }