Switch to golangci-lint

.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

.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/golangci/golangci-lint/cmd/golangci-lint
- - go get github.com/fzipp/gocyclo
- - go get github.com/client9/misspell/...
- - go get github.com/gordonklaus/ineffassign
 script: ./hooks/pre-commit

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, urlPath...)
-		ps = append(ps, p)
-	}
 	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)

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() {

hooks/pre-commit

@@ -2,25 +2,6 @@
 
 set -eu
 
-golint
+golangci-lint run
-misspell --error .
 
-# 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

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]
+	stateEventMap := room.State[eventType]
-	event, _ := stateEventMap[stateKey]
+	event := stateEventMap[stateKey]
 	return event
 }