Add teams and slack parent activity id support, remove not used activityId field from gRPC (#1387)

Author: mszostok

pkg/api/cloudteams/cloud_teams.pb.go

@@ -514,6 +514,7 @@ func (b *CloudSlack) handleMessage(ctx context.Context, event slackMessage) erro
 			IsKnown:          exists,
 			CommandOrigin:    event.CommandOrigin,
 			SlackState:       event.State,
+			ParentActivityID: event.GetTimestamp(),
 		},
 		Message: request,
 		User: execute.UserInput{
@@ -587,7 +588,7 @@ func (b *CloudSlack) send(ctx context.Context, event slackMessage, resp interact
 			return fmt.Errorf("while posting Slack message visible only to user: %w", err)
 		}
 	} else {
-		if ts := b.getThreadOptionIfNeeded(event, file); ts != nil {
+		if ts := b.getThreadOptionIfNeeded(resp, event, file); ts != nil {
 			options = append(options, ts)
 		}
 
@@ -636,7 +637,7 @@ func (b *CloudSlack) BotName() string {
 	return fmt.Sprintf("<@%s>", b.botID)
 }
 
-func (b *CloudSlack) getThreadOptionIfNeeded(event slackMessage, file *slack.File) slack.MsgOption {
+func (b *CloudSlack) getThreadOptionIfNeeded(resp interactive.CoreMessage, event slackMessage, file *slack.File) slack.MsgOption {
 	if file != nil {
 		// If the message was already as a file attachment, reply it a given thread
 		for _, share := range file.Shares.Public {
@@ -646,6 +647,10 @@ func (b *CloudSlack) getThreadOptionIfNeeded(event slackMessage, file *slack.Fil
 		}
 	}
 
+	if resp.ParentActivityID != "" {
+		return slack.MsgOptionTS(resp.Message.ParentActivityID)
+	}
+
 	if ts := event.GetTimestamp(); ts != "" {
 		return slack.MsgOptionTS(ts)
 	}

pkg/bot/slack_cloud.go

@@ -285,7 +285,6 @@ func (b *CloudTeams) handleStreamMessage(ctx context.Context, data *pb.CloudActi
 				MessageType:    pb.MessageType_MESSAGE_EXECUTOR,
 				TeamId:         channel.teamID,
 				ConversationId: conversationRef.Conversation.ID,
-				ActivityId:     conversationRef.ActivityID, // activity ID allows us to send it as a thread message
 				Data:           raw,
 			},
 		}, nil
@@ -309,6 +308,7 @@ func (b *CloudTeams) processMessage(ctx context.Context, act schema.Activity, ch
 			SourceBindings:   channel.Bindings.Sources,
 			CommandOrigin:    b.mapToCommandOrigin(act),
 			DisplayName:      channelDisplayName,
+			ParentActivityID: act.Conversation.ID,
 		},
 		Message: trimmedMsg,
 		User: execute.UserInput{
@@ -389,7 +389,6 @@ func (b *CloudTeams) sendAgentActivity(ctx context.Context, msg interactive.Core
 			Message: &pb.Message{
 				MessageType:    pb.MessageType_MESSAGE_SOURCE,
 				TeamId:         channel.teamID,
-				ActivityId:     "", // empty so it will be sent on root instead of sending as a thread message
 				ConversationId: channel.ID,
 				Data:           raw,
 			},

pkg/bot/teams_cloud.go

@@ -16,7 +16,6 @@ enum MessageType {
 
 message Message {
   string teamId = 1;
-  string activityId = 2;
   string conversationId = 3;
   MessageType messageType = 4;
   bytes data = 5;