refactor: fix linter warnings

Signed-off-by: Christian Stewart <christian@paral.in>
paralin · Mar 23, 2023 · 2f48989 · 2f48989
1 parent 10336ed
commit 2f48989
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 42 deletions.
diff --git a/apigen/api_generate.go b/apigen/api_generate.go
@@ -260,7 +260,7 @@ func GenerateAPI(ctx context.Context, clientOutput, eventsOutput io.Writer) erro
 
 	for _, eventHandler := range eventHandlersOrdered {
 		fmt.Fprintf(eventsOutput, "\n")
-		fmt.Fprintf(eventsOutput, eventHandler.generateComment())
+		fmt.Fprint(eventsOutput, eventHandler.generateComment())
 		fmt.Fprintf(eventsOutput, "type %s struct {\n", eventHandler.eventName)
 		fmt.Fprintf(eventsOutput, "\t")
 		if err := printFieldType(eventsOutput, eventHandler.eventType.Obj.Type()); err != nil {

diff --git a/apigen/cmd_generate.go b/apigen/cmd_generate.go
@@ -3,9 +3,10 @@ package main
 import (
 	"bytes"
 	"context"
-	"github.com/urfave/cli/v2"
 	gofmt "go/format"
-	"io/ioutil"
+	"os"
+
+	"github.com/urfave/cli/v2"
 )
 
 var clientOutFile string
@@ -37,7 +38,7 @@ func init() {
 				return err
 			}
 
-			if err := ioutil.WriteFile(clientOutFile, clientFileBuf.Bytes(), 0655); err != nil {
+			if err := os.WriteFile(clientOutFile, clientFileBuf.Bytes(), 0655); err != nil {
 				return err
 			}
 
@@ -46,7 +47,7 @@ func init() {
 				clientFileDat = clientFileBuf.Bytes()
 			}
 
-			if err := ioutil.WriteFile(clientOutFile, clientFileDat, 0655); err != nil {
+			if err := os.WriteFile(clientOutFile, clientFileDat, 0655); err != nil {
 				return err
 			}
 
@@ -59,7 +60,7 @@ func init() {
 				eventsFileDat = eventsFileBuf.Bytes()
 			}
 
-			if err := ioutil.WriteFile(eventsOutFile, eventsFileDat, 0655); err != nil {
+			if err := os.WriteFile(eventsOutFile, eventsFileDat, 0655); err != nil {
 				return err
 			}
 

diff --git a/apigen/msg_func.go b/apigen/msg_func.go
@@ -15,10 +15,7 @@ func GetMessageFuncName(msg dota_gcmessages_msgid.EDOTAGCMsg) string {
 
 	msgName := msg.String()
 	msgName = strings.TrimPrefix(msgName, "k_EMsg")
-
-	if strings.HasPrefix(msgName, "DOTA") {
-		msgName = msgName[4:]
-	}
+	msgName = strings.TrimPrefix(msgName, "DOTA")
 
 	switch {
 	case strings.HasPrefix(msgName, "ClientToGC"):
@@ -43,9 +40,6 @@ func GetMessageFuncName(msg dota_gcmessages_msgid.EDOTAGCMsg) string {
 		if !IsWordVerb(words[0]) && IsWordVerb(words[1]) {
 			words[0], words[1] = words[1], words[0]
 		}
-		break
-	case IsWordVerb(words[0]):
-		break
 	}
 
 	switch {

diff --git a/apigen/msg_sender.go b/apigen/msg_sender.go
@@ -29,10 +29,7 @@ func GetMessageSender(msg protocol.EDOTAGCMsg) MsgSender {
 
 	msgName := msg.String()
 	msgName = msgName[6:]
-
-	if strings.HasPrefix(msgName, "DOTA") {
-		msgName = msgName[4:]
-	}
+	msgName = strings.TrimPrefix(msgName, "DOTA")
 
 	switch {
 	case strings.HasPrefix(msgName, "SQL"):

diff --git a/client_match.go b/client_match.go
diff --git a/socache/socache_container.go b/socache/socache_container.go
@@ -4,7 +4,6 @@ import (
 	"math/rand"
 	"sync"
 
-	"github.com/golang/protobuf/jsonpb"
 	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -53,13 +52,6 @@ func (c *SOCacheContainer) parseObject(obj *gcsdkm.CMsgSOCacheSubscribed_Subscri
 	return so, nil
 }
 
-// stringifyObject converts an object to a json string.
-func (c *SOCacheContainer) stringifyObject(obj proto.Message) string {
-	m := &jsonpb.Marshaler{}
-	str, _ := m.MarshalToString(obj)
-	return str
-}
-
 // emitEvent emits an event to all listeners.
 func (c *SOCacheContainer) emitEvent(event *CacheEvent) {
 	c.subscriptions.Range(func(key interface{}, value interface{}) bool {