Merge pull request #37 from is2ei/fmt

Fmt
nulab · Nov 23, 2018 · a52b760 · a52b760
2 parents 9019bce + 74b365a
commit a52b760
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/typetalk/v1/likes.go b/typetalk/v1/likes.go
@@ -2,9 +2,9 @@ package v1
 
 import (
 	"context"
-	"time"
 	. "github.com/nulab/go-typetalk/typetalk/internal"
 	. "github.com/nulab/go-typetalk/typetalk/shared"
+	"time"
 )
 
 type LikesService service

diff --git a/typetalk/v2/likes.go b/typetalk/v2/likes.go
@@ -88,7 +88,7 @@ type MyLike struct {
 }
 
 type GetLikesOptions struct {
-	From     int    `json:"from,omitempty"`
+	From int `json:"from,omitempty"`
 }
 
 type getLikesOptions struct {

diff --git a/typetalk/v2/likes_test.go b/typetalk/v2/likes_test.go
@@ -26,7 +26,7 @@ func Test_LikesService_GetLikesReceive_should_get_Likes(t *testing.T) {
 			fmt.Fprint(w, string(b))
 		})
 
-	result, _, err := client.Likes.GetLikesReceive(context.Background(), "qwerty", &GetLikesOptions{ 1})
+	result, _, err := client.Likes.GetLikesReceive(context.Background(), "qwerty", &GetLikesOptions{1})
 	if err != nil {
 		t.Errorf("Returned error: %v", err)
 	}
@@ -102,7 +102,7 @@ func Test_LikesService_ReadReceivedLikes_should_get_Likes(t *testing.T) {
 			TestMethod(t, r, "POST")
 			TestFormValues(t, r, Values{
 				"spaceKey": "qwerty",
-				"likeId":     1,
+				"likeId":   1,
 			})
 			fmt.Fprint(w, string(b))
 		})

diff --git a/typetalk/v2/mentions.go b/typetalk/v2/mentions.go
@@ -17,8 +17,8 @@ type Mention struct {
 }
 
 type GetMentionListOptions struct {
-	From     int    `json:"from,omitempty"`
-	Unread   bool   `json:"unread,omitempty"`
+	From   int  `json:"from,omitempty"`
+	Unread bool `json:"unread,omitempty"`
 }
 
 type getMentionListOptions struct {
@@ -27,7 +27,7 @@ type getMentionListOptions struct {
 }
 
 // Typetalk API docs: https://developer.nulab-inc.com/docs/typetalk/api/2/get-mentions
-func (s *MentionsService) GetMentionList(ctx context.Context, spaceKey string ,opt *GetMentionListOptions) ([]*Mention, *shared.Response, error) {
+func (s *MentionsService) GetMentionList(ctx context.Context, spaceKey string, opt *GetMentionListOptions) ([]*Mention, *shared.Response, error) {
 	u, err := internal.AddQueries("mentions", &getMentionListOptions{opt, spaceKey})
 	if err != nil {
 		return nil, nil, err

diff --git a/typetalk/v2/mentions_test.go b/typetalk/v2/mentions_test.go
@@ -20,8 +20,8 @@ func Test_MentionsService_GetMentionList_should_get_some_mentions(t *testing.T)
 		TestMethod(t, r, "GET")
 		TestQueryValues(t, r, Values{
 			"spaceKey": "qwerty",
-			"from":   10,
-			"unread": true,
+			"from":     10,
+			"unread":   true,
 		})
 		fmt.Fprint(w, string(b))
 	})

diff --git a/typetalk/v2/v2.go b/typetalk/v2/v2.go
@@ -18,11 +18,11 @@ type service struct {
 type Client struct {
 	client *internal.ClientCore
 
-	Topics   *TopicsService
-	Likes    *LikesService
-	Mentions *MentionsService
+	Topics        *TopicsService
+	Likes         *LikesService
+	Mentions      *MentionsService
 	Notifications *NotificationsService
-	Messages *MessagesService
+	Messages      *MessagesService
 }
 
 func (c *Client) SetTypetalkToken(token string) *Client {

diff --git a/typetalk/v2/v2_test.go b/typetalk/v2/v2_test.go
@@ -25,4 +25,4 @@ func setup() {
 
 func teardown() {
 	server.Close()
-}
+}