properly handle messages in threads

paulchen · Feb 4, 2024 · bfabdd0 · bfabdd0
1 parent 3c7ef0b
commit bfabdd0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/kotlin/at/rueckgr/kotlin/rocketbot/handler/stream/RoomMessageStreamHandler.kt b/src/main/kotlin/at/rueckgr/kotlin/rocketbot/handler/stream/RoomMessageStreamHandler.kt
@@ -41,6 +41,7 @@ class RoomMessageStreamHandler(eventHandler: EventHandler, botConfiguration: Bot
 
     private fun handleStreamMessageItem(messageNode: JsonNode): List<SendMessageMessage> {
         val messageText = messageNode.get("msg").textValue().trim()
+        val parentMessageId = messageNode.get("tmid")?.textValue()?.trim()
         val roomId = messageNode.get("rid").textValue()
         val roomName = getRoomName(messageNode)
         val timestamp = messageNode.get("ts")?.get("\$date")?.asLong()
@@ -71,7 +72,7 @@ class RoomMessageStreamHandler(eventHandler: EventHandler, botConfiguration: Bot
             eventHandler.handleRoomMessage(channel, user, message)
         }
         return outgoingMessages.map {
-            MessageHelper.instance.createSendMessage(roomId, it.message, botConfiguration.botId, it.emoji, it.username)
+            MessageHelper.instance.createSendMessage(roomId, it.message, botConfiguration.botId, parentMessageId, it.username, it.emoji)
         }
     }
 

diff --git a/src/main/kotlin/at/rueckgr/kotlin/rocketbot/util/MessageHelper.kt b/src/main/kotlin/at/rueckgr/kotlin/rocketbot/util/MessageHelper.kt
@@ -10,10 +10,13 @@ class MessageHelper {
         val instance = MessageHelper()
     }
 
-    fun createSendMessage(roomId: String, message: String, botId: String, emoji: String? = null, username: String? = null): SendMessageMessage {
+    fun createSendMessage(roomId: String, message: String, botId: String, parentMessageId: String? = null, emoji: String? = null, username: String? = null): SendMessageMessage {
         val id = UUID.randomUUID().toString()
         val botTag = mapOf("i" to botId)
         val params = mutableMapOf("_id" to id, "rid" to roomId, "msg" to message, "bot" to botTag)
+        if (StringUtils.isNotBlank(parentMessageId)) {
+            params["tmid"] = parentMessageId!!
+        }
         if (StringUtils.isNotBlank(emoji)) {
             params["emoji"] = emoji!!
         }