From e22c3e1cbf3248dc8a1ee87fc1cf469d67bffb82 Mon Sep 17 00:00:00 2001
From: Conrad Hoffmann <ch@bitfehler.net>
Date: Fri, 31 Oct 2025 14:28:48 +0100
Subject: [PATCH] Fix a bunch of linter complaints

---
 auth/bearer.go          | 2 +-
 client/graphql.go       | 5 ++---
 email/send.go           | 7 ++++---
 webhooks/legacy.go      | 5 ++---
 webhooks/legacy_test.go | 4 ++--
 webhooks/queue.go       | 3 +--
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/auth/bearer.go b/auth/bearer.go
index ab3fedf08bd32c2e5fdf4e7b600d5fd3e5dfc1fa..5a4027b9987184abde0cbc62aa9c7123c31fecb9 100644
--- a/auth/bearer.go
+++ b/auth/bearer.go
@@ -57,7 +57,7 @@ func DecodeBearerToken(token string) *BearerToken {
 
 	mac := payload[len(payload)-32:]
 	payload = payload[:len(payload)-32]
-	if crypto.BearerVerify(payload, mac) == false {
+	if !crypto.BearerVerify(payload, mac) {
 		log.Printf("Invalid bearer token: HMAC verification failed (MAC: [%d]%s; payload: [%d]%s",
 			len(mac), hex.EncodeToString(mac), len(payload), hex.EncodeToString(payload))
 		return nil
diff --git a/client/graphql.go b/client/graphql.go
index 4f8c85f8abeaf122d6de07865bfada3360d3b7b4..06f515b55743e06d4aea9543517385019d296a17 100644
--- a/client/graphql.go
+++ b/client/graphql.go
@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"mime/multipart"
 	"net/http"
 	"net/textproto"
@@ -25,7 +24,7 @@ type GraphQLQuery struct {
 }
 
 type InternalAuth struct {
-	Name     string `json:"name",omitempty`
+	Name     string `json:"name,omitempty"`
 	ClientID string `json:"client_id"`
 	NodeID   string `json:"node_id"`
 }
@@ -148,7 +147,7 @@ func Do(ctx context.Context, username string, svc string,
 	}
 	defer resp.Body.Close()
 
-	respBody, err := ioutil.ReadAll(resp.Body)
+	respBody, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}
diff --git a/email/send.go b/email/send.go
index 27fe52ca2824c7c916712c9fb6686b711ec739eb..f1018895196fe22dba8c2d66f1606601e50a5222 100644
--- a/email/send.go
+++ b/email/send.go
@@ -81,11 +81,12 @@ func mailSetup(ctx context.Context) (*smtp.Client, *mail.Address, error) {
 	var c *smtp.Client
 	addr := fmt.Sprintf("%s:%d", mailconf.host, mailconf.port)
 
-	if mailconf.enctype == "tls" {
+	switch mailconf.enctype {
+	case "tls":
 		c, err = smtp.DialTLS(addr, nil)
-	} else if mailconf.enctype == "starttls" {
+	case "starttls":
 		c, err = smtp.DialStartTLS(addr, nil)
-	} else {
+	default:
 		c, err = smtp.Dial(addr)
 	}
 	if err != nil {
diff --git a/webhooks/legacy.go b/webhooks/legacy.go
index 3b096fd47d073cf3e6edd6a78efb2b9ffe01b53f..be8d98b8ea4f9a5c990ccf315c62bf89b69e006f 100644
--- a/webhooks/legacy.go
+++ b/webhooks/legacy.go
@@ -6,14 +6,12 @@ import (
 	"database/sql"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"slices"
 	"strings"
 	"time"
 
-	"git.sr.ht/~sircmpwn/dowork"
 	sq "github.com/Masterminds/squirrel"
 	"github.com/google/uuid"
 	"github.com/vaughan0/go-ini"
@@ -21,6 +19,7 @@ import (
 	"git.sr.ht/~sircmpwn/core-go/config"
 	"git.sr.ht/~sircmpwn/core-go/crypto"
 	"git.sr.ht/~sircmpwn/core-go/database"
+	work "git.sr.ht/~sircmpwn/dowork"
 )
 
 type LegacyQueue struct {
@@ -227,7 +226,7 @@ func deliverPayload(ctx context.Context, name, url string,
 	defer resp.Body.Close()
 
 	reader := io.LimitReader(resp.Body, 65536) // No more than 64 KiB
-	body, err := ioutil.ReadAll(reader)
+	body, err := io.ReadAll(reader)
 	if err != nil {
 		return fmt.Errorf("Error reading response body: %v: %w",
 			err, work.ErrDoNotReattempt)
diff --git a/webhooks/legacy_test.go b/webhooks/legacy_test.go
index f9ade0d81e6c99954719a9316ad03321b74d727b..d384ebc5cb55e4af4608977f18ffa8a627caca80 100644
--- a/webhooks/legacy_test.go
+++ b/webhooks/legacy_test.go
@@ -3,7 +3,7 @@ package webhooks
 import (
 	"context"
 	"database/sql/driver"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -67,7 +67,7 @@ func TestDelivery(t *testing.T) {
 			assert.Equal(t, "profile:update", r.Header.Get("X-Webhook-Event"))
 			assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
 
-			b, err := ioutil.ReadAll(r.Body)
+			b, err := io.ReadAll(r.Body)
 			assert.Nil(t, err)
 			assert.Equal(t, `{"hello": "world"}`, string(b))
 
diff --git a/webhooks/queue.go b/webhooks/queue.go
index 77f4905d86a8b3ebbabe049da7690257eefe0927..e84fbf7ec900494ed0e50afaf85df9f2187ed355 100644
--- a/webhooks/queue.go
+++ b/webhooks/queue.go
@@ -6,7 +6,6 @@ import (
 	"database/sql"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"strings"
@@ -241,7 +240,7 @@ func (queue *WebhookQueue) deliverPayload(ctx context.Context,
 	defer resp.Body.Close()
 
 	reader := io.LimitReader(resp.Body, 262144) // No more than 256 KiB
-	body, err := ioutil.ReadAll(reader)
+	body, err := io.ReadAll(reader)
 	if err != nil {
 		return fmt.Errorf("Error reading response body: %v: %w",
 			err, work.ErrDoNotReattempt)