fix go vet and lint errors

server/toc/cmd_client.go

@@ -1363,9 +1363,7 @@ func parseArgs(payload []byte, cmd string, args ...*string) (varArgs []string, e
 	}
 
 	// dump remaining arguments as varargs
-	for _, param := range segs[i:] {
-		varArgs = append(varArgs, param)
-	}
+	varArgs = append(varArgs, segs[i:]...)
 
 	return varArgs, err
 }

server/toc/cmd_server.go

@@ -20,15 +20,11 @@ var (
 // corresponding TOC handlers. It ignores any SNAC messages for which there is
 // no TOC response.
 func (s OSCARProxy) RecvBOS(ctx context.Context, me *state.Session, chatRegistry *ChatRegistry, ch chan<- []byte) error {
-	defer func() {
-		fmt.Println("closing RecvBOS")
-	}()
 	for {
 		select {
 		case <-ctx.Done():
 			return nil
 		case <-me.Closed():
-			fmt.Println("I got signed off")
 			return errDisconnect
 		case snac := <-me.ReceiveMessage():
 			switch v := snac.Body.(type) {
@@ -47,17 +43,12 @@ func (s OSCARProxy) RecvBOS(ctx context.Context, me *state.Session, chatRegistry
 			}
 		}
 	}
-
-	return nil
 }
 
 // RecvChat routes incoming SNAC messages from the chat server to their
 // corresponding TOC handlers. It ignores any SNAC messages for which there is
 // no TOC response.
 func (s OSCARProxy) RecvChat(ctx context.Context, me *state.Session, chatID int, ch chan<- []byte) {
-	defer func() {
-		fmt.Println("closing chat RecvChat")
-	}()
 	for {
 		select {
 		case <-ctx.Done():

server/toc/helpers_test.go

@@ -1,7 +1,6 @@
 package toc
 
 import (
-	"github.com/google/uuid"
 	"github.com/stretchr/testify/mock"
 
 	"github.com/mk6i/retro-aim-server/state"
@@ -25,16 +24,10 @@ type delBuddiesParams []struct {
 	err    error
 }
 
-type rightsQueryParams []struct {
-	inFrame wire.SNACFrame
-	msg     wire.SNACMessage
-}
-
 type buddyParams struct {
 	addBuddiesParams
 	broadcastBuddyDepartedParams
 	delBuddiesParams
-	rightsQueryParams
 }
 
 type chatParams struct {
@@ -48,18 +41,6 @@ type createRoomParams []struct {
 	err    error
 }
 
-type exchangeInfoParams []struct {
-	inFrame wire.SNACFrame
-	inBody  wire.SNAC_0x0D_0x03_ChatNavRequestExchangeInfo
-	msg     wire.SNACMessage
-	err     error
-}
-
-type requestChatRightsParams []struct {
-	inFrame wire.SNACFrame
-	msg     wire.SNACMessage
-}
-
 type requestRoomInfoParams []struct {
 	inBody wire.SNAC_0x0D_0x04_ChatNavRequestRoomInfo
 	msg    wire.SNACMessage
@@ -68,8 +49,6 @@ type requestRoomInfoParams []struct {
 
 type chatNavParams struct {
 	createRoomParams
-	exchangeInfoParams
-	requestChatRightsParams
 	requestRoomInfoParams
 }
 
@@ -88,13 +67,6 @@ type channelMsgToHostParamsICBM []struct {
 	err     error
 }
 
-type clientEventParams []struct {
-	sess    *state.Session
-	inFrame wire.SNACFrame
-	inBody  wire.SNAC_0x04_0x14_ICBMClientEvent
-	err     error
-}
-
 type evilRequestParams []struct {
 	me     state.IdentScreenName
 	inBody wire.SNAC_0x04_0x08_ICBMEvilRequest
@@ -102,24 +74,9 @@ type evilRequestParams []struct {
 	err    error
 }
 
-type parameterQueryParams []struct {
-	inFrame wire.SNACFrame
-	msg     wire.SNACMessage
-}
-
-type clientErrParams []struct {
-	sess  *state.Session
-	frame wire.SNACFrame
-	body  wire.SNAC_0x04_0x0B_ICBMClientErr
-	err   error
-}
-
 type icbmParams struct {
 	channelMsgToHostParamsICBM
-	clientEventParams
 	evilRequestParams
-	parameterQueryParams
-	clientErrParams
 }
 
 type clientOnlineParams []struct {
@@ -147,20 +104,6 @@ type oServiceParams struct {
 	serviceRequestParams
 }
 
-type bucpChallengeParams []struct {
-	bodyIn  wire.SNAC_0x17_0x06_BUCPChallengeRequest
-	newUUID func() uuid.UUID
-	msg     wire.SNACMessage
-	err     error
-}
-
-type bucpLoginParams []struct {
-	bodyIn    wire.SNAC_0x17_0x02_BUCPLoginRequest
-	newUserFn func(screenName state.DisplayScreenName) (state.User, error)
-	msg       wire.SNACMessage
-	err       error
-}
-
 type flapLoginParams []struct {
 	frame     wire.FLAPSignonFrame
 	newUserFn func(screenName state.DisplayScreenName) (state.User, error)
@@ -174,12 +117,6 @@ type registerBOSSessionParams []struct {
 	err        error
 }
 
-type retrieveBOSSessionParams []struct {
-	authCookie []byte
-	sess       *state.Session
-	err        error
-}
-
 type registerChatSessionParams []struct {
 	authCookie []byte
 	sess       *state.Session
@@ -195,11 +132,8 @@ type signoutChatParams []struct {
 }
 
 type authParams struct {
-	bucpChallengeParams
-	bucpLoginParams
 	flapLoginParams
 	registerBOSSessionParams
-	retrieveBOSSessionParams
 	registerChatSessionParams
 	signoutParams
 	signoutChatParams
@@ -260,29 +194,9 @@ type addPermListEntriesParams []struct {
 	err  error
 }
 
-type delDenyListEntriesParams []struct {
-	me   state.IdentScreenName
-	body wire.SNAC_0x09_0x08_PermitDenyDelDenyListEntries
-	err  error
-}
-
-type delPermListEntriesParams []struct {
-	me   state.IdentScreenName
-	body wire.SNAC_0x09_0x06_PermitDenyDelPermListEntries
-	err  error
-}
-
-type rightsQueryParamsPermitDeny []struct {
-	frame wire.SNACFrame
-	msg   wire.SNACMessage
-}
-
 type permitDenyParams struct {
 	addDenyListEntriesParams
 	addPermListEntriesParams
-	delDenyListEntriesParams
-	delPermListEntriesParams
-	rightsQueryParamsPermitDeny
 }
 
 type registerBuddyListParams []struct {
@@ -333,13 +247,6 @@ type mockParams struct {
 	tocConfigParams
 }
 
-// crackParams holds multiple scenarios for the Crack method.
-type crackParams []struct {
-	data       []byte
-	returnData []byte
-	returnErr  error
-}
-
 // issueParams holds multiple scenarios for the Issue method.
 type issueParams []struct {
 	data       []byte
@@ -349,7 +256,6 @@ type issueParams []struct {
 
 // cookieBakerParams groups the method scenarios for a CookieBaker.
 type cookieBakerParams struct {
-	crackParams crackParams
 	issueParams issueParams
 }
 

server/toc/http.go

@@ -268,7 +268,7 @@ func (s OSCARProxy) DirSearchHandler(w http.ResponseWriter, r *http.Request) {
 		case wire.ODirSearchResponseNameMissing:
 			http.Error(w, "missing search parameters", http.StatusBadRequest)
 		case wire.ODirSearchResponseOK:
-			s.outputSearchResults(nil, w, v.Results.List...)
+			s.outputSearchResults(ctx, w, v.Results.List...)
 		default:
 			s.logAndReturn500(ctx, w, fmt.Errorf("DirSearchService.InfoQuery unknown status: %d", v.Status))
 		}
@@ -355,6 +355,4 @@ func extractBodyContent(htmlContent []byte) string {
 			}
 		}
 	}
-
-	return ""
 }

server/toc/server.go

@@ -221,7 +221,6 @@ func (rt Server) processCommands(
 	fromCh <-chan wire.FLAPFrame,
 	toCh chan<- []byte,
 ) error {
-
 	for {
 		select {
 		case <-ctx.Done():
@@ -249,7 +248,6 @@ func (rt Server) processCommands(
 			}
 		}
 	}
-	return nil
 }
 
 func (rt Server) sendToClient(ctx context.Context, toClient <-chan []byte, clientFlap *wire.FlapClient) error {
@@ -330,7 +328,7 @@ func (rt Server) handshake(clientConn io.ReadWriter) error {
 	if string(line) != "FLAPON" {
 		return fmt.Errorf("unexpected line: %s", string(line))
 	}
-	line, _, err = reader.ReadLine()
+	_, _, err = reader.ReadLine()
 	if err != nil {
 		return fmt.Errorf("read line failed: %w", err)
 	}