chore: change lint settings and apply modernize

Author: JoTurk

.golangci.yml

@@ -38,7 +38,7 @@ linters:
     - maintidx         # maintidx measures the maintainability index of each function.
     - makezero         # Finds slice declarations with non-zero initial length
     - misspell         # Finds commonly misspelled English words in comments
-    - mnd              # An analyzer to detect magic numbers
+    - modernize        # Replace and suggests simplifications to code
     - nakedret         # Finds naked returns in functions greater than a specified function length
     - nestif           # Reports deeply nested if statements
     - nilerr           # Finds the code that returns nil even if it checks that the error is not nil.
@@ -49,7 +49,6 @@ linters:
     - revive           # golint replacement, finds style mistakes
     - sqlclosecheck    # Checks that sql.Rows and sql.Stmt are closed.
     - staticcheck      # Staticcheck is a go vet on steroids, applying a ton of static analysis checks
-    - tagliatelle      # Checks the struct tags.
     - thelper          # thelper detects golang test helpers without t.Helper() call and checks the consistency of test helpers
     - unconvert        # Remove unnecessary type conversions
     - unparam          # Reports unused function parameters
@@ -64,11 +63,13 @@ linters:
     - gomodguard       # Allow and block list linter for direct Go module dependencies. This is different from depguard where there are different block types for example version constraints and module recommendations.
     - interfacebloat   # A linter that checks length of interface.
     - ireturn          # Accept Interfaces, Return Concrete Types
+    - mnd              # An analyzer to detect magic numbers
     - nolintlint       # Reports ill-formed or insufficient nolint directives
     - paralleltest     # paralleltest detects missing usage of t.Parallel() method in your Go test
     - prealloc         # Finds slice declarations that could potentially be preallocated
     - promlinter       # Check Prometheus metrics naming via promlint
     - rowserrcheck     # checks whether Err of rows is checked successfully
+    - tagliatelle      # Checks the struct tags.
     - testpackage      # linter that makes you use a separate _test package
     - tparallel        # tparallel detects inappropriate usage of t.Parallel() method in your Go test codes
     - wrapcheck        # Checks that errors returned from external packages are wrapped
@@ -141,4 +142,7 @@ formatters:
     - gofumpt          # Gofumpt checks whether code was gofumpt-ed.
     - goimports        # Goimports does everything that gofmt does. Additionally it checks unused imports
   exclusions:
-    generated: lax
+    generated: lax
+issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0

api/api.go

@@ -105,7 +105,7 @@ func (a *Server) registerRoute(route Route) {
 func GenericResponse(
 	writer http.ResponseWriter,
 	code int,
-	response interface{},
+	response any,
 	start time.Time,
 ) {
 	writer.Header().Set("Content-Type", "application/json")

api/middleware/authenticate.go

@@ -34,7 +34,7 @@ type potatClaims struct {
 type unauthFunc func(
 	w http.ResponseWriter,
 	status int,
-	response interface{},
+	response any,
 	start time.Time,
 )
 
@@ -130,7 +130,7 @@ func (a *Authenticator) verifyDynamicAuth(ctx context.Context, token string) (bo
 	return true, user
 }
 
-func (a *Authenticator) jwtKeyFunc(token *jwt.Token) (interface{}, error) {
+func (a *Authenticator) jwtKeyFunc(token *jwt.Token) (any, error) {
 	if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
 		return nil, fmt.Errorf("%w: unexpected signing method: %v", errUnexpectedSign, token.Header["alg"])
 	}

api/middleware/ratelimit.go

@@ -91,7 +91,7 @@ func getIPToken(
 		return false, 0, 0, err
 	}
 
-	results, ok := result.([]interface{})
+	results, ok := result.([]any)
 	if !ok {
 		return false, 0, 0, errBadRedisResponse
 	}

common/db/loops.go

@@ -274,13 +274,13 @@ func updateOwnedBadgeView(ctx context.Context, clickhouse *ClickhouseClient) {
 
 	// Insert owned badges from active table first
 	// prepare := `
-			// INSERT INTO potatbotat.twitch_owned_badges
-			// SELECT
-			// 	badge,
-			// 	user_id,
-			// 	version
-			// FROM potatbotat.twitch_badges
-			// WHERE badge NOT IN ('', 'NOBADGE')
+	// INSERT INTO potatbotat.twitch_owned_badges
+	// SELECT
+	// 	badge,
+	// 	user_id,
+	// 	version
+	// FROM potatbotat.twitch_badges
+	// WHERE badge NOT IN ('', 'NOBADGE')
 	// `
 
 	// err := clickhouse.Exec(ctx, prepare)

common/db/postgres.go

@@ -330,10 +330,10 @@ func (db *PostgresClient) getChannelByType( //nolint:cyclop
 		FROM channels c
 	`
 
-	switch {
-	case chanType == "ID":
+	switch chanType {
+	case "ID":
 		query += `WHERE c.channel_id = $1 `
-	case chanType == "NAME":
+	case "NAME":
 		query += `WHERE c.username = $1 `
 	default:
 		return nil, errInvalidType
@@ -394,9 +394,10 @@ func (db *PostgresClient) getChannelByType( //nolint:cyclop
 		}
 
 		for _, block := range blocks {
-			if block.BlockType == common.UserBlock {
+			switch block.BlockType {
+			case common.UserBlock:
 				*channel.Blocks.Users = append(*channel.Blocks.Users, block)
-			} else if block.BlockType == common.CommandBlock {
+			case common.CommandBlock:
 				*channel.Blocks.Commands = append(*channel.Blocks.Commands, block)
 			}
 		}

common/normalemote.go

@@ -107,7 +107,7 @@ type TwitchEmote struct {
 
 // NewNormalEmote returns a normalized emote object based on the provided emote data and platform.
 func NewNormalEmote( //nolint:cyclop
-	emoteData interface{},
+	emoteData any,
 	setID string,
 	provider Platforms,
 	emoteType EmoteType,

common/types.go

@@ -98,18 +98,18 @@ type TwitchRoles struct {
 
 // Channel represents a channel on a platform, including its blocks, settings, commands, and other metadata.
 type Channel struct {
-	Blocks      FilteredBlocks         `json:"blocks,omitempty"`
-	JoinedAt    *time.Time             `json:"joined_at,omitempty"`
-	Meta        map[string]interface{} `json:"meta"`
-	Commands    *[]ChannelCommand      `json:"commands,omitempty"`
-	ChannelID   string                 `json:"channel_id"`
-	Username    string                 `json:"username"`
-	Platform    Platforms              `json:"platform"`
-	State       string                 `json:"state"`
-	AddedBy     []AddedByData          `json:"added_by,omitempty"`
-	Editors     []string               `json:"editors"`
-	Ambassadors []string               `json:"ambassadors"`
-	Settings    ChannelSettings        `json:"settings"`
+	Blocks      FilteredBlocks    `json:"blocks,omitempty"`
+	JoinedAt    *time.Time        `json:"joined_at,omitempty"`
+	Meta        map[string]any    `json:"meta"`
+	Commands    *[]ChannelCommand `json:"commands,omitempty"`
+	ChannelID   string            `json:"channel_id"`
+	Username    string            `json:"username"`
+	Platform    Platforms         `json:"platform"`
+	State       string            `json:"state"`
+	AddedBy     []AddedByData     `json:"added_by,omitempty"`
+	Editors     []string          `json:"editors"`
+	Ambassadors []string          `json:"ambassadors"`
+	Settings    ChannelSettings   `json:"settings"`
 }
 
 // FilteredBlocks represents the blocks of users and commands in a channel.
@@ -379,7 +379,7 @@ const (
 )
 
 // Flags represents a map of flags, where each flag is identified by a string key and can hold any type of value.
-type Flags map[string]interface{}
+type Flags map[string]any
 
 // CommandConditions represents the conditions under which a command can be executed.
 type CommandConditions struct {

main.go

@@ -151,7 +151,7 @@ func runWithTimeout(
 	done := make(chan error, 1)
 
 	var lastError error
-	for i := 0; i < 3; i++ {
+	for range 3 {
 		attemptCtx, cancel := context.WithTimeout(ctx, 1*time.Second)
 		defer cancel()
 

redirects/redirects.go

@@ -88,8 +88,8 @@ func (r *redirects) cleanRedirectProtocolSoLinksActuallyWork(url string) string
 	if strings.HasPrefix(url, "https://") {
 		return url
 	}
-	if strings.HasPrefix(url, "http://") {
-		return "https://" + strings.TrimPrefix(url, "http://")
+	if after, ok := strings.CutPrefix(url, "http://"); ok {
+		return "https://" + after
 	}
 	if strings.HasPrefix(url, "//") {
 		return "https:" + url