From a7e0c19d35cf405ccd29e7ffeade3d4d4f7b30f1 Mon Sep 17 00:00:00 2001 From: 178inaba <178inaba@users.noreply.github.com> Date: Tue, 18 Apr 2017 01:59:52 +0900 Subject: [PATCH 1/3] Fix get query to request url --- mastodon.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mastodon.go b/mastodon.go index 399eac4..a14c7c8 100644 --- a/mastodon.go +++ b/mastodon.go @@ -39,7 +39,13 @@ func (c *Client) doAPI(ctx context.Context, method string, uri string, params in var req *http.Request ct := "application/x-www-form-urlencoded" if values, ok := params.(url.Values); ok { - req, err = http.NewRequest(method, u.String(), strings.NewReader(values.Encode())) + var body io.Reader + if method == http.MethodGet { + u.RawQuery = values.Encode() + } else { + body = strings.NewReader(values.Encode()) + } + req, err = http.NewRequest(method, u.String(), body) if err != nil { return err } From 6f244235d46c1782be8360084ffef7d9e3e25127 Mon Sep 17 00:00:00 2001 From: 178inaba <178inaba@users.noreply.github.com> Date: Tue, 18 Apr 2017 02:45:40 +0900 Subject: [PATCH 2/3] Fix to be able to specify multiple id for GetAccountRelationships --- accounts.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/accounts.go b/accounts.go index 9e0b17d..a6d1e75 100644 --- a/accounts.go +++ b/accounts.go @@ -194,12 +194,14 @@ func (c *Client) AccountUnmute(ctx context.Context, id int64) (*Relationship, er } // GetAccountRelationship return relationship for the account. -func (c *Client) GetAccountRelationship(ctx context.Context, id int64) ([]*Relationship, error) { +func (c *Client) GetAccountRelationships(ctx context.Context, ids []int64) ([]*Relationship, error) { params := url.Values{} - params.Set("id", fmt.Sprint(id)) + for _, id := range ids { + params.Add("id[]", fmt.Sprint(id)) + } var relationships []*Relationship - err := c.doAPI(ctx, http.MethodGet, "/api/v1/accounts/relationship", params, &relationships) + err := c.doAPI(ctx, http.MethodGet, "/api/v1/accounts/relationships", params, &relationships) if err != nil { return nil, err } From 5d106e8942d233fd0cc0fe90e28e57c755b66190 Mon Sep 17 00:00:00 2001 From: 178inaba <178inaba@users.noreply.github.com> Date: Tue, 18 Apr 2017 02:46:10 +0900 Subject: [PATCH 3/3] Add accounts test --- accounts_test.go | 84 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 76 insertions(+), 8 deletions(-) diff --git a/accounts_test.go b/accounts_test.go index 73fea5f..5605331 100644 --- a/accounts_test.go +++ b/accounts_test.go @@ -450,12 +450,44 @@ func TestAccountUnmute(t *testing.T) { func TestGetAccountRelationship(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - fmt.Println(r.URL.String()) - if r.URL.Query().Get("id") != "1234567" { - http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound) + ids := r.URL.Query()["id[]"] + if ids[0] == "1234567" && ids[1] == "8901234" { + fmt.Fprintln(w, `[{"id":1234567},{"id":8901234}]`) return } - fmt.Fprintln(w, `[{"id":1234567}]`) + http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) + })) + defer ts.Close() + + client := NewClient(&Config{ + Server: ts.URL, + ClientID: "foo", + ClientSecret: "bar", + AccessToken: "zoo", + }) + _, err := client.GetAccountRelationships(context.Background(), []int64{123, 456}) + if err == nil { + t.Fatalf("should be fail: %v", err) + } + rels, err := client.GetAccountRelationships(context.Background(), []int64{1234567, 8901234}) + if err != nil { + t.Fatalf("should not be fail: %v", err) + } + if rels[0].ID != 1234567 { + t.Fatalf("want %d but %d", 1234567, rels[0].ID) + } + if rels[1].ID != 8901234 { + t.Fatalf("want %d but %d", 8901234, rels[1].ID) + } +} + +func TestAccountsSearch(t *testing.T) { + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.URL.Query()["q"][0] != "foo" { + http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) + return + } + fmt.Fprintln(w, `[{"Username": "foobar"}, {"Username": "barfoo"}]`) return })) defer ts.Close() @@ -466,16 +498,52 @@ func TestGetAccountRelationship(t *testing.T) { ClientSecret: "bar", AccessToken: "zoo", }) - _, err := client.GetAccountRelationship(context.Background(), 123) + _, err := client.AccountsSearch(context.Background(), "zzz", 2) if err == nil { t.Fatalf("should be fail: %v", err) } - rels, err := client.GetAccountRelationship(context.Background(), 1234567) + res, err := client.AccountsSearch(context.Background(), "foo", 2) if err != nil { t.Fatalf("should not be fail: %v", err) } - if rels[0].ID != 1234567 { - t.Fatalf("want %d but %d", 1234567, rels[0].ID) + if len(res) != 2 { + t.Fatalf("result should be two: %d", len(res)) + } + if res[0].Username != "foobar" { + t.Fatalf("want %q but %q", "foobar", res[0].Username) + } + if res[1].Username != "barfoo" { + t.Fatalf("want %q but %q", "barfoo", res[1].Username) + } +} + +func TestFollowRemoteUser(t *testing.T) { + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.PostFormValue("uri") != "foo@success.social" { + http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) + return + } + fmt.Fprintln(w, `{"Username": "zzz"}`) + return + })) + defer ts.Close() + + client := NewClient(&Config{ + Server: ts.URL, + ClientID: "foo", + ClientSecret: "bar", + AccessToken: "zoo", + }) + _, err := client.FollowRemoteUser(context.Background(), "foo@fail.social") + if err == nil { + t.Fatalf("should be fail: %v", err) + } + ru, err := client.FollowRemoteUser(context.Background(), "foo@success.social") + if err != nil { + t.Fatalf("should not be fail: %v", err) + } + if ru.Username != "zzz" { + t.Fatalf("want %q but %q", "zzz", ru.Username) } }