aw/go-mastodon
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63 from zetamatta/notification-id

Browse Source 
Fix: Type of Notification.ID was int64. Change to ID
This commit is contained in:
mattn 2017-10-25 14:56:08 +09:00 committed by GitHub
commit e0cf1e0650
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
notification.go
View File

@ -9,7 +9,7 @@ import (
// Notification hold information for mastodon notification.
type Notification struct {
ID int64 `json:"id"`
ID ID `json:"id"`
Type string `json:"type"`
CreatedAt time.Time `json:"created_at"`
Account Account `json:"account"`
@ -27,9 +27,9 @@ func (c *Client) GetNotifications(ctx context.Context, pg *Pagination) ([]*Notif
}
// GetNotification return notification.
func (c *Client) GetNotification(ctx context.Context, id int64) (*Notification, error) {
func (c *Client) GetNotification(ctx context.Context, id ID) (*Notification, error) {
var notification Notification
err := c.doAPI(ctx, http.MethodGet, fmt.Sprintf("/api/v1/notifications/%d", id), nil, &notification, nil)
err := c.doAPI(ctx, http.MethodGet, fmt.Sprintf("/api/v1/notifications/%v", id), nil, &notification, nil)
if err != nil {
return nil, err
}

14
notification_test.go
View File

@ -39,18 +39,18 @@ func TestGetNotifications(t *testing.T) {
if len(ns) != 2 {
t.Fatalf("result should be two: %d", len(ns))
}
if ns[0].ID != 122 {
t.Fatalf("want %v but %v", 122, ns[0].ID)
if ns[0].ID != "122" {
t.Fatalf("want %v but %v", "122", ns[0].ID)
}
if ns[1].ID != 123 {
t.Fatalf("want %v but %v", 123, ns[1].ID)
if ns[1].ID != "123" {
t.Fatalf("want %v but %v", "123", ns[1].ID)
}
n, err := client.GetNotification(context.Background(), 123)
n, err := client.GetNotification(context.Background(), "123")
if err != nil {
t.Fatalf("should not be fail: %v", err)
}
if n.ID != 123 {
t.Fatalf("want %v but %v", 123, n.ID)
if n.ID != "123" {
t.Fatalf("want %v but %v", "123", n.ID)
}
err = client.ClearNotifications(context.Background())
if err != nil {

2
streaming_ws_test.go
View File

@ -117,7 +117,7 @@ func wsTest(t *testing.T, q chan Event, cancel func()) {
if events[0].(*UpdateEvent).Status.Content != "foo" {
t.Fatalf("want %q but %q", "foo", events[0].(*UpdateEvent).Status.Content)
}
if events[1].(*NotificationEvent).Notification.ID != 123 {
if events[1].(*NotificationEvent).Notification.ID != "123" {
t.Fatalf("want %d but %d", 123, events[1].(*NotificationEvent).Notification.ID)
}
if events[2].(*DeleteEvent).ID != 1234567 {