Merge pull request #19 from mattn/context

breaking compatibility changes. take context for first arguments.
pull/18/head^2
mattn 2017-04-17 12:27:47 +09:00 committed by GitHub
commit ea961f07a2
18 changed files with 150 additions and 130 deletions

View File

@ -1,6 +1,7 @@
package mastodon package mastodon
import ( import (
"context"
"fmt" "fmt"
"net/http" "net/http"
"net/url" "net/url"
@ -27,9 +28,9 @@ type Account struct {
} }
// GetAccount return Account. // GetAccount return Account.
func (c *Client) GetAccount(id int) (*Account, error) { func (c *Client) GetAccount(ctx context.Context, id int) (*Account, error) {
var account Account var account Account
err := c.doAPI(http.MethodGet, fmt.Sprintf("/api/v1/accounts/%d", id), nil, &account) err := c.doAPI(ctx, http.MethodGet, fmt.Sprintf("/api/v1/accounts/%d", id), nil, &account)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -37,9 +38,9 @@ func (c *Client) GetAccount(id int) (*Account, error) {
} }
// GetAccountCurrentUser return Account of current user. // GetAccountCurrentUser return Account of current user.
func (c *Client) GetAccountCurrentUser() (*Account, error) { func (c *Client) GetAccountCurrentUser(ctx context.Context) (*Account, error) {
var account Account var account Account
err := c.doAPI(http.MethodGet, "/api/v1/accounts/verify_credentials", nil, &account) err := c.doAPI(ctx, http.MethodGet, "/api/v1/accounts/verify_credentials", nil, &account)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -59,7 +60,7 @@ type Profile struct {
} }
// AccountUpdate updates the information of the current user. // AccountUpdate updates the information of the current user.
func (c *Client) AccountUpdate(profile *Profile) (*Account, error) { func (c *Client) AccountUpdate(ctx context.Context, profile *Profile) (*Account, error) {
params := url.Values{} params := url.Values{}
if profile.DisplayName != nil { if profile.DisplayName != nil {
params.Set("display_name", *profile.DisplayName) params.Set("display_name", *profile.DisplayName)
@ -75,7 +76,7 @@ func (c *Client) AccountUpdate(profile *Profile) (*Account, error) {
} }
var account Account var account Account
err := c.doAPI(http.MethodPatch, "/api/v1/accounts/update_credentials", params, &account) err := c.doAPI(ctx, http.MethodPatch, "/api/v1/accounts/update_credentials", params, &account)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -83,9 +84,9 @@ func (c *Client) AccountUpdate(profile *Profile) (*Account, error) {
} }
// GetAccountStatuses return statuses by specified accuont. // GetAccountStatuses return statuses by specified accuont.
func (c *Client) GetAccountStatuses(id int64) ([]*Status, error) { func (c *Client) GetAccountStatuses(ctx context.Context, id int64) ([]*Status, error) {
var statuses []*Status var statuses []*Status
err := c.doAPI(http.MethodGet, fmt.Sprintf("/api/v1/accounts/%d/statuses", id), nil, &statuses) err := c.doAPI(ctx, http.MethodGet, fmt.Sprintf("/api/v1/accounts/%d/statuses", id), nil, &statuses)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -93,9 +94,9 @@ func (c *Client) GetAccountStatuses(id int64) ([]*Status, error) {
} }
// GetAccountFollowers return followers list. // GetAccountFollowers return followers list.
func (c *Client) GetAccountFollowers(id int64) ([]*Account, error) { func (c *Client) GetAccountFollowers(ctx context.Context, id int64) ([]*Account, error) {
var accounts []*Account var accounts []*Account
err := c.doAPI(http.MethodGet, fmt.Sprintf("/api/v1/accounts/%d/followers", id), nil, &accounts) err := c.doAPI(ctx, http.MethodGet, fmt.Sprintf("/api/v1/accounts/%d/followers", id), nil, &accounts)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -103,9 +104,9 @@ func (c *Client) GetAccountFollowers(id int64) ([]*Account, error) {
} }
// GetAccountFollowing return following list. // GetAccountFollowing return following list.
func (c *Client) GetAccountFollowing(id int64) ([]*Account, error) { func (c *Client) GetAccountFollowing(ctx context.Context, id int64) ([]*Account, error) {
var accounts []*Account var accounts []*Account
err := c.doAPI(http.MethodGet, fmt.Sprintf("/api/v1/accounts/%d/following", id), nil, &accounts) err := c.doAPI(ctx, http.MethodGet, fmt.Sprintf("/api/v1/accounts/%d/following", id), nil, &accounts)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -113,9 +114,9 @@ func (c *Client) GetAccountFollowing(id int64) ([]*Account, error) {
} }
// GetBlocks return block list. // GetBlocks return block list.
func (c *Client) GetBlocks() ([]*Account, error) { func (c *Client) GetBlocks(ctx context.Context) ([]*Account, error) {
var accounts []*Account var accounts []*Account
err := c.doAPI(http.MethodGet, "/api/v1/blocks", nil, &accounts) err := c.doAPI(ctx, http.MethodGet, "/api/v1/blocks", nil, &accounts)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -133,9 +134,9 @@ type Relationship struct {
} }
// AccountFollow follow the account. // AccountFollow follow the account.
func (c *Client) AccountFollow(id int64) (*Relationship, error) { func (c *Client) AccountFollow(ctx context.Context, id int64) (*Relationship, error) {
var relationship Relationship var relationship Relationship
err := c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/follow", id), nil, &relationship) err := c.doAPI(ctx, http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/follow", id), nil, &relationship)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -143,9 +144,9 @@ func (c *Client) AccountFollow(id int64) (*Relationship, error) {
} }
// AccountUnfollow unfollow the account. // AccountUnfollow unfollow the account.
func (c *Client) AccountUnfollow(id int64) (*Relationship, error) { func (c *Client) AccountUnfollow(ctx context.Context, id int64) (*Relationship, error) {
var relationship Relationship var relationship Relationship
err := c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/unfollow", id), nil, &relationship) err := c.doAPI(ctx, http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/unfollow", id), nil, &relationship)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -153,9 +154,9 @@ func (c *Client) AccountUnfollow(id int64) (*Relationship, error) {
} }
// AccountBlock block the account. // AccountBlock block the account.
func (c *Client) AccountBlock(id int64) (*Relationship, error) { func (c *Client) AccountBlock(ctx context.Context, id int64) (*Relationship, error) {
var relationship Relationship var relationship Relationship
err := c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/block", id), nil, &relationship) err := c.doAPI(ctx, http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/block", id), nil, &relationship)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -163,9 +164,9 @@ func (c *Client) AccountBlock(id int64) (*Relationship, error) {
} }
// AccountUnblock unblock the account. // AccountUnblock unblock the account.
func (c *Client) AccountUnblock(id int64) (*Relationship, error) { func (c *Client) AccountUnblock(ctx context.Context, id int64) (*Relationship, error) {
var relationship Relationship var relationship Relationship
err := c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/unblock", id), nil, &relationship) err := c.doAPI(ctx, http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/unblock", id), nil, &relationship)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -173,9 +174,9 @@ func (c *Client) AccountUnblock(id int64) (*Relationship, error) {
} }
// AccountMute mute the account. // AccountMute mute the account.
func (c *Client) AccountMute(id int64) (*Relationship, error) { func (c *Client) AccountMute(ctx context.Context, id int64) (*Relationship, error) {
var relationship Relationship var relationship Relationship
err := c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/mute", id), nil, &relationship) err := c.doAPI(ctx, http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/mute", id), nil, &relationship)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -183,9 +184,9 @@ func (c *Client) AccountMute(id int64) (*Relationship, error) {
} }
// AccountUnmute unmute the account. // AccountUnmute unmute the account.
func (c *Client) AccountUnmute(id int64) (*Relationship, error) { func (c *Client) AccountUnmute(ctx context.Context, id int64) (*Relationship, error) {
var relationship Relationship var relationship Relationship
err := c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/unmute", id), nil, &relationship) err := c.doAPI(ctx, http.MethodPost, fmt.Sprintf("/api/v1/accounts/%d/unmute", id), nil, &relationship)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -193,12 +194,12 @@ func (c *Client) AccountUnmute(id int64) (*Relationship, error) {
} }
// GetAccountRelationship return relationship for the account. // GetAccountRelationship return relationship for the account.
func (c *Client) GetAccountRelationship(id int64) ([]*Relationship, error) { func (c *Client) GetAccountRelationship(ctx context.Context, id int64) ([]*Relationship, error) {
params := url.Values{} params := url.Values{}
params.Set("id", fmt.Sprint(id)) params.Set("id", fmt.Sprint(id))
var relationships []*Relationship var relationships []*Relationship
err := c.doAPI(http.MethodGet, "/api/v1/accounts/relationship", params, &relationships) err := c.doAPI(ctx, http.MethodGet, "/api/v1/accounts/relationship", params, &relationships)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -206,13 +207,13 @@ func (c *Client) GetAccountRelationship(id int64) ([]*Relationship, error) {
} }
// AccountsSearch search accounts by query. // AccountsSearch search accounts by query.
func (c *Client) AccountsSearch(q string, limit int64) ([]*Account, error) { func (c *Client) AccountsSearch(ctx context.Context, q string, limit int64) ([]*Account, error) {
params := url.Values{} params := url.Values{}
params.Set("q", q) params.Set("q", q)
params.Set("limit", fmt.Sprint(limit)) params.Set("limit", fmt.Sprint(limit))
var accounts []*Account var accounts []*Account
err := c.doAPI(http.MethodGet, "/api/v1/accounts/search", params, &accounts) err := c.doAPI(ctx, http.MethodGet, "/api/v1/accounts/search", params, &accounts)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -220,12 +221,12 @@ func (c *Client) AccountsSearch(q string, limit int64) ([]*Account, error) {
} }
// FollowRemoteUser send follow-request. // FollowRemoteUser send follow-request.
func (c *Client) FollowRemoteUser(uri string) (*Account, error) { func (c *Client) FollowRemoteUser(ctx context.Context, uri string) (*Account, error) {
params := url.Values{} params := url.Values{}
params.Set("uri", uri) params.Set("uri", uri)
var account Account var account Account
err := c.doAPI(http.MethodPost, "/api/v1/follows", params, &account) err := c.doAPI(ctx, http.MethodPost, "/api/v1/follows", params, &account)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -233,9 +234,9 @@ func (c *Client) FollowRemoteUser(uri string) (*Account, error) {
} }
// GetFollowRequests return follow-requests. // GetFollowRequests return follow-requests.
func (c *Client) GetFollowRequests() ([]*Account, error) { func (c *Client) GetFollowRequests(ctx context.Context) ([]*Account, error) {
var accounts []*Account var accounts []*Account
err := c.doAPI(http.MethodGet, "/api/v1/follow_requests", nil, &accounts) err := c.doAPI(ctx, http.MethodGet, "/api/v1/follow_requests", nil, &accounts)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -243,11 +244,11 @@ func (c *Client) GetFollowRequests() ([]*Account, error) {
} }
// FollowRequestAuthorize is authorize the follow request of user with id. // FollowRequestAuthorize is authorize the follow request of user with id.
func (c *Client) FollowRequestAuthorize(id int64) error { func (c *Client) FollowRequestAuthorize(ctx context.Context, id int64) error {
return c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/follow_requests/%d/authorize", id), nil, nil) return c.doAPI(ctx, http.MethodPost, fmt.Sprintf("/api/v1/follow_requests/%d/authorize", id), nil, nil)
} }
// FollowRequestReject is rejects the follow request of user with id. // FollowRequestReject is rejects the follow request of user with id.
func (c *Client) FollowRequestReject(id int64) error { func (c *Client) FollowRequestReject(ctx context.Context, id int64) error {
return c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/follow_requests/%d/reject", id), nil, nil) return c.doAPI(ctx, http.MethodPost, fmt.Sprintf("/api/v1/follow_requests/%d/reject", id), nil, nil)
} }

View File

@ -1,6 +1,7 @@
package mastodon package mastodon
import ( import (
"context"
"fmt" "fmt"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
@ -20,7 +21,7 @@ func TestAccountUpdate(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
a, err := client.AccountUpdate(&Profile{ a, err := client.AccountUpdate(context.Background(), &Profile{
DisplayName: String("display_name"), DisplayName: String("display_name"),
Note: String("note"), Note: String("note"),
Avatar: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAUoAAADrCAYAAAA...", Avatar: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAUoAAADrCAYAAAA...",
@ -47,7 +48,7 @@ func TestGetBlocks(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
bl, err := client.GetBlocks() bl, err := client.GetBlocks(context.Background())
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
@ -79,11 +80,11 @@ func TestAccountFollow(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
rel, err := client.AccountFollow(123) rel, err := client.AccountFollow(context.Background(), 123)
if err == nil { if err == nil {
t.Fatalf("should be fail: %v", err) t.Fatalf("should be fail: %v", err)
} }
rel, err = client.AccountFollow(1234567) rel, err = client.AccountFollow(context.Background(), 1234567)
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
@ -112,11 +113,11 @@ func TestAccountUnfollow(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
rel, err := client.AccountUnfollow(123) rel, err := client.AccountUnfollow(context.Background(), 123)
if err == nil { if err == nil {
t.Fatalf("should be fail: %v", err) t.Fatalf("should be fail: %v", err)
} }
rel, err = client.AccountUnfollow(1234567) rel, err = client.AccountUnfollow(context.Background(), 1234567)
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
@ -147,11 +148,11 @@ func TestGetFollowRequests(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
_, err := client.GetFollowRequests() _, err := client.GetFollowRequests(context.Background())
if err == nil { if err == nil {
t.Fatalf("should be fail: %v", err) t.Fatalf("should be fail: %v", err)
} }
fReqs, err := client.GetFollowRequests() fReqs, err := client.GetFollowRequests(context.Background())
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
@ -180,11 +181,11 @@ func TestFollowRequestAuthorize(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
err := client.FollowRequestAuthorize(123) err := client.FollowRequestAuthorize(context.Background(), 123)
if err == nil { if err == nil {
t.Fatalf("should be fail: %v", err) t.Fatalf("should be fail: %v", err)
} }
err = client.FollowRequestAuthorize(1234567) err = client.FollowRequestAuthorize(context.Background(), 1234567)
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
@ -204,11 +205,11 @@ func TestFollowRequestReject(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
err := client.FollowRequestReject(123) err := client.FollowRequestReject(context.Background(), 123)
if err == nil { if err == nil {
t.Fatalf("should be fail: %v", err) t.Fatalf("should be fail: %v", err)
} }
err = client.FollowRequestReject(1234567) err = client.FollowRequestReject(context.Background(), 1234567)
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }

View File

@ -1,6 +1,7 @@
package mastodon package mastodon
import ( import (
"context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/http" "net/http"
@ -34,7 +35,7 @@ type Application struct {
} }
// RegisterApp returns the mastodon application. // RegisterApp returns the mastodon application.
func RegisterApp(appConfig *AppConfig) (*Application, error) { func RegisterApp(ctx context.Context, appConfig *AppConfig) (*Application, error) {
params := url.Values{} params := url.Values{}
params.Set("client_name", appConfig.ClientName) params.Set("client_name", appConfig.ClientName)
if appConfig.RedirectURIs == "" { if appConfig.RedirectURIs == "" {

View File

@ -1,6 +1,7 @@
package mastodon package mastodon
import ( import (
"context"
"fmt" "fmt"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
@ -26,7 +27,7 @@ func TestRegisterApp(t *testing.T) {
})) }))
defer ts.Close() defer ts.Close()
app, err := RegisterApp(&AppConfig{ app, err := RegisterApp(context.Background(), &AppConfig{
Server: ts.URL, Server: ts.URL,
Scopes: "read write follow", Scopes: "read write follow",
}) })

View File

@ -1,6 +1,7 @@
package main package main
import ( import (
"context"
"fmt" "fmt"
"github.com/mattn/go-mastodon" "github.com/mattn/go-mastodon"
@ -9,7 +10,7 @@ import (
func cmdAccount(c *cli.Context) error { func cmdAccount(c *cli.Context) error {
client := c.App.Metadata["client"].(*mastodon.Client) client := c.App.Metadata["client"].(*mastodon.Client)
account, err := client.GetAccountCurrentUser() account, err := client.GetAccountCurrentUser(context.Background())
if err != nil { if err != nil {
return err return err
} }

View File

@ -1,6 +1,7 @@
package main package main
import ( import (
"context"
"fmt" "fmt"
"github.com/mattn/go-mastodon" "github.com/mattn/go-mastodon"
@ -9,11 +10,11 @@ import (
func cmdFollowers(c *cli.Context) error { func cmdFollowers(c *cli.Context) error {
client := c.App.Metadata["client"].(*mastodon.Client) client := c.App.Metadata["client"].(*mastodon.Client)
account, err := client.GetAccountCurrentUser() account, err := client.GetAccountCurrentUser(context.Background())
if err != nil { if err != nil {
return err return err
} }
followers, err := client.GetAccountFollowers(account.ID) followers, err := client.GetAccountFollowers(context.Background(), account.ID)
if err != nil { if err != nil {
return err return err
} }

View File

@ -1,6 +1,7 @@
package main package main
import ( import (
"context"
"fmt" "fmt"
"github.com/mattn/go-mastodon" "github.com/mattn/go-mastodon"
@ -9,7 +10,7 @@ import (
func cmdInstance(c *cli.Context) error { func cmdInstance(c *cli.Context) error {
client := c.App.Metadata["client"].(*mastodon.Client) client := c.App.Metadata["client"].(*mastodon.Client)
instance, err := client.GetInstance() instance, err := client.GetInstance(context.Background())
if err != nil { if err != nil {
return err return err
} }

View File

@ -1,6 +1,7 @@
package main package main
import ( import (
"context"
"fmt" "fmt"
"github.com/fatih/color" "github.com/fatih/color"
@ -10,7 +11,7 @@ import (
func cmdNotification(c *cli.Context) error { func cmdNotification(c *cli.Context) error {
client := c.App.Metadata["client"].(*mastodon.Client) client := c.App.Metadata["client"].(*mastodon.Client)
notifications, err := client.GetNotifications() notifications, err := client.GetNotifications(context.Background())
if err != nil { if err != nil {
return err return err
} }

View File

@ -1,6 +1,7 @@
package main package main
import ( import (
"context"
"errors" "errors"
"fmt" "fmt"
@ -14,7 +15,7 @@ func cmdSearch(c *cli.Context) error {
} }
client := c.App.Metadata["client"].(*mastodon.Client) client := c.App.Metadata["client"].(*mastodon.Client)
results, err := client.Search(argstr(c), false) results, err := client.Search(context.Background(), argstr(c), false)
if err != nil { if err != nil {
return err return err
} }

View File

@ -1,6 +1,7 @@
package main package main
import ( import (
"context"
"fmt" "fmt"
"github.com/fatih/color" "github.com/fatih/color"
@ -10,7 +11,7 @@ import (
func cmdTimeline(c *cli.Context) error { func cmdTimeline(c *cli.Context) error {
client := c.App.Metadata["client"].(*mastodon.Client) client := c.App.Metadata["client"].(*mastodon.Client)
timeline, err := client.GetTimelineHome() timeline, err := client.GetTimelineHome(context.Background())
if err != nil { if err != nil {
return err return err
} }

View File

@ -1,6 +1,7 @@
package main package main
import ( import (
"context"
"errors" "errors"
"log" "log"
@ -24,7 +25,7 @@ func cmdToot(c *cli.Context) error {
toot = argstr(c) toot = argstr(c)
} }
client := c.App.Metadata["client"].(*mastodon.Client) client := c.App.Metadata["client"].(*mastodon.Client)
_, err := client.PostStatus(&mastodon.Toot{ _, err := client.PostStatus(context.Background(), &mastodon.Toot{
Status: toot, Status: toot,
}) })
return err return err

View File

@ -3,6 +3,7 @@ package main
import ( import (
"bufio" "bufio"
"bytes" "bytes"
"context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
@ -128,7 +129,7 @@ func authenticate(client *mastodon.Client, config *mastodon.Config, file string)
if err != nil { if err != nil {
return err return err
} }
err = client.Authenticate(email, password) err = client.Authenticate(context.Background(), email, password)
if err != nil { if err != nil {
return err return err
} }

View File

@ -1,6 +1,9 @@
package mastodon package mastodon
import "net/http" import (
"context"
"net/http"
)
// Instance hold information for mastodon instance. // Instance hold information for mastodon instance.
type Instance struct { type Instance struct {
@ -11,9 +14,9 @@ type Instance struct {
} }
// GetInstance return Instance. // GetInstance return Instance.
func (c *Client) GetInstance() (*Instance, error) { func (c *Client) GetInstance(ctx context.Context) (*Instance, error) {
var instance Instance var instance Instance
err := c.doAPI(http.MethodGet, "/api/v1/instance", nil, &instance) err := c.doAPI(ctx, http.MethodGet, "/api/v1/instance", nil, &instance)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@ -1,6 +1,7 @@
package mastodon package mastodon
import ( import (
"context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/http" "net/http"
@ -23,23 +24,24 @@ type Client struct {
config *Config config *Config
} }
func (c *Client) doAPI(method string, uri string, params url.Values, res interface{}) error { func (c *Client) doAPI(ctx context.Context, method string, uri string, params url.Values, res interface{}) error {
u, err := url.Parse(c.config.Server) u, err := url.Parse(c.config.Server)
if err != nil { if err != nil {
return err return err
} }
u.Path = path.Join(u.Path, uri) u.Path = path.Join(u.Path, uri)
var resp *http.Response
req, err := http.NewRequest(method, u.String(), strings.NewReader(params.Encode())) req, err := http.NewRequest(method, u.String(), strings.NewReader(params.Encode()))
if err != nil { if err != nil {
return err return err
} }
req.WithContext(ctx)
req.Header.Set("Authorization", "Bearer "+c.config.AccessToken) req.Header.Set("Authorization", "Bearer "+c.config.AccessToken)
if params != nil { if params != nil {
req.Header.Set("Content-Type", "application/x-www-form-urlencoded") req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
} }
resp, err = c.Do(req)
resp, err := c.Do(req)
if err != nil { if err != nil {
return err return err
} }
@ -50,7 +52,6 @@ func (c *Client) doAPI(method string, uri string, params url.Values, res interfa
} else if res == nil { } else if res == nil {
return nil return nil
} }
return json.NewDecoder(resp.Body).Decode(&res) return json.NewDecoder(resp.Body).Decode(&res)
} }
@ -63,7 +64,7 @@ func NewClient(config *Config) *Client {
} }
// Authenticate get access-token to the API. // Authenticate get access-token to the API.
func (c *Client) Authenticate(username, password string) error { func (c *Client) Authenticate(ctx context.Context, username, password string) error {
params := url.Values{} params := url.Values{}
params.Set("client_id", c.config.ClientID) params.Set("client_id", c.config.ClientID)
params.Set("client_secret", c.config.ClientSecret) params.Set("client_secret", c.config.ClientSecret)

View File

@ -1,6 +1,7 @@
package mastodon package mastodon
import ( import (
"context"
"fmt" "fmt"
"io" "io"
"net/http" "net/http"
@ -24,7 +25,7 @@ func TestAuthenticate(t *testing.T) {
ClientID: "foo", ClientID: "foo",
ClientSecret: "bar", ClientSecret: "bar",
}) })
err := client.Authenticate("invalid", "user") err := client.Authenticate(context.Background(), "invalid", "user")
if err == nil { if err == nil {
t.Fatalf("should be fail: %v", err) t.Fatalf("should be fail: %v", err)
} }
@ -34,7 +35,7 @@ func TestAuthenticate(t *testing.T) {
ClientID: "foo", ClientID: "foo",
ClientSecret: "bar", ClientSecret: "bar",
}) })
err = client.Authenticate("valid", "user") err = client.Authenticate(context.Background(), "valid", "user")
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
@ -56,7 +57,7 @@ func TestPostStatus(t *testing.T) {
ClientID: "foo", ClientID: "foo",
ClientSecret: "bar", ClientSecret: "bar",
}) })
_, err := client.PostStatus(&Toot{ _, err := client.PostStatus(context.Background(), &Toot{
Status: "foobar", Status: "foobar",
}) })
if err == nil { if err == nil {
@ -69,7 +70,7 @@ func TestPostStatus(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
_, err = client.PostStatus(&Toot{ _, err = client.PostStatus(context.Background(), &Toot{
Status: "foobar", Status: "foobar",
}) })
if err != nil { if err != nil {
@ -89,7 +90,7 @@ func TestGetTimelineHome(t *testing.T) {
ClientID: "foo", ClientID: "foo",
ClientSecret: "bar", ClientSecret: "bar",
}) })
_, err := client.PostStatus(&Toot{ _, err := client.PostStatus(context.Background(), &Toot{
Status: "foobar", Status: "foobar",
}) })
if err == nil { if err == nil {
@ -102,7 +103,7 @@ func TestGetTimelineHome(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
tl, err := client.GetTimelineHome() tl, err := client.GetTimelineHome(context.Background())
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
@ -142,11 +143,11 @@ func TestGetAccount(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
a, err := client.GetAccount(1) a, err := client.GetAccount(context.Background(), 1)
if err == nil { if err == nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
a, err = client.GetAccount(1234567) a, err = client.GetAccount(context.Background(), 1234567)
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
@ -172,11 +173,11 @@ func TestGetAccountFollowing(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
fl, err := client.GetAccountFollowing(123) fl, err := client.GetAccountFollowing(context.Background(), 123)
if err == nil { if err == nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
fl, err = client.GetAccountFollowing(1234567) fl, err = client.GetAccountFollowing(context.Background(), 1234567)
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }

View File

@ -1,6 +1,7 @@
package mastodon package mastodon
import ( import (
"context"
"fmt" "fmt"
"net/http" "net/http"
"time" "time"
@ -16,9 +17,9 @@ type Notification struct {
} }
// GetNotifications return notifications. // GetNotifications return notifications.
func (c *Client) GetNotifications() ([]*Notification, error) { func (c *Client) GetNotifications(ctx context.Context) ([]*Notification, error) {
var notifications []*Notification var notifications []*Notification
err := c.doAPI(http.MethodGet, "/api/v1/notifications", nil, &notifications) err := c.doAPI(ctx, http.MethodGet, "/api/v1/notifications", nil, &notifications)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -26,9 +27,9 @@ func (c *Client) GetNotifications() ([]*Notification, error) {
} }
// GetNotification return notifications. // GetNotification return notifications.
func (c *Client) GetNotification(id int64) (*Notification, error) { func (c *Client) GetNotification(ctx context.Context, id int64) (*Notification, error) {
var notification Notification var notification Notification
err := c.doAPI(http.MethodGet, fmt.Sprintf("/api/v1/notifications/%d", id), nil, &notification) err := c.doAPI(ctx, http.MethodGet, fmt.Sprintf("/api/v1/notifications/%d", id), nil, &notification)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -36,6 +37,6 @@ func (c *Client) GetNotification(id int64) (*Notification, error) {
} }
// ClearNotifications clear notifications. // ClearNotifications clear notifications.
func (c *Client) ClearNotifications() error { func (c *Client) ClearNotifications(ctx context.Context) error {
return c.doAPI(http.MethodPost, "/api/v1/notifications/clear", nil, nil) return c.doAPI(ctx, http.MethodPost, "/api/v1/notifications/clear", nil, nil)
} }

View File

@ -1,6 +1,7 @@
package mastodon package mastodon
import ( import (
"context"
"fmt" "fmt"
"net/http" "net/http"
"net/url" "net/url"
@ -46,9 +47,9 @@ type Card struct {
} }
// GetFavourites return the favorite list of the current user. // GetFavourites return the favorite list of the current user.
func (c *Client) GetFavourites() ([]*Status, error) { func (c *Client) GetFavourites(ctx context.Context) ([]*Status, error) {
var statuses []*Status var statuses []*Status
err := c.doAPI(http.MethodGet, "/api/v1/favourites", nil, &statuses) err := c.doAPI(ctx, http.MethodGet, "/api/v1/favourites", nil, &statuses)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -56,9 +57,9 @@ func (c *Client) GetFavourites() ([]*Status, error) {
} }
// GetStatus return status specified by id. // GetStatus return status specified by id.
func (c *Client) GetStatus(id int64) (*Status, error) { func (c *Client) GetStatus(ctx context.Context, id int64) (*Status, error) {
var status Status var status Status
err := c.doAPI(http.MethodGet, fmt.Sprintf("/api/v1/statuses/%d", id), nil, &status) err := c.doAPI(ctx, http.MethodGet, fmt.Sprintf("/api/v1/statuses/%d", id), nil, &status)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -66,9 +67,9 @@ func (c *Client) GetStatus(id int64) (*Status, error) {
} }
// GetStatusContext return status specified by id. // GetStatusContext return status specified by id.
func (c *Client) GetStatusContext(id int64) (*Context, error) { func (c *Client) GetStatusContext(ctx context.Context, id int64) (*Context, error) {
var context Context var context Context
err := c.doAPI(http.MethodGet, fmt.Sprintf("/api/v1/statuses/%d/context", id), nil, &context) err := c.doAPI(ctx, http.MethodGet, fmt.Sprintf("/api/v1/statuses/%d/context", id), nil, &context)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -76,9 +77,9 @@ func (c *Client) GetStatusContext(id int64) (*Context, error) {
} }
// GetStatusCard return status specified by id. // GetStatusCard return status specified by id.
func (c *Client) GetStatusCard(id int64) (*Card, error) { func (c *Client) GetStatusCard(ctx context.Context, id int64) (*Card, error) {
var card Card var card Card
err := c.doAPI(http.MethodGet, fmt.Sprintf("/api/v1/statuses/%d/card", id), nil, &card) err := c.doAPI(ctx, http.MethodGet, fmt.Sprintf("/api/v1/statuses/%d/card", id), nil, &card)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -86,9 +87,9 @@ func (c *Client) GetStatusCard(id int64) (*Card, error) {
} }
// GetRebloggedBy returns the account list of the user who reblogged the toot of id. // GetRebloggedBy returns the account list of the user who reblogged the toot of id.
func (c *Client) GetRebloggedBy(id int64) ([]*Account, error) { func (c *Client) GetRebloggedBy(ctx context.Context, id int64) ([]*Account, error) {
var accounts []*Account var accounts []*Account
err := c.doAPI(http.MethodGet, fmt.Sprintf("/api/v1/statuses/%d/reblogged_by", id), nil, &accounts) err := c.doAPI(ctx, http.MethodGet, fmt.Sprintf("/api/v1/statuses/%d/reblogged_by", id), nil, &accounts)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -96,9 +97,9 @@ func (c *Client) GetRebloggedBy(id int64) ([]*Account, error) {
} }
// GetFavouritedBy returns the account list of the user who liked the toot of id. // GetFavouritedBy returns the account list of the user who liked the toot of id.
func (c *Client) GetFavouritedBy(id int64) ([]*Account, error) { func (c *Client) GetFavouritedBy(ctx context.Context, id int64) ([]*Account, error) {
var accounts []*Account var accounts []*Account
err := c.doAPI(http.MethodGet, fmt.Sprintf("/api/v1/statuses/%d/favourited_by", id), nil, &accounts) err := c.doAPI(ctx, http.MethodGet, fmt.Sprintf("/api/v1/statuses/%d/favourited_by", id), nil, &accounts)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -106,9 +107,9 @@ func (c *Client) GetFavouritedBy(id int64) ([]*Account, error) {
} }
// Reblog is reblog the toot of id and return status of reblog. // Reblog is reblog the toot of id and return status of reblog.
func (c *Client) Reblog(id int64) (*Status, error) { func (c *Client) Reblog(ctx context.Context, id int64) (*Status, error) {
var status Status var status Status
err := c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/statuses/%d/reblog", id), nil, &status) err := c.doAPI(ctx, http.MethodPost, fmt.Sprintf("/api/v1/statuses/%d/reblog", id), nil, &status)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -116,9 +117,9 @@ func (c *Client) Reblog(id int64) (*Status, error) {
} }
// Unreblog is unreblog the toot of id and return status of the original toot. // Unreblog is unreblog the toot of id and return status of the original toot.
func (c *Client) Unreblog(id int64) (*Status, error) { func (c *Client) Unreblog(ctx context.Context, id int64) (*Status, error) {
var status Status var status Status
err := c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/statuses/%d/unreblog", id), nil, &status) err := c.doAPI(ctx, http.MethodPost, fmt.Sprintf("/api/v1/statuses/%d/unreblog", id), nil, &status)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -126,9 +127,9 @@ func (c *Client) Unreblog(id int64) (*Status, error) {
} }
// Favourite is favourite the toot of id and return status of the favourite toot. // Favourite is favourite the toot of id and return status of the favourite toot.
func (c *Client) Favourite(id int64) (*Status, error) { func (c *Client) Favourite(ctx context.Context, id int64) (*Status, error) {
var status Status var status Status
err := c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/statuses/%d/favourite", id), nil, &status) err := c.doAPI(ctx, http.MethodPost, fmt.Sprintf("/api/v1/statuses/%d/favourite", id), nil, &status)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -136,9 +137,9 @@ func (c *Client) Favourite(id int64) (*Status, error) {
} }
// Unfavourite is unfavourite the toot of id and return status of the unfavourite toot. // Unfavourite is unfavourite the toot of id and return status of the unfavourite toot.
func (c *Client) Unfavourite(id int64) (*Status, error) { func (c *Client) Unfavourite(ctx context.Context, id int64) (*Status, error) {
var status Status var status Status
err := c.doAPI(http.MethodPost, fmt.Sprintf("/api/v1/statuses/%d/unfavourite", id), nil, &status) err := c.doAPI(ctx, http.MethodPost, fmt.Sprintf("/api/v1/statuses/%d/unfavourite", id), nil, &status)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -146,9 +147,9 @@ func (c *Client) Unfavourite(id int64) (*Status, error) {
} }
// GetTimelineHome return statuses from home timeline. // GetTimelineHome return statuses from home timeline.
func (c *Client) GetTimelineHome() ([]*Status, error) { func (c *Client) GetTimelineHome(ctx context.Context) ([]*Status, error) {
var statuses []*Status var statuses []*Status
err := c.doAPI(http.MethodGet, "/api/v1/timelines/home", nil, &statuses) err := c.doAPI(ctx, http.MethodGet, "/api/v1/timelines/home", nil, &statuses)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -156,9 +157,9 @@ func (c *Client) GetTimelineHome() ([]*Status, error) {
} }
// GetTimelineHashtag return statuses from tagged timeline. // GetTimelineHashtag return statuses from tagged timeline.
func (c *Client) GetTimelineHashtag(tag string) ([]*Status, error) { func (c *Client) GetTimelineHashtag(ctx context.Context, tag string) ([]*Status, error) {
var statuses []*Status var statuses []*Status
err := c.doAPI(http.MethodGet, fmt.Sprintf("/api/v1/timelines/tag/%s", (&url.URL{Path: tag}).EscapedPath()), nil, &statuses) err := c.doAPI(ctx, http.MethodGet, fmt.Sprintf("/api/v1/timelines/tag/%s", (&url.URL{Path: tag}).EscapedPath()), nil, &statuses)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -166,7 +167,7 @@ func (c *Client) GetTimelineHashtag(tag string) ([]*Status, error) {
} }
// PostStatus post the toot. // PostStatus post the toot.
func (c *Client) PostStatus(toot *Toot) (*Status, error) { func (c *Client) PostStatus(ctx context.Context, toot *Toot) (*Status, error) {
params := url.Values{} params := url.Values{}
params.Set("status", toot.Status) params.Set("status", toot.Status)
if toot.InReplyToID > 0 { if toot.InReplyToID > 0 {
@ -176,7 +177,7 @@ func (c *Client) PostStatus(toot *Toot) (*Status, error) {
//params.Set("visibility", "public") //params.Set("visibility", "public")
var status Status var status Status
err := c.doAPI(http.MethodPost, "/api/v1/statuses", params, &status) err := c.doAPI(ctx, http.MethodPost, "/api/v1/statuses", params, &status)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -184,17 +185,17 @@ func (c *Client) PostStatus(toot *Toot) (*Status, error) {
} }
// DeleteStatus delete the toot. // DeleteStatus delete the toot.
func (c *Client) DeleteStatus(id int64) error { func (c *Client) DeleteStatus(ctx context.Context, id int64) error {
return c.doAPI(http.MethodDelete, fmt.Sprintf("/api/v1/statuses/%d", id), nil, nil) return c.doAPI(ctx, http.MethodDelete, fmt.Sprintf("/api/v1/statuses/%d", id), nil, nil)
} }
// Search search content with query. // Search search content with query.
func (c *Client) Search(q string, resolve bool) (*Results, error) { func (c *Client) Search(ctx context.Context, q string, resolve bool) (*Results, error) {
params := url.Values{} params := url.Values{}
params.Set("q", q) params.Set("q", q)
params.Set("resolve", fmt.Sprint(resolve)) params.Set("resolve", fmt.Sprint(resolve))
var results Results var results Results
err := c.doAPI(http.MethodGet, "/api/v1/search", params, &results) err := c.doAPI(ctx, http.MethodGet, "/api/v1/search", params, &results)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@ -1,6 +1,7 @@
package mastodon package mastodon
import ( import (
"context"
"fmt" "fmt"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
@ -20,7 +21,7 @@ func TestGetFavourites(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
favs, err := client.GetFavourites() favs, err := client.GetFavourites(context.Background())
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
@ -52,11 +53,11 @@ func TestGetStatus(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
_, err := client.GetStatus(123) _, err := client.GetStatus(context.Background(), 123)
if err == nil { if err == nil {
t.Fatalf("should be fail: %v", err) t.Fatalf("should be fail: %v", err)
} }
status, err := client.GetStatus(1234567) status, err := client.GetStatus(context.Background(), 1234567)
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
@ -82,11 +83,11 @@ func TestGetRebloggedBy(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
_, err := client.GetRebloggedBy(123) _, err := client.GetRebloggedBy(context.Background(), 123)
if err == nil { if err == nil {
t.Fatalf("should be fail: %v", err) t.Fatalf("should be fail: %v", err)
} }
rbs, err := client.GetRebloggedBy(1234567) rbs, err := client.GetRebloggedBy(context.Background(), 1234567)
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
@ -118,11 +119,11 @@ func TestGetFavouritedBy(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
_, err := client.GetFavouritedBy(123) _, err := client.GetFavouritedBy(context.Background(), 123)
if err == nil { if err == nil {
t.Fatalf("should be fail: %v", err) t.Fatalf("should be fail: %v", err)
} }
fbs, err := client.GetFavouritedBy(1234567) fbs, err := client.GetFavouritedBy(context.Background(), 1234567)
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
@ -154,11 +155,11 @@ func TestReblog(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
_, err := client.Reblog(123) _, err := client.Reblog(context.Background(), 123)
if err == nil { if err == nil {
t.Fatalf("should be fail: %v", err) t.Fatalf("should be fail: %v", err)
} }
status, err := client.Reblog(1234567) status, err := client.Reblog(context.Background(), 1234567)
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
@ -184,11 +185,11 @@ func TestUnreblog(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
_, err := client.Unreblog(123) _, err := client.Unreblog(context.Background(), 123)
if err == nil { if err == nil {
t.Fatalf("should be fail: %v", err) t.Fatalf("should be fail: %v", err)
} }
status, err := client.Unreblog(1234567) status, err := client.Unreblog(context.Background(), 1234567)
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
@ -214,11 +215,11 @@ func TestFavourite(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
_, err := client.Favourite(123) _, err := client.Favourite(context.Background(), 123)
if err == nil { if err == nil {
t.Fatalf("should be fail: %v", err) t.Fatalf("should be fail: %v", err)
} }
status, err := client.Favourite(1234567) status, err := client.Favourite(context.Background(), 1234567)
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
@ -244,11 +245,11 @@ func TestUnfavourite(t *testing.T) {
ClientSecret: "bar", ClientSecret: "bar",
AccessToken: "zoo", AccessToken: "zoo",
}) })
_, err := client.Unfavourite(123) _, err := client.Unfavourite(context.Background(), 123)
if err == nil { if err == nil {
t.Fatalf("should be fail: %v", err) t.Fatalf("should be fail: %v", err)
} }
status, err := client.Unfavourite(1234567) status, err := client.Unfavourite(context.Background(), 1234567)
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }