add message to several channel operations, fix Message and User json tags

Author: ravlio

channel.go

@@ -111,10 +111,13 @@ func (ch *Channel) query(options map[string]interface{}, data map[string]interfa
 //
 // options: the object to update the custom properties of this channel with
 // message: optional update message
-func (ch *Channel) Update(options map[string]interface{}, message string) error {
+func (ch *Channel) Update(options map[string]interface{}, message *Message) error {
 	payload := map[string]interface{}{
-		"data":    options,
-		"message": message,
+		"data": options,
+	}
+
+	if message != nil {
+		payload["message"] = message
 	}
 
 	p := path.Join("channels", url.PathEscape(ch.Type), url.PathEscape(ch.ID))
@@ -137,7 +140,7 @@ func (ch *Channel) Truncate() error {
 }
 
 // AddMembers adds members with given user IDs to the channel
-func (ch *Channel) AddMembers(userIDs ...string) error {
+func (ch *Channel) AddMembers(userIDs []string, message *Message) error {
 	if len(userIDs) == 0 {
 		return errors.New("user IDs are empty")
 	}
@@ -146,13 +149,17 @@ func (ch *Channel) AddMembers(userIDs ...string) error {
 		"add_members": userIDs,
 	}
 
+	if message != nil {
+		data["message"] = message
+	}
+
 	p := path.Join("channels", url.PathEscape(ch.Type), url.PathEscape(ch.ID))
 
 	return ch.client.makeRequest(http.MethodPost, p, nil, data, nil)
 }
 
 //  RemoveMembers deletes members with given IDs from the channel
-func (ch *Channel) RemoveMembers(userIDs ...string) error {
+func (ch *Channel) RemoveMembers(userIDs []string, message *Message) error {
 	if len(userIDs) == 0 {
 		return errors.New("user IDs are empty")
 	}
@@ -161,6 +168,9 @@ func (ch *Channel) RemoveMembers(userIDs ...string) error {
 		"remove_members": userIDs,
 	}
 
+	if message != nil {
+		data["message"] = message
+	}
 	p := path.Join("channels", url.PathEscape(ch.Type), url.PathEscape(ch.ID))
 
 	var resp queryResponse
@@ -370,6 +380,44 @@ func (ch *Channel) DeleteImage(location string) error {
 	return ch.client.makeRequest(http.MethodDelete, p, params, nil, nil)
 }
 
+func (ch *Channel) AcceptInvite(userID string, message *Message) error {
+	if userID == "" {
+		return errors.New("user ID must be not empty")
+	}
+
+	data := map[string]interface{}{
+		"accept_invite": true,
+		"user_id":       userID,
+	}
+
+	if message != nil {
+		data["message"] = message
+	}
+
+	p := path.Join("channels", url.PathEscape(ch.Type), url.PathEscape(ch.ID))
+
+	return ch.client.makeRequest(http.MethodPost, p, nil, data, nil)
+}
+
+func (ch *Channel) RejectInvite(userID string, message *Message) error {
+	if userID == "" {
+		return errors.New("user ID must be not empty")
+	}
+
+	data := map[string]interface{}{
+		"reject_invite": true,
+		"user_id":       userID,
+	}
+
+	if message != nil {
+		data["message"] = message
+	}
+
+	p := path.Join("channels", url.PathEscape(ch.Type), url.PathEscape(ch.ID))
+
+	return ch.client.makeRequest(http.MethodPost, p, nil, data, nil)
+}
+
 // todo: cleanup this
 func (ch *Channel) refresh() error {
 	options := map[string]interface{}{

channel_test.go

@@ -1,6 +1,7 @@
 package stream_chat // nolint: golint
 
 import (
+	"github.com/stretchr/testify/require"
 	"os"
 	"path"
 	"testing"
@@ -73,7 +74,10 @@ func TestChannel_AddMembers(t *testing.T) {
 
 	user := randomUser()
 
-	err = ch.AddMembers(user.ID)
+	err = ch.AddMembers(
+		[]string{user.ID},
+		&Message{Text: "some members", User: &User{ID: user.ID}},
+	)
 	mustNoError(t, err, "add members")
 
 	// refresh channel state
@@ -180,7 +184,10 @@ func TestChannel_RemoveMembers(t *testing.T) {
 	}()
 
 	user := randomUser()
-	err := ch.RemoveMembers(user.ID)
+	err := ch.RemoveMembers(
+		[]string{user.ID},
+		&Message{Text: "some members", User: &User{ID: user.ID}},
+	)
 
 	mustNoError(t, err, "remove members")
 
@@ -243,7 +250,12 @@ func TestChannel_Truncate(t *testing.T) {
 }
 
 func TestChannel_Update(t *testing.T) {
+	c := initClient(t)
+	ch := initChannel(t, c)
 
+	err := ch.Update(map[string]interface{}{"color": "blue"},
+		&Message{Text: "color is blue", User: &User{ID: testUsers[0].ID}})
+	require.NoError(t, err)
 }
 
 func TestChannel_AddModerators(t *testing.T) {
@@ -326,3 +338,45 @@ func TestChannel_SendImage(t *testing.T) {
 		}
 	})
 }
+
+func TestChannel_AcceptInvite(t *testing.T) {
+	c := initClient(t)
+
+	_, err := c.UpdateUsers(testUsers...)
+	mustNoError(t, err, "update users")
+
+	members := make([]string, 0, len(testUsers))
+	for i := range testUsers {
+		members = append(members, testUsers[i].ID)
+	}
+
+	ch, err := c.CreateChannel("team", randomString(12), serverUser.ID, map[string]interface{}{
+		"members": members,
+		"invites": []string{members[0]},
+	})
+
+	require.NoError(t, err, "create channel")
+	err = ch.AcceptInvite(members[0], &Message{Text: "accepted", User: &User{ID: members[0]}})
+	require.NoError(t, err, "accept invite")
+}
+
+func TestChannel_RejectInvite(t *testing.T) {
+	c := initClient(t)
+
+	_, err := c.UpdateUsers(testUsers...)
+	mustNoError(t, err, "update users")
+
+	members := make([]string, 0, len(testUsers))
+	for i := range testUsers {
+		members = append(members, testUsers[i].ID)
+	}
+
+	ch, err := c.CreateChannel("team", randomString(12), serverUser.ID, map[string]interface{}{
+		"members": members,
+		"invites": []string{members[0]},
+	})
+
+	require.NoError(t, err, "create channel")
+	err = ch.RejectInvite(members[0], &Message{Text: "rejected", User: &User{ID: members[0]}})
+	require.NoError(t, err, "reject invite")
+}

message.go

@@ -24,7 +24,7 @@ type Message struct {
 	Text string `json:"text"`
 	HTML string `json:"html"`
 
-	Type MessageType `json:"type"` // one of MessageType* constants
+	Type MessageType `json:"type,omitempty"` // one of MessageType* constants
 
 	User            *User          `json:"user"`
 	Attachments     []*Attachment  `json:"attachments"`
@@ -35,12 +35,12 @@ type Message struct {
 	ParentID      string `json:"parent_id"`       // id of parent message if it's reply
 	ShowInChannel bool   `json:"show_in_channel"` // show reply message also in channel
 
-	ReplyCount int `json:"reply_count"`
+	ReplyCount int `json:"reply_count,omitempty"`
 
 	MentionedUsers []*User `json:"mentioned_users"`
 
-	CreatedAt time.Time `json:"created_at"`
-	UpdatedAt time.Time `json:"updated_at"`
+	CreatedAt *time.Time `json:"created_at,omitempty"`
+	UpdatedAt *time.Time `json:"updated_at,omitempty"`
 
 	// any other fields the user wants to attach a message
 	ExtraData map[string]interface{}

stream_chat.go

@@ -73,24 +73,25 @@ type StreamClient interface {
 // StreamChannel is a channel of communication
 type StreamChannel interface {
 	// channel.go
-	AddMembers(userIDs ...string) error
+	AddMembers(userIDs []string, message *Message) error
 	AddModerators(userIDs ...string) error
 	BanUser(targetID string, userID string, options map[string]interface{}) error
 	Delete() error
 	DemoteModerators(userIDs ...string) error
 	MarkRead(userID string, options map[string]interface{}) error
-	RemoveMembers(userIDs ...string) error
+	RemoveMembers(userIDs []string, message *Message) error
 	Truncate() error
 	UnBanUser(targetID string, options map[string]string) error
-	Update(options map[string]interface{}, message string) error
+	Update(options map[string]interface{}, message *Message) error
 	Query(data map[string]interface{}) error
 	Show(userID string) error
 	Hide(userID string) error
 	SendFile(request SendFileRequest) (url string, err error)
 	SendImage(request SendFileRequest) (url string, err error)
 	DeleteFile(location string) error
 	DeleteImage(location string) error
-
+	AcceptInvite(userID string, message *Message) error
+	RejectInvite(userID string, message *Message) error
 	// event.go
 	SendEvent(event *Event, userID string) error