Merge pull request #130 from retailcrm/dependabot/go_modules/examples/telegram/golang.org/x/net-0.36.0

Bump golang.org/x/net from 0.23.0 to 0.36.0 in /examples/telegram

examples/telegram/go.mod

@@ -1,6 +1,7 @@
 module github.com/retailcrm/mg-transport-api-client-go/examples/telegram
 
 go 1.21.5
+toolchain go1.23.7
 
 require (
 	github.com/gin-gonic/gin v1.9.1
@@ -32,10 +33,10 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/crypto v0.35.0 // indirect
+	golang.org/x/net v0.36.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

examples/telegram/go.sum

@@ -78,16 +78,16 @@ github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZ
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
 golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
-golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
+golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
+golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
 golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=

v1/client.go

@@ -586,6 +586,75 @@ func (c *MgClient) MessagesHistory(request SendHistoryMessageRequest) (MessagesR
 	return resp, status, err
 }
 
+// AddMessageReaction adds reactions to the message.
+//
+// Example:
+//
+//	client := New("https://message-gateway.url", "cb8ccf05e38a47543ad8477d4999be73bff503ea6")
+//
+//	status, err := client.AddMessageReaction(ReactionRequest{
+//		Channel: 305,
+//		Message: ReactionMessageReference{
+//			ExternalID: "uid_1",
+//		},
+//		Reaction: "😁",
+//	})
+//	if err != nil {
+//		log.Fatalf("request error: %s (%d)", err, status)
+//	}
+//
+//	log.Printf("status: %d", status)
+func (c *MgClient) AddMessageReaction(request ReactionRequest) (int, error) {
+	var outgoing = &bytes.Buffer{}
+	_ = json.NewEncoder(outgoing).Encode(request)
+
+	data, status, err := c.PostRequest("/messages/reaction", outgoing)
+	if err != nil {
+		return status, err
+	}
+
+	if status != http.StatusOK {
+		return status, NewAPIClientError(data)
+	}
+
+	return status, err
+}
+
+// DeleteMessagesReaction removes reactions to the message.
+// The reaction field is optional. If it is passed, the specific reaction will be deleted.
+// If it is not passed - the first found reaction from the user to the message will be deleted.
+//
+// Example:
+//
+//	client := New("https://message-gateway.url", "cb8ccf05e38a47543ad8477d4999be73bff503ea6")
+//
+//	status, err := client.DeleteMessagesReaction(ReactionRequest{
+//		ChannelID: 305,
+//		Message: ReactionMessageReference{
+//			ExternalID: "uid_1",
+//		},
+//		Reaction: "😁",
+//	})
+//	if err != nil {
+//		log.Fatalf("request error: %s (%d)", err, status)
+//	}
+//
+//	log.Printf("status: %d", status)
+func (c *MgClient) DeleteMessagesReaction(request ReactionRequest) (int, error) {
+	outgoing, _ := json.Marshal(&request)
+
+	data, status, err := c.DeleteRequest("/messages/reaction", outgoing)
+	if err != nil {
+		return status, err
+	}
+
+	if status != http.StatusOK {
+		return status, NewAPIClientError(data)
+	}
+
+	return status, err
+}
+
 // UpdateMessages edits existing message. Only text messages are supported.
 //
 // Example:

v1/client_test.go

@@ -83,14 +83,17 @@ func (t *MGClientTest) Test_TransportChannels() {
 							Quoting:       ChannelFeatureBoth,
 							Deleting:      ChannelFeatureReceive,
 							MaxCharsCount: 4096,
+							Reaction:      ChannelFeatureAny,
 						},
 						Product: Product{
 							Creating: ChannelFeatureReceive,
 							Editing:  ChannelFeatureReceive,
+							Reaction: ChannelFeatureAny,
 						},
 						Order: Order{
 							Creating: ChannelFeatureReceive,
 							Editing:  ChannelFeatureReceive,
+							Reaction: ChannelFeatureAny,
 						},
 						File: ChannelSettingsFilesBase{
 							Creating: ChannelFeatureBoth,
@@ -98,6 +101,7 @@ func (t *MGClientTest) Test_TransportChannels() {
 							Quoting:  ChannelFeatureBoth,
 							Deleting: ChannelFeatureReceive,
 							Max:      1,
+							Reaction: ChannelFeatureAny,
 						},
 						Image: ChannelSettingsFilesBase{
 							Creating: ChannelFeatureBoth,
@@ -105,6 +109,7 @@ func (t *MGClientTest) Test_TransportChannels() {
 							Quoting:  ChannelFeatureBoth,
 							Deleting: ChannelFeatureReceive,
 							Max:      1, // nolint:gomnd
+							Reaction: ChannelFeatureAny,
 						},
 						Suggestions: ChannelSettingsSuggestions{
 							Text:  ChannelFeatureBoth,
@@ -115,6 +120,10 @@ func (t *MGClientTest) Test_TransportChannels() {
 						SendingPolicy: SendingPolicy{
 							NewCustomer: ChannelFeatureSendingPolicyTemplate,
 						},
+						Reactions: Reactions{
+							Dictionary: []string{"👏", "😁", "🤔"},
+							MaxCount:   3,
+						},
 					},
 					CreatedAt:     createdAt,
 					UpdatedAt:     &createdAt,
@@ -149,20 +158,29 @@ func (t *MGClientTest) Test_ActivateTransportChannel() {
 				Quoting:       ChannelFeatureReceive,
 				Deleting:      ChannelFeatureBoth,
 				MaxCharsCount: 2000,
+				Reaction:      ChannelFeatureAny,
 			},
 			Product: Product{
 				Creating: ChannelFeatureSend,
 				Deleting: ChannelFeatureSend,
+				Reaction: ChannelFeatureAny,
 			},
 			Order: Order{
 				Creating: ChannelFeatureBoth,
 				Deleting: ChannelFeatureSend,
+				Reaction: ChannelFeatureAny,
 			},
 			Image: ChannelSettingsFilesBase{
 				Creating: ChannelFeatureBoth,
+				Reaction: ChannelFeatureAny,
 			},
 			File: ChannelSettingsFilesBase{
 				Creating: ChannelFeatureBoth,
+				Reaction: ChannelFeatureAny,
+			},
+			Reactions: Reactions{
+				Dictionary: []string{"👏", "😁", "🤔"},
+				MaxCount:   3,
 			},
 		},
 	}
@@ -203,20 +221,29 @@ func (t *MGClientTest) Test_ActivateNewTransportChannel() {
 				Editing:  ChannelFeatureSend,
 				Quoting:  ChannelFeatureBoth,
 				Deleting: ChannelFeatureSend,
+				Reaction: ChannelFeatureAny,
 			},
 			Product: Product{
 				Creating: ChannelFeatureSend,
 				Deleting: ChannelFeatureSend,
+				Reaction: ChannelFeatureAny,
 			},
 			Order: Order{
 				Creating: ChannelFeatureBoth,
 				Deleting: ChannelFeatureSend,
+				Reaction: ChannelFeatureAny,
 			},
 			Image: ChannelSettingsFilesBase{
 				Creating: ChannelFeatureBoth,
+				Reaction: ChannelFeatureAny,
 			},
 			File: ChannelSettingsFilesBase{
 				Creating: ChannelFeatureBoth,
+				Reaction: ChannelFeatureAny,
+			},
+			Reactions: Reactions{
+				Dictionary: []string{"👏", "😁", "🤔"},
+				MaxCount:   3,
 			},
 		},
 	}
@@ -274,20 +301,29 @@ func (t *MGClientTest) Test_UpdateTransportChannel() {
 				Editing:  ChannelFeatureBoth,
 				Quoting:  ChannelFeatureBoth,
 				Deleting: ChannelFeatureBoth,
+				Reaction: ChannelFeatureAny,
 			},
 			Product: Product{
 				Creating: ChannelFeatureSend,
 				Deleting: ChannelFeatureSend,
+				Reaction: ChannelFeatureAny,
 			},
 			Order: Order{
 				Creating: ChannelFeatureBoth,
 				Deleting: ChannelFeatureSend,
+				Reaction: ChannelFeatureAny,
 			},
 			Image: ChannelSettingsFilesBase{
 				Creating: ChannelFeatureBoth,
+				Reaction: ChannelFeatureAny,
 			},
 			File: ChannelSettingsFilesBase{
 				Creating: ChannelFeatureBoth,
+				Reaction: ChannelFeatureAny,
+			},
+			Reactions: Reactions{
+				Dictionary: []string{"👏", "😁", "🤔"},
+				MaxCount:   3,
 			},
 		},
 	}
@@ -850,6 +886,100 @@ func (t *MGClientTest) Test_MessagesHistory() {
 	t.Assert().Equal(1, data.MessageID)
 }
 
+func (t *MGClientTest) Test_AddMessageReaction() {
+	c := t.client()
+
+	snd := ReactionRequest{
+		Channel: 1,
+		Message: ReactionMessageReference{
+			ExternalID: "external_1",
+		},
+		Reaction: "😁",
+	}
+
+	defer gock.Off()
+	t.gock().
+		Post(t.transportURL("messages/reaction")).
+		Reply(http.StatusOK).
+		JSON(``)
+
+	status, err := c.AddMessageReaction(snd)
+	t.Require().NoError(err)
+	t.Assert().Equal(http.StatusOK, status)
+	t.Assert().Empty(gock.GetUnmatchedRequests())
+}
+
+func (t *MGClientTest) Test_AddMessageReaction_error() {
+	c := t.client()
+
+	snd := ReactionRequest{
+		Channel: 1,
+		Message: ReactionMessageReference{
+			ExternalID: "external_1",
+		},
+		Reaction: "😁",
+	}
+
+	defer gock.Off()
+	t.gock().
+		Post(t.transportURL("messages/reaction")).
+		Reply(http.StatusBadRequest).
+		JSON(`{"errors": ["problems"]}`)
+
+	status, err := c.AddMessageReaction(snd)
+	t.Assert().Equal(http.StatusBadRequest, status)
+	t.Assert().Error(err)
+	t.Assert().Equal("problems", err.Error())
+	t.Assert().Empty(gock.GetUnmatchedRequests())
+}
+
+func (t *MGClientTest) Test_DeleteMessagesReaction() {
+	c := t.client()
+
+	snd := ReactionRequest{
+		Channel: 1,
+		Message: ReactionMessageReference{
+			ExternalID: "external_1",
+		},
+		Reaction: "😁",
+	}
+
+	defer gock.Off()
+	t.gock().
+		Delete(t.transportURL("messages/reaction")).
+		Reply(http.StatusOK).
+		JSON(``)
+
+	status, err := c.DeleteMessagesReaction(snd)
+	t.Require().NoError(err)
+	t.Assert().Equal(http.StatusOK, status)
+	t.Assert().Empty(gock.GetUnmatchedRequests())
+}
+
+func (t *MGClientTest) Test_DeleteMessagesReaction_error() {
+	c := t.client()
+
+	snd := ReactionRequest{
+		Channel: 1,
+		Message: ReactionMessageReference{
+			ExternalID: "external_1",
+		},
+		Reaction: "😁",
+	}
+
+	defer gock.Off()
+	t.gock().
+		Delete(t.transportURL("messages/reaction")).
+		Reply(http.StatusBadRequest).
+		JSON(`{"errors": ["problems"]}`)
+
+	status, err := c.DeleteMessagesReaction(snd)
+	t.Assert().Equal(http.StatusBadRequest, status)
+	t.Assert().Error(err)
+	t.Assert().Equal("problems", err.Error())
+	t.Assert().Empty(gock.GetUnmatchedRequests())
+}
+
 func (t *MGClientTest) Test_MarkMessageReadAndDelete() {
 	c := t.client()
 

v1/types.go

@@ -104,6 +104,7 @@ type ChannelSettings struct {
 	Order              Order                      `json:"order"`
 	File               ChannelSettingsFilesBase   `json:"file"`
 	Image              ChannelSettingsFilesBase   `json:"image"`
+	Reactions          Reactions                  `json:"reactions"`
 	CustomerExternalID string                     `json:"customer_external_id,omitempty"`
 	SendingPolicy      SendingPolicy              `json:"sending_policy,omitempty"`
 	Suggestions        ChannelSettingsSuggestions `json:"suggestions,omitempty"`
@@ -117,6 +118,12 @@ type Product struct {
 	Creating string `json:"creating,omitempty"`
 	Editing  string `json:"editing,omitempty"`
 	Deleting string `json:"deleting,omitempty"`
+	Reaction string `json:"reaction,omitempty"`
+}
+
+type Reactions struct {
+	Dictionary []string `json:"dictionary,omitempty"`
+	MaxCount   uint16   `json:"max_count,omitempty"`
 }
 
 // Order type.
@@ -124,6 +131,7 @@ type Order struct {
 	Creating string `json:"creating,omitempty"`
 	Editing  string `json:"editing,omitempty"`
 	Deleting string `json:"deleting,omitempty"`
+	Reaction string `json:"reaction,omitempty"`
 }
 
 // Status struct.
@@ -138,6 +146,7 @@ type ChannelSettingsText struct {
 	Editing       string `json:"editing,omitempty"`
 	Quoting       string `json:"quoting,omitempty"`
 	Deleting      string `json:"deleting,omitempty"`
+	Reaction      string `json:"reaction,omitempty"`
 	MaxCharsCount uint16 `json:"max_chars_count,omitempty"`
 }
 
@@ -147,6 +156,7 @@ type ChannelSettingsFilesBase struct {
 	Editing           string  `json:"editing,omitempty"`
 	Quoting           string  `json:"quoting,omitempty"`
 	Deleting          string  `json:"deleting,omitempty"`
+	Reaction          string  `json:"reaction,omitempty"`
 	Max               uint64  `json:"max_items_count,omitempty"`
 	NoteMaxCharsCount *uint16 `json:"note_max_chars_count,omitempty"`
 	MaxItemSize       *uint64 `json:"max_item_size,omitempty"`
@@ -157,6 +167,7 @@ type ChannelSettingsAudio struct {
 	Creating      string  `json:"creating,omitempty"`
 	Quoting       string  `json:"quoting,omitempty"`
 	Deleting      string  `json:"deleting,omitempty"`
+	Reaction      string  `json:"reaction,omitempty"`
 	MaxItemsCount uint64  `json:"max_items_count,omitempty"`
 	MaxItemSize   *uint64 `json:"max_item_size,omitempty"`
 }
@@ -346,6 +357,16 @@ type SendHistoryMessageRequest struct {
 	ReplyDeadline  *time.Time                `json:"reply_deadline,omitempty"`
 }
 
+type ReactionRequest struct {
+	Channel  uint64                   `json:"channel"`
+	Message  ReactionMessageReference `json:"message"`
+	Reaction string                   `json:"reaction,omitempty"`
+}
+
+type ReactionMessageReference struct {
+	ExternalID string `json:"external_id"`
+}
+
 type SendMessageRequestMessage struct {
 	Type       string     `json:"type"`
 	ExternalID string     `json:"external_id,omitempty"`
@@ -462,6 +483,20 @@ type MessageWebhookData struct {
 	InAppID           int32               `json:"in_app_id,omitempty"`
 }
 
+type ReactionWebhookData struct {
+	ExternalUserID    string         `json:"external_user_id"`
+	ExternalChatID    string         `json:"external_chat_id"`
+	ChannelID         uint64         `json:"channel_id"`
+	ExternalMessageID string         `json:"external_message_id"`
+	NewReaction       string         `json:"new_reaction,omitempty"`
+	OldReaction       string         `json:"old_reaction,omitempty"`
+	AllReactions      []ReactionInfo `json:"all_reactions,omitempty"`
+}
+
+type ReactionInfo struct {
+	Reaction string `json:"reaction"`
+}
+
 type Attachments struct {
 	Suggestions []Suggestion `json:"suggestions,omitempty"`
 }

v1/webhook.go

@@ -9,6 +9,8 @@ const (
 	MessageUpdateWebhookType  WebhookType = "message_updated"
 	MessageDeleteWebhookType  WebhookType = "message_deleted"
 	MessageReadWebhookType    WebhookType = "message_read"
+	ReactionAddWebhookType    WebhookType = "reaction_add"
+	ReactionDeleteWebhookType WebhookType = "reaction_delete"
 	TemplateCreateWebhookType WebhookType = "template_create"
 	TemplateUpdateWebhookType WebhookType = "template_update"
 	TemplateDeleteWebhookType WebhookType = "template_delete"
@@ -27,6 +29,11 @@ func (w WebhookRequest) IsMessageWebhook() bool {
 		w.Type == MessageSendWebhookType || w.Type == MessageUpdateWebhookType
 }
 
+// IsReactionWebhook returns true if current webhook contains data related to chat reactions.
+func (w WebhookRequest) IsReactionWebhook() bool {
+	return w.Type == ReactionAddWebhookType || w.Type == ReactionDeleteWebhookType
+}
+
 // IsTemplateWebhook returns true if current webhook contains data related to the templates changes.
 func (w WebhookRequest) IsTemplateWebhook() bool {
 	return w.Type == TemplateCreateWebhookType ||
@@ -43,6 +50,15 @@ func (w WebhookRequest) MessageWebhookData() (wd MessageWebhookData) {
 	return
 }
 
+// ReactionWebhookData returns the reaction data from webhook contents.
+//
+// Note: this call will not fail even if underlying data is not related to the reactions.
+// Use IsReactionWebhook to mitigate this.
+func (w WebhookRequest) ReactionWebhookData() (wd ReactionWebhookData) {
+	_ = json.Unmarshal(w.Data, &wd)
+	return
+}
+
 // TemplateCreateWebhookData returns new template data from webhook contents.
 // This method is used if current webhook was initiated because user created a template.
 //

v1/webhook_test.go

@@ -15,6 +15,12 @@ func TestWebhookRequest_IsMessageWebhook(t *testing.T) {
 	assert.False(t, WebhookRequest{}.IsMessageWebhook())
 }
 
+func TestWebhookRequest_IsReactionWebhook(t *testing.T) {
+	assert.True(t, WebhookRequest{Type: ReactionAddWebhookType}.IsReactionWebhook())
+	assert.True(t, WebhookRequest{Type: ReactionDeleteWebhookType}.IsReactionWebhook())
+	assert.False(t, WebhookRequest{}.IsReactionWebhook())
+}
+
 func TestWebhookRequest_IsTemplateWebhook(t *testing.T) {
 	assert.True(t, WebhookRequest{Type: TemplateCreateWebhookType}.IsTemplateWebhook())
 	assert.True(t, WebhookRequest{Type: TemplateUpdateWebhookType}.IsTemplateWebhook())
@@ -37,6 +43,32 @@ func TestWebhookData_MessageWebhookData(t *testing.T) {
 	assert.Equal(t, "test", wh.Content)
 }
 
+func TestWebhookData_ReactionWebhookData(t *testing.T) {
+	wh := WebhookRequest{
+		Type: ReactionAddWebhookType,
+		Data: mustMarshalJSON(ReactionWebhookData{
+			ExternalUserID:    "1",
+			ExternalChatID:    "1",
+			ChannelID:         1,
+			ExternalMessageID: "1",
+			NewReaction:       "👍",
+			OldReaction:       "🤔",
+			AllReactions: []ReactionInfo{
+				{
+					Reaction: "👏",
+				},
+				{
+					Reaction: "😱",
+				},
+			},
+		}),
+	}.ReactionWebhookData()
+	assert.Equal(t, "👍", wh.NewReaction)
+	assert.Equal(t, "🤔", wh.OldReaction)
+	assert.Equal(t, "👏", wh.AllReactions[0].Reaction)
+	assert.Equal(t, "😱", wh.AllReactions[1].Reaction)
+}
+
 func TestWebhookData_TemplateCreateWebhookData(t *testing.T) {
 	wh := WebhookRequest{
 		Type: TemplateCreateWebhookType,