Tweaks (#159)

Author: ferhatelmas

client.go

@@ -15,7 +15,6 @@ import (
 	"net/http"
 	"net/textproto"
 	"os"
-	"strings"
 	"time"
 
 	"github.com/golang-jwt/jwt/v4"
@@ -111,12 +110,6 @@ func (c *Client) VerifyWebhook(body, signature []byte) (valid bool) {
 	return bytes.Equal(signature, []byte(expectedMAC))
 }
 
-var quoteEscaper = strings.NewReplacer("\\", "\\\\", `"`, "\\\"")
-
-func escapeQuotes(s string) string {
-	return quoteEscaper.Replace(s)
-}
-
 // this makes possible to set content type.
 type multipartForm struct {
 	*multipart.Writer
@@ -128,8 +121,7 @@ func (form *multipartForm) CreateFormFile(fieldName, filename, contentType strin
 	h := make(textproto.MIMEHeader)
 
 	h.Set("Content-Disposition",
-		fmt.Sprintf(`form-data; name="%s"; filename="%s"`,
-			escapeQuotes(fieldName), escapeQuotes(filename)))
+		fmt.Sprintf(`form-data; name=%q; filename=%q`, fieldName, filename))
 
 	if contentType == "" {
 		contentType = "application/octet-stream"

go.mod

@@ -1,6 +1,6 @@
 module github.com/GetStream/stream-chat-go/v3
 
-go 1.14
+go 1.16
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect

http.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 )
@@ -38,7 +37,7 @@ func (c *Client) parseResponse(resp *http.Response, result interface{}) error {
 		return errors.New("http body is nil")
 	}
 
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return fmt.Errorf("failed to read HTTP response: %w", err)
 	}
@@ -95,7 +94,7 @@ func (c *Client) newRequest(ctx context.Context, method, path string, params url
 		return nil, err
 	}
 
-	r, err := http.NewRequestWithContext(ctx, method, u, nil)
+	r, err := http.NewRequestWithContext(ctx, method, u, http.NoBody)
 	if err != nil {
 		return nil, err
 	}
@@ -109,14 +108,14 @@ func (c *Client) newRequest(ctx context.Context, method, path string, params url
 		r.Body = t
 
 	case io.Reader:
-		r.Body = ioutil.NopCloser(t)
+		r.Body = io.NopCloser(t)
 
 	default:
 		b, err := json.Marshal(data)
 		if err != nil {
 			return nil, err
 		}
-		r.Body = ioutil.NopCloser(bytes.NewReader(b))
+		r.Body = io.NopCloser(bytes.NewReader(b))
 	}
 
 	return r, nil

query_test.go

@@ -292,11 +292,4 @@ func TestClient_QueryMessageFlags(t *testing.T) {
 	})
 	require.NoError(t, err)
 	assert.Len(t, got.Flags, 1)
-
-	// none should show up
-	got, err = c.QueryMessageFlags(context.Background(), &QueryOption{
-		Filter: map[string]interface{}{"channel_cid": ch.cid()},
-	})
-	require.NoError(t, err)
-	assert.Len(t, got.Flags, 0)
 }

run-lint.sh

@@ -9,7 +9,7 @@ gopath="$(go env GOPATH)"
 if ! [[ -x "$gopath/bin/golangci-lint" ]]; then
 	echo >&2 'Installing golangci-lint'
 	curl --silent --fail --location \
-		https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$gopath/bin" v1.42.0
+		https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$gopath/bin" v1.43.0
 fi
 
 # configured by .golangci.yml