enhance(gchat): add way to send messages to thread in google chat

models/bot.go

@@ -28,6 +28,7 @@ type Bot struct {
 	GoogleChatProjectID           string            `mapstructure:"google_chat_project_id"`
 	GoogleChatSubscriptionID      string            `mapstructure:"google_chat_subscription_id"`
 	GoogleChatCredentials         string            `mapstructure:"google_chat_credentials"`
+	GoogleChatForceReplyToThread  bool              `mapstructure:"google_chat_force_reply_to_thread"`
 	TelegramToken                 string            `mapstructure:"telegram_token"`
 	Users                         map[string]string `mapstructure:"slack_users"`
 	UserGroups                    map[string]string `mapstructure:"slack_usergroups"`

remote/gchat/helper.go

@@ -29,9 +29,10 @@ type DomainEvent struct {
 // HandleOutput handles input messages for this remote.
 func HandleRemoteInput(inputMsgs chan<- models.Message, rules map[string]models.Rule, bot *models.Bot) {
 	c := &Client{
-		Credentials:    bot.GoogleChatCredentials,
-		ProjectID:      bot.GoogleChatProjectID,
-		SubscriptionID: bot.GoogleChatSubscriptionID,
+		Credentials:        bot.GoogleChatCredentials,
+		ProjectID:          bot.GoogleChatProjectID,
+		SubscriptionID:     bot.GoogleChatSubscriptionID,
+		ForceReplyToThread: bot.GoogleChatForceReplyToThread,
 	}
 
 	// Read messages from Google Chat
@@ -41,9 +42,10 @@ func HandleRemoteInput(inputMsgs chan<- models.Message, rules map[string]models.
 // HandleRemoteOutput handles output messages for this remote.
 func HandleRemoteOutput(message models.Message, bot *models.Bot) {
 	c := &Client{
-		Credentials:    bot.GoogleChatCredentials,
-		ProjectID:      bot.GoogleChatProjectID,
-		SubscriptionID: bot.GoogleChatSubscriptionID,
+		Credentials:        bot.GoogleChatCredentials,
+		ProjectID:          bot.GoogleChatProjectID,
+		SubscriptionID:     bot.GoogleChatSubscriptionID,
+		ForceReplyToThread: bot.GoogleChatForceReplyToThread,
 	}
 
 	// Send messages to Google Chat
@@ -77,11 +79,8 @@ func toMessage(m *pubsub.Message) (models.Message, error) {
 		message.ChannelID = event.Space.Name
 		message.BotMentioned = true // Google Chat only supports @bot mentions
 		message.DirectMessageOnly = event.Space.SingleUserBotDm
-
-		if event.Space.Threaded {
-			message.ThreadID = event.Message.Thread.Name
-			message.ThreadTimestamp = event.EventTime
-		}
+		message.ThreadID = event.Message.Thread.Name
+		message.ThreadTimestamp = event.EventTime
 
 		// make channel variables available
 		message.Vars["_channel.name"] = message.ChannelName // will be empty if it came via DM
@@ -95,6 +94,7 @@ func toMessage(m *pubsub.Message) (models.Message, error) {
 	if event.User != nil {
 		message.Vars["_user.name"] = event.User.DisplayName
 		message.Vars["_user.id"] = event.User.Name
+		message.Vars["_user.internal_id"] = event.User.Name
 		message.Vars["_user.displayname"] = event.User.DisplayName
 
 		// Try parsing as a domain message to get user email

remote/gchat/remote.go

@@ -24,9 +24,10 @@ Implementation for the Remote interface
 
 // Client struct.
 type Client struct {
-	Credentials    string
-	ProjectID      string
-	SubscriptionID string
+	Credentials        string
+	ProjectID          string
+	SubscriptionID     string
+	ForceReplyToThread bool
 }
 
 // validate that Client adheres to remote interface.
@@ -95,15 +96,17 @@ func (c *Client) Send(message models.Message, _ *models.Bot) {
 	// Best effort. If the instance goes away, so be it.
 	msg := &chat.Message{
 		Text: message.Output,
+		Thread: &chat.Thread{
+			Name: message.ThreadID,
+		},
 	}
 
-	if message.ThreadID != "" {
-		msg.Thread = &chat.Thread{
-			Name: message.ThreadID,
-		}
+	request := msgService.Create(message.ChannelID, msg)
+	if c.ForceReplyToThread {
+		request = request.MessageReplyOption("REPLY_MESSAGE_FALLBACK_TO_NEW_THREAD")
 	}
 
-	_, err = msgService.Create(message.ChannelID, msg).Do()
+	_, err = request.Do()
 	if err != nil {
 		log.Error().Msgf("google_chat failed to create message: %s", err.Error())
 	}