From 9b1c6c7487a7eccc8f802d7eafe2d6212578a406 Mon Sep 17 00:00:00 2001
From: Vishal Narkhede <vishalnarkhede.iitd@gmail.com>
Date: Fri, 5 Apr 2024 16:59:11 +0200
Subject: [PATCH] fix: payload for sendmessage to prevent upsert user

---
 app_test.go | 3 ++-
 message.go  | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app_test.go b/app_test.go
index df5071d..b1977dc 100644
--- a/app_test.go
+++ b/app_test.go
@@ -103,7 +103,8 @@ func TestClient_CheckPush(t *testing.T) {
 	ch := initChannel(t, c)
 	ctx := context.Background()
 	user := randomUser(t, c)
-	msgResp, _ := ch.SendMessage(ctx, &Message{Text: "text"}, user.ID)
+	msgResp, err := ch.SendMessage(ctx, &Message{Text: "text"}, user.ID)
+	require.NoError(t, err)
 	skipDevices := true
 
 	req := &CheckPushRequest{MessageID: msgResp.Message.ID, SkipDevices: &skipDevices, UserID: user.ID}
diff --git a/message.go b/message.go
index 406f3dd..9e6cf83 100644
--- a/message.go
+++ b/message.go
@@ -31,6 +31,7 @@ type Message struct {
 	Silent bool        `json:"silent,omitempty"`
 
 	User            *User          `json:"user"`
+	UserID          string         `json:"user_id"`
 	Attachments     []*Attachment  `json:"attachments"`
 	LatestReactions []*Reaction    `json:"latest_reactions"` // last reactions
 	OwnReactions    []*Reaction    `json:"own_reactions"`
@@ -94,7 +95,7 @@ func (m *Message) toRequest() messageRequest {
 		Text:            m.Text,
 		Type:            m.Type,
 		Attachments:     m.Attachments,
-		User:            messageRequestUser{ID: m.User.ID},
+		UserID:          m.UserID,
 		ExtraData:       m.ExtraData,
 		Pinned:          m.Pinned,
 		ParentID:        m.ParentID,
@@ -127,7 +128,7 @@ type messageRequestMessage struct {
 	Text            string                 `json:"text"`
 	Type            MessageType            `json:"type" validate:"omitempty,oneof=system"`
 	Attachments     []*Attachment          `json:"attachments"`
-	User            messageRequestUser     `json:"user"`
+	UserID          string                 `json:"user_id"`
 	MentionedUsers  []string               `json:"mentioned_users"`
 	ParentID        string                 `json:"parent_id"`
 	ShowInChannel   bool                   `json:"show_in_channel"`
@@ -257,6 +258,7 @@ func (ch *Channel) SendMessage(ctx context.Context, message *Message, userID str
 	}
 
 	message.User = &User{ID: userID}
+	message.UserID = userID
 	p := path.Join("channels", url.PathEscape(ch.Type), url.PathEscape(ch.ID), "message")
 
 	req := message.toRequest()