Fix code style

README.md

@@ -39,7 +39,7 @@ import (
 func main() {
 	client, _ := vk.NewClientWithOptions(
 		vk.WithToken(os.Getenv("VK_ACCESS_TOKEN")),
-		vk.WithHttpClient(http.DefaultClient),
+		vk.WithHTTPClient(http.DefaultClient),
 	)
 
 	_ = printMe(client)
@@ -65,7 +65,7 @@ func main() {
 
 func printMe(api *vk.Client) error {
 	var users []struct {
-		Id        int64  `json:"id"`
+		ID        int64  `json:"id"`
 		FirstName string `json:"first_name"`
 		LastName  string `json:"last_name"`
 	}
@@ -74,7 +74,7 @@ func printMe(api *vk.Client) error {
 
 	me := users[0]
 
-	log.Println(me.Id, me.FirstName, me.LastName)
+	log.Println(me.ID, me.FirstName, me.LastName)
 
 	return nil
 }

client.go

@@ -23,12 +23,12 @@ type Client struct {
 
 	Token string
 
-	HttpClient httputil.RequestDoer
+	HTTPClient httputil.RequestDoer
 }
 
 // CallMethod invokes the named method and stores the result in the value pointed to by response.
 func (c *Client) CallMethod(method string, params RequestParams, response interface{}) (err error) {
-	queryParams, err := params.UrlValues()
+	queryParams, err := params.URLValues()
 	if err != nil {
 		return err
 	}
@@ -39,7 +39,7 @@ func (c *Client) CallMethod(method string, params RequestParams, response interf
 		queryParams.Set("access_token", c.Token)
 	}
 
-	rawBody, err := httputil.Post(c.HttpClient, c.BaseURL+"/"+method, queryParams)
+	rawBody, err := httputil.Post(c.HTTPClient, c.BaseURL+"/"+method, queryParams)
 	if err != nil {
 		return err
 	}
@@ -89,8 +89,8 @@ func NewClientWithOptions(options ...Option) (*Client, error) {
 		}
 	}
 
-	if client.HttpClient == nil {
-		client.HttpClient = http.DefaultClient
+	if client.HTTPClient == nil {
+		client.HTTPClient = http.DefaultClient
 	}
 
 	return client, nil

client_test.go

@@ -19,7 +19,7 @@ func TestNewClientWithOptions(t *testing.T) {
 
 	client, err := NewClientWithOptions(
 		WithToken(token),
-		WithHttpClient(http.DefaultClient),
+		WithHTTPClient(http.DefaultClient),
 	)
 	if err != nil {
 		t.Error(err)
@@ -31,8 +31,8 @@ func TestNewClientWithOptions(t *testing.T) {
 		t.Errorf("client.Token == %q, want %q", client.Token, token)
 	}
 
-	if client.HttpClient != http.DefaultClient {
-		t.Errorf("client.HttpClient == %v, want %v (http.DefaultClient)", client.HttpClient, http.DefaultClient)
+	if client.HTTPClient != http.DefaultClient {
+		t.Errorf("client.HTTPClient == %v, want %v (http.DefaultClient)", client.HTTPClient, http.DefaultClient)
 	}
 }
 
@@ -49,7 +49,7 @@ func testDefaultClient(client *Client, t *testing.T) {
 		t.Errorf("client.BaseURL == %q, want %q", client.BaseURL, DefaultBaseURL)
 	}
 
-	if client.HttpClient == nil {
-		t.Error("client.HttpClient == nil")
+	if client.HTTPClient == nil {
+		t.Error("client.HTTPClient == nil")
 	}
 }

example/example.go

@@ -12,7 +12,7 @@ import (
 func main() {
 	client, err := vk.NewClientWithOptions(
 		vk.WithToken(os.Getenv("VK_ACCESS_TOKEN")),
-		vk.WithHttpClient(http.DefaultClient),
+		vk.WithHTTPClient(http.DefaultClient),
 	)
 	if err != nil {
 		log.Panic(err)
@@ -68,7 +68,7 @@ func main() {
 
 func printMe(api *vk.Client) error {
 	var users []struct {
-		Id        int64  `json:"id"`
+		ID        int64  `json:"id"`
 		FirstName string `json:"first_name"`
 		LastName  string `json:"last_name"`
 	}
@@ -79,7 +79,7 @@ func printMe(api *vk.Client) error {
 
 	me := users[0]
 
-	log.Println(me.Id, me.FirstName, me.LastName)
+	log.Println(me.ID, me.FirstName, me.LastName)
 
 	return nil
 }

longpoll/user/longpoll.go

@@ -9,22 +9,23 @@ import (
 )
 
 const (
+	// DefaultVersion is a default version of the VK Long Poll API.
 	DefaultVersion = 2
-	// The waiting period. Maximum: 90.
+	// DefaultWait is a waiting period. Maximum: 90.
 	DefaultWait = 25
-	// Additional answer options.
+	// DefaultMode is an additional answer options.
 	DefaultMode = ReceiveAttachments
 )
 
-// A mode represents the additional answer options.
+// Mode represents the additional answer options.
 type Mode int64
 
 const (
 	ReceiveAttachments           Mode = 2
 	ReturnExpandedSetOfEvents    Mode = 8
 	ReturnPts                    Mode = 32
 	ReturnFriendOnlineExtraField Mode = 64
-	ReturnRandomId               Mode = 128
+	ReturnRandomID               Mode = 128
 )
 
 const (
@@ -84,12 +85,12 @@ func (lp *Longpoll) Poll(ts int64) (updates []*Update, newTS int64, err error) {
 		"wait":    lp.Wait,
 		"mode":    lp.Mode,
 		"version": lp.Version,
-	}.UrlValues()
+	}.URLValues()
 	if err != nil {
 		return
 	}
 
-	rawBody, err := httputil.Post(lp.client.HttpClient, "https://"+lp.Server, params)
+	rawBody, err := httputil.Post(lp.client.HTTPClient, "https://"+lp.Server, params)
 	if err != nil {
 		return
 	}

options.go

@@ -16,10 +16,10 @@ func WithToken(token string) Option {
 	}
 }
 
-// WithHttpClient overrides the client http client with the specified one.
-func WithHttpClient(doer httputil.RequestDoer) Option {
+// WithHTTPClient overrides the client http client with the specified one.
+func WithHTTPClient(doer httputil.RequestDoer) Option {
 	return func(c *Client) error {
-		c.HttpClient = doer
+		c.HTTPClient = doer
 
 		return nil
 	}

requestparams.go

@@ -8,8 +8,8 @@ import (
 // RequestParams are the params for invoking methods.
 type RequestParams map[string]interface{}
 
-// UrlValues translates the params to url.Values.
-func (params RequestParams) UrlValues() (url.Values, error) {
+// URLValues translates the params to url.Values.
+func (params RequestParams) URLValues() (url.Values, error) {
 	values := url.Values{}
 
 	for k, v := range params {

requestparams_test.go

@@ -20,7 +20,7 @@ func TestRequestParams_UrlValues(t *testing.T) {
 	}
 
 	for _, c := range cases {
-		urlValues, err := c.in.UrlValues()
+		urlValues, err := c.in.URLValues()
 
 		if err != nil {
 			t.Error(err)