From b4e56b6ff83630a71ce837363e014c4d955085fa Mon Sep 17 00:00:00 2001 From: 178inaba <178inaba@users.noreply.github.com> Date: Fri, 14 Apr 2017 23:56:07 +0900 Subject: [PATCH 1/2] Fix GET to http.MethodGet --- accounts.go | 15 ++++++++------- mastodon.go | 4 ++-- streaming.go | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/accounts.go b/accounts.go index a751642..b7da163 100644 --- a/accounts.go +++ b/accounts.go @@ -2,6 +2,7 @@ package mastodon import ( "fmt" + "net/http" "net/url" "time" ) @@ -28,7 +29,7 @@ type Account struct { // GetAccount return Account. func (c *Client) GetAccount(id int) (*Account, error) { var account Account - err := c.doAPI("GET", fmt.Sprintf("/api/v1/accounts/%d", id), nil, &account) + err := c.doAPI(http.MethodGet, fmt.Sprintf("/api/v1/accounts/%d", id), nil, &account) if err != nil { return nil, err } @@ -38,7 +39,7 @@ func (c *Client) GetAccount(id int) (*Account, error) { // GetAccountCurrentUser return Account of current user. func (c *Client) GetAccountCurrentUser() (*Account, error) { var account Account - err := c.doAPI("GET", "/api/v1/accounts/verify_credentials", nil, &account) + err := c.doAPI(http.MethodGet, "/api/v1/accounts/verify_credentials", nil, &account) if err != nil { return nil, err } @@ -48,7 +49,7 @@ func (c *Client) GetAccountCurrentUser() (*Account, error) { // GetAccountFollowers return followers list. func (c *Client) GetAccountFollowers(id int64) ([]*Account, error) { var accounts []*Account - err := c.doAPI("GET", fmt.Sprintf("/api/v1/accounts/%d/followers", id), nil, &accounts) + err := c.doAPI(http.MethodGet, fmt.Sprintf("/api/v1/accounts/%d/followers", id), nil, &accounts) if err != nil { return nil, err } @@ -58,7 +59,7 @@ func (c *Client) GetAccountFollowers(id int64) ([]*Account, error) { // GetAccountFollowing return following list. func (c *Client) GetAccountFollowing(id int64) ([]*Account, error) { var accounts []*Account - err := c.doAPI("GET", fmt.Sprintf("/api/v1/accounts/%d/following", id), nil, &accounts) + err := c.doAPI(http.MethodGet, fmt.Sprintf("/api/v1/accounts/%d/following", id), nil, &accounts) if err != nil { return nil, err } @@ -140,7 +141,7 @@ func (c *Client) GetAccountRelationship(id int64) ([]*Relationship, error) { params.Set("id", fmt.Sprint(id)) var relationships []*Relationship - err := c.doAPI("GET", "/api/v1/accounts/relationship", params, &relationships) + err := c.doAPI(http.MethodGet, "/api/v1/accounts/relationship", params, &relationships) if err != nil { return nil, err } @@ -154,7 +155,7 @@ func (c *Client) AccountsSearch(q string, limit int64) ([]*Account, error) { params.Set("limit", fmt.Sprint(limit)) var accounts []*Account - err := c.doAPI("GET", "/api/v1/accounts/search", params, &accounts) + err := c.doAPI(http.MethodGet, "/api/v1/accounts/search", params, &accounts) if err != nil { return nil, err } @@ -180,7 +181,7 @@ func (c *Client) GetFollowRequests(uri string) ([]*Account, error) { params.Set("uri", uri) var accounts []*Account - err := c.doAPI("GET", "/api/v1/follow_requests", params, &accounts) + err := c.doAPI(http.MethodGet, "/api/v1/follow_requests", params, &accounts) if err != nil { return nil, err } diff --git a/mastodon.go b/mastodon.go index 1cb4cac..1112884 100644 --- a/mastodon.go +++ b/mastodon.go @@ -46,7 +46,7 @@ func (c *Client) doAPI(method string, uri string, params url.Values, res interfa return nil } - if method == "GET" && resp.StatusCode != http.StatusOK { + if method == http.MethodGet && resp.StatusCode != http.StatusOK { return fmt.Errorf("bad request: %v", resp.Status) } @@ -140,7 +140,7 @@ type Status struct { // GetTimelineHome return statuses from home timeline. func (c *Client) GetTimelineHome() ([]*Status, error) { var statuses []*Status - err := c.doAPI("GET", "/api/v1/timelines/home", nil, &statuses) + err := c.doAPI(http.MethodGet, "/api/v1/timelines/home", nil, &statuses) if err != nil { return nil, err } diff --git a/streaming.go b/streaming.go index b525897..6ccf82d 100644 --- a/streaming.go +++ b/streaming.go @@ -82,7 +82,7 @@ func (c *Client) StreamingPublic(ctx context.Context) (chan Event, error) { defer ctx.Done() for { - req, err := http.NewRequest("GET", url.String(), nil) + req, err := http.NewRequest(http.MethodGet, url.String(), nil) if err == nil { req.Header.Set("Authorization", "Bearer "+c.config.AccessToken) resp, err = c.Do(req) From 9dee3fc07f5b13480dc68cc091a81b06c354c117 Mon Sep 17 00:00:00 2001 From: 178inaba <178inaba@users.noreply.github.com> Date: Fri, 14 Apr 2017 23:59:11 +0900 Subject: [PATCH 2/2] Fix POST to http.MethodPost --- accounts.go | 14 +++++++------- apps.go | 2 +- mastodon.go | 4 ++-- mastodon_test.go | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/accounts.go b/accounts.go index b7da163..2e803ea 100644 --- a/accounts.go +++ b/accounts.go @@ -78,7 +78,7 @@ type Relationship struct { // AccountFollow follow the account. func (c *Client) AccountFollow(id int64) (*Relationship, error) { var relationship Relationship - err := c.doAPI("POST", fmt.Sprintf("/api/v1/accounts/%d/follow", id), nil, &relationship) + err := c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/follow", id), nil, &relationship) if err != nil { return nil, err } @@ -88,7 +88,7 @@ func (c *Client) AccountFollow(id int64) (*Relationship, error) { // AccountUnfollow unfollow the account. func (c *Client) AccountUnfollow(id int64) (*Relationship, error) { var relationship Relationship - err := c.doAPI("POST", fmt.Sprintf("/api/v1/accounts/%d/unfollow", id), nil, &relationship) + err := c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/unfollow", id), nil, &relationship) if err != nil { return nil, err } @@ -98,7 +98,7 @@ func (c *Client) AccountUnfollow(id int64) (*Relationship, error) { // AccountBlock block the account. func (c *Client) AccountBlock(id int64) (*Relationship, error) { var relationship Relationship - err := c.doAPI("POST", fmt.Sprintf("/api/v1/accounts/%d/block", id), nil, &relationship) + err := c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/block", id), nil, &relationship) if err != nil { return nil, err } @@ -108,7 +108,7 @@ func (c *Client) AccountBlock(id int64) (*Relationship, error) { // AccountUnblock unblock the account. func (c *Client) AccountUnblock(id int64) (*Relationship, error) { var relationship Relationship - err := c.doAPI("POST", fmt.Sprintf("/api/v1/accounts/%d/unblock", id), nil, &relationship) + err := c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/unblock", id), nil, &relationship) if err != nil { return nil, err } @@ -118,7 +118,7 @@ func (c *Client) AccountUnblock(id int64) (*Relationship, error) { // AccountMute mute the account. func (c *Client) AccountMute(id int64) (*Relationship, error) { var relationship Relationship - err := c.doAPI("POST", fmt.Sprintf("/api/v1/accounts/%d/mute", id), nil, &relationship) + err := c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/mute", id), nil, &relationship) if err != nil { return nil, err } @@ -128,7 +128,7 @@ func (c *Client) AccountMute(id int64) (*Relationship, error) { // AccountUnmute unmute the account. func (c *Client) AccountUnmute(id int64) (*Relationship, error) { var relationship Relationship - err := c.doAPI("POST", fmt.Sprintf("/api/v1/accounts/%d/unmute", id), nil, &relationship) + err := c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/unmute", id), nil, &relationship) if err != nil { return nil, err } @@ -168,7 +168,7 @@ func (c *Client) Follow(uri string) (*Account, error) { params.Set("uri", uri) var account Account - err := c.doAPI("POST", "/api/v1/follows", params, &account) + err := c.doAPI(http.MethodPost, "/api/v1/follows", params, &account) if err != nil { return nil, err } diff --git a/apps.go b/apps.go index d51b36e..b5a66d2 100644 --- a/apps.go +++ b/apps.go @@ -51,7 +51,7 @@ func RegisterApp(appConfig *AppConfig) (*Application, error) { } url.Path = path.Join(url.Path, "/api/v1/apps") - req, err := http.NewRequest("POST", url.String(), strings.NewReader(params.Encode())) + req, err := http.NewRequest(http.MethodPost, url.String(), strings.NewReader(params.Encode())) if err != nil { return nil, err } diff --git a/mastodon.go b/mastodon.go index 1112884..cecc2f6 100644 --- a/mastodon.go +++ b/mastodon.go @@ -77,7 +77,7 @@ func (c *Client) Authenticate(username, password string) error { } url.Path = path.Join(url.Path, "/oauth/token") - req, err := http.NewRequest("POST", url.String(), strings.NewReader(params.Encode())) + req, err := http.NewRequest(http.MethodPost, url.String(), strings.NewReader(params.Encode())) if err != nil { return err } @@ -158,7 +158,7 @@ func (c *Client) PostStatus(toot *Toot) (*Status, error) { //params.Set("visibility", "public") var status Status - err := c.doAPI("POST", "/api/v1/statuses", params, &status) + err := c.doAPI(http.MethodPost, "/api/v1/statuses", params, &status) if err != nil { return nil, err } diff --git a/mastodon_test.go b/mastodon_test.go index 6b2a570..bc020f2 100644 --- a/mastodon_test.go +++ b/mastodon_test.go @@ -195,7 +195,7 @@ func TestGetAccountFollowing(t *testing.T) { func TestRegisterApp(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if r.Method != "POST" { + if r.Method != http.MethodPost { http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest) return }