lint

mautrix · Nov 29, 2024 · b73142a · b73142a
1 parent 7f350dc
commit b73142a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 17 deletions.
diff --git a/pkg/gchatmeow/client.go b/pkg/gchatmeow/client.go
@@ -148,7 +148,7 @@ func (c *Client) LoadMessagesPage() (*types.InitialConfigData, error) {
 	})
 
 	url := fmt.Sprintf("%s?%s", endpoints.MOLE_BASE_URL, "wfi=gtn-brain-iframe-id&hs=%5B%22h_hs%22%2Cnull%2Cnull%2C%5B1%2C0%5D%2Cnull%2Cnull%2C%22gmail.pinto-server_20240610.06_p0%22%2C1%2Cnull%2C%5B15%2C48%2C6%2C43%2C36%2C35%2C26%2C44%2C39%2C46%2C41%2C18%2C24%2C11%2C21%2C14%2C1%2C51%2C53%5D%2Cnull%2Cnull%2C%22GgsaQvppfqU.en..es5%22%2Cnull%2Cnull%2Cnull%2C%5B2%5D%2Cnull%2C0%5D&hl=en&lts=chat%2Fhome&shell=9&has_stream_view=false&origin=https%3A%2F%2Fmail.google.com")
-	resp, respBody, err := c.MakeRequest(url, "GET", headers, nil, types.NONE)
+	resp, respBody, err := c.MakeRequest(url, http.MethodGet, headers, nil, types.NONE)
 	if err != nil {
 		return nil, err
 	}
@@ -199,7 +199,6 @@ func (c *Client) SetProxy(proxyAddr string) error {
 		if err != nil {
 			return err
 		}
-		c.http.Transport.(*http.Transport).Dial = c.socksProxy.Dial
 		contextDialer, ok := c.socksProxy.(proxy.ContextDialer)
 		if ok {
 			c.http.Transport.(*http.Transport).DialContext = contextDialer.DialContext

diff --git a/pkg/gchatmeow/client_test.go b/pkg/gchatmeow/client_test.go
@@ -1,3 +1,5 @@
+//lint:file-ignore U1000 ignore
+
 package gchatmeow_test
 
 import (

diff --git a/pkg/gchatmeow/http.go b/pkg/gchatmeow/http.go
@@ -51,7 +51,7 @@ func (c *Client) makeAPIRequest(endpoint endpoints.APIEndpoint, payload proto.Me
 		return err
 	}
 
-	_, respBody, err := c.MakeRequest(url, "POST", headers, payloadBytes, types.PROTOBUF)
+	_, respBody, err := c.MakeRequest(url, http.MethodPost, headers, payloadBytes, types.PROTOBUF)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/gchatmeow/media.go b/pkg/gchatmeow/media.go
@@ -36,7 +36,7 @@ func (c *Client) UploadMedia(fileName string, mediaContentType string, mediaByte
 		Extra:           extraHeaders,
 	})
 	url := fmt.Sprintf("%s?%s", endpoints.UPLOADS, queryString)
-	resp, _, err := c.MakeRequest(url, "POST", headers, nil, types.FORM_PLAINTEXT_UTF8)
+	resp, _, err := c.MakeRequest(url, http.MethodPost, headers, nil, types.FORM_PLAINTEXT_UTF8)
 	if err != nil {
 		return nil, err
 	}
@@ -57,7 +57,7 @@ func (c *Client) finalizeMediaUpload(uploadUrl string, mediaBytes []byte, header
 	headers.Set("X-Goog-Upload-Entity-MD5", md5Entity)
 	headers.Set("X-Goog-Upload-Offset", "0")
 
-	_, respBody, err := c.MakeRequest(uploadUrl, "PUT", headers, mediaBytes, types.FORM_PLAINTEXT_UTF8)
+	_, respBody, err := c.MakeRequest(uploadUrl, http.MethodPut, headers, mediaBytes, types.FORM_PLAINTEXT_UTF8)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/gchatmeow/realtime.go b/pkg/gchatmeow/realtime.go
@@ -78,7 +78,7 @@ func (rc *RealtimeClient) Connect() error {
 		WithCookies:     true,
 		WithXClientData: true,
 	})
-	req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 	if err != nil {
 		return err
 	}
@@ -252,7 +252,7 @@ func (rc *RealtimeClient) sendPing() error {
 	}
 
 	url := endpoints.WEBCHANNEL_EVENTS + "?" + queryArgs
-	req, respBody, err := rc.client.MakeRequest(url, "POST", headers, []byte(encodedPayload), types.FORM)
+	req, respBody, err := rc.client.MakeRequest(url, http.MethodPost, headers, []byte(encodedPayload), types.FORM)
 	if err != nil {
 		return err
 	}
@@ -276,7 +276,7 @@ func (rc *RealtimeClient) Register() error {
 		},
 	})
 
-	resp, respBody, err := rc.client.MakeRequest(url, "GET", headers, nil, types.NONE)
+	resp, respBody, err := rc.client.MakeRequest(url, http.MethodGet, headers, nil, types.NONE)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/gchatmeow/types/http.go b/pkg/gchatmeow/types/http.go
@@ -1,14 +1,5 @@
 package types
 
-type RequestMethod string
-
-const (
-	POST   RequestMethod = "POST"
-	GET    RequestMethod = "GET"
-	PUT    RequestMethod = "PUT"
-	DELETE RequestMethod = "DELETE"
-)
-
 type ContentType string
 
 const (