Fix receiving POST message push requests on the server

mklkj · Feb 11, 2024 · 352b769 · 352b769
1 parent d3bbd4e
commit 352b769
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/composeApp/src/commonMain/kotlin/io/github/mklkj/kommunicator/data/ws/ConversationClient.kt b/composeApp/src/commonMain/kotlin/io/github/mklkj/kommunicator/data/ws/ConversationClient.kt
@@ -88,6 +88,7 @@ class ConversationClient(
     fun sendMessage(message: MessageRequest) {
         val chatId = chatId ?: return
 
+        // todo: add error handler!
         scope.launch {
             when (chatSession) {
                 null -> {

diff --git a/server/src/main/kotlin/io/github/mklkj/kommunicator/routes/ChatRoutes.kt b/server/src/main/kotlin/io/github/mklkj/kommunicator/routes/ChatRoutes.kt
@@ -77,17 +77,19 @@ fun Route.chatRoutes() {
     post("/{id}/messages") {
         val userId = call.principalId ?: error("Invalid JWT token")
         val chatId = call.parameters.getOrFail("id").toUUID()
-        val message = call.receive<MessagePush>()
+        val message = call.receive<MessageEvent>()
         val participants = chatService.getParticipants(chatId)
 
-        // todo: add verification whether a given user can write to that chat!!!
+        if (message !is MessagePush) return@post
+
         val entity = MessageEntity(
             id = message.id,
             chatId = chatId,
             userId = userId,
             timestamp = Clock.System.now(),
             content = message.content,
         )
+        // todo: add verification whether a given user can write to that chat!!!
         messageService.saveMessage(entity)
 
         val connections = chatConnections.getConnections(chatId)
@@ -185,7 +187,7 @@ fun Route.chatWebsockets() {
 
                         // not handled on server
                         is MessageBroadcast -> Unit
-                        is TypingBroadcast -> TODO()
+                        is TypingBroadcast -> Unit
                     }
                 }
                 .collect()