From 911b396dd102eb8949fe5d81a706dc515ce47d44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20T=C3=B6tterman?= <paul.totterman@iki.fi>
Date: Mon, 2 Mar 2020 16:09:42 +0200
Subject: [PATCH] Switch to golangci-lint

---
 .golangci.yaml          | 16 ++++++++++++++++
 .travis.yml             |  7 ++-----
 client.go               |  6 ++----
 client_examples_test.go |  4 +++-
 hooks/pre-commit        | 21 +--------------------
 room.go                 |  4 ++--
 6 files changed, 26 insertions(+), 32 deletions(-)
 create mode 100644 .golangci.yaml

diff --git a/.golangci.yaml b/.golangci.yaml
new file mode 100644
index 0000000..3c8f257
--- /dev/null
+++ b/.golangci.yaml
@@ -0,0 +1,16 @@
+---
+linters:
+  enable:
+    - gocyclo
+    - gofmt
+    - goimports
+    - golint
+    - govet
+    - ineffassign
+    - misspell
+
+linters-settings:
+  gocyclo:
+    min-complexity: 13
+  govet:
+    check-shadowing: true
diff --git a/.travis.yml b/.travis.yml
index 13585d4..fd291e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,6 @@
 language: go
 go:
- - 1.10.x
+ - 1.13.x
 install:
- - go get github.com/golang/lint/golint
- - go get github.com/fzipp/gocyclo
- - go get github.com/client9/misspell/...
- - go get github.com/gordonklaus/ineffassign
+ - go get github.com/golangci/golangci-lint/cmd/golangci-lint
 script: ./hooks/pre-commit
diff --git a/client.go b/client.go
index 7625a1c..63df736 100644
--- a/client.go
+++ b/client.go
@@ -56,9 +56,7 @@ func (e HTTPError) Error() string {
 // BuildURL builds a URL with the Client's homserver/prefix/access_token set already.
 func (cli *Client) BuildURL(urlPath ...string) string {
 	ps := []string{cli.Prefix}
-	for _, p := range urlPath {
-		ps = append(ps, p)
-	}
+	ps = append(ps, urlPath...)
 	return cli.BuildBaseURL(ps...)
 }
 
@@ -195,7 +193,7 @@ func (cli *Client) MakeRequest(method string, httpURL string, reqBody interface{
 	var err error
 	if reqBody != nil {
 		buf := new(bytes.Buffer)
-		if err := json.NewEncoder(buf).Encode(reqBody); err != nil {
+		if err = json.NewEncoder(buf).Encode(reqBody); err != nil {
 			return err
 		}
 		req, err = http.NewRequest(method, httpURL, buf)
diff --git a/client_examples_test.go b/client_examples_test.go
index e3c0f09..5b4ef9d 100644
--- a/client_examples_test.go
+++ b/client_examples_test.go
@@ -46,7 +46,9 @@ func Example_customInterfaces() {
 	cli.Client = http.DefaultClient
 
 	// Once you call a function, you can't safely change the interfaces.
-	cli.SendText("!foo:bar", "Down the rabbit hole")
+	if _, err := cli.SendText("!foo:bar", "Down the rabbit hole"); err != nil {
+		fmt.Println("SendText() returned ", err)
+	}
 }
 
 func ExampleClient_BuildURLWithQuery() {
diff --git a/hooks/pre-commit b/hooks/pre-commit
index bb0a27f..d795951 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -2,25 +2,6 @@
 
 set -eu
 
-golint
-misspell --error .
+golangci-lint run
 
-# gofmt doesn't exit with an error code if the files don't match the expected
-# format. So we have to run it and see if it outputs anything.
-if gofmt -l -s . 2>&1 | read
-then
-    echo "Error: not all code had been formatted with gofmt."
-    echo "Fixing the following files"
-    gofmt -s -w -l .
-    echo
-    echo "Please add them to the commit"
-    git status --short
-    exit 1
-fi
-
-ineffassign .
-
-go fmt
-go tool vet --all --shadow .
-gocyclo -over 12 .
 go test -timeout 5s -test.v
diff --git a/room.go b/room.go
index d1d2286..364deab 100644
--- a/room.go
+++ b/room.go
@@ -31,8 +31,8 @@ func (room Room) UpdateState(event *Event) {
 
 // GetStateEvent returns the state event for the given type/state_key combo, or nil.
 func (room Room) GetStateEvent(eventType string, stateKey string) *Event {
-	stateEventMap, _ := room.State[eventType]
-	event, _ := stateEventMap[stateKey]
+	stateEventMap := room.State[eventType]
+	event := stateEventMap[stateKey]
 	return event
 }