fix: omit non-allowed message.type values on send/update wire payload

Co-Authored-By: Claude <noreply@anthropic.com>

Author: VelikovPetar

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/MoshiChatApi.kt

@@ -132,6 +132,7 @@ import io.getstream.chat.android.models.Member
 import io.getstream.chat.android.models.MemberData
 import io.getstream.chat.android.models.Message
 import io.getstream.chat.android.models.MessageReminder
+import io.getstream.chat.android.models.MessageType
 import io.getstream.chat.android.models.Mute
 import io.getstream.chat.android.models.PendingMessage
 import io.getstream.chat.android.models.Poll
@@ -252,7 +253,7 @@ constructor(
         channelType = channelType,
         channelId = channelId,
         message = SendMessageRequest(
-            message = with(dtoMapping) { message.toDto() },
+            message = with(dtoMapping) { message.toDto(messageType = message.uploadMessageType) },
             skip_push = message.skipPushNotification,
             skip_enrich_url = message.skipEnrichUrl,
         ),
@@ -323,7 +324,7 @@ constructor(
         return messageApi.updateMessage(
             messageId = message.id,
             message = UpdateMessageRequest(
-                message = with(dtoMapping) { message.toDto() },
+                message = with(dtoMapping) { message.toDto(messageType = message.uploadMessageType) },
                 skip_enrich_url = message.skipEnrichUrl,
                 skip_push = message.skipPushNotification,
             ),
@@ -1815,4 +1816,19 @@ constructor(
 
     private fun <T : Any, R : Any> RetrofitCall<T>.flatMapDomain(transform: DomainMapping.(T) -> Call<R>): Call<R> =
         flatMap { domainMapping.transform(it) }
+
+    /**
+     * Value to send for `message.type` on outbound send/update requests.
+     *
+     * The backend's UpdateMessage endpoint validates `type` against `oneof='' regular system`,
+     * so server-assigned types like `reply`, `error`, or `ephemeral` would be rejected with a 400
+     * if echoed back. Coerce anything outside the accepted set to the empty string — the field is
+     * ignored by the backend on update anyway, and on send only `regular` and `system` are
+     * meaningful for clients to declare.
+     */
+    private val Message.uploadMessageType: String
+        get() = when (type) {
+            MessageType.REGULAR, MessageType.SYSTEM -> type
+            else -> ""
+        }
 }

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DtoMapping.kt

@@ -43,6 +43,7 @@ import io.getstream.chat.android.models.Member
 import io.getstream.chat.android.models.MemberData
 import io.getstream.chat.android.models.Message
 import io.getstream.chat.android.models.MessageTransformer
+import io.getstream.chat.android.models.MessageType
 import io.getstream.chat.android.models.Mute
 import io.getstream.chat.android.models.Reaction
 import io.getstream.chat.android.models.User
@@ -117,8 +118,13 @@ internal class DtoMapping(
 
     /**
      * Transforms [Message] to [UpstreamMessageDto].
+     *
+     * @param messageType Value to use for [UpstreamMessageDto.type]. When `null` (the default),
+     * the message's own type is used. Callers in the network layer may pass an explicit value to
+     * satisfy server-side validation — for example, the UpdateMessage endpoint only accepts the
+     * empty string, [MessageType.REGULAR], or [MessageType.SYSTEM].
      */
-    internal fun Message.toDto(): UpstreamMessageDto =
+    internal fun Message.toDto(messageType: String? = null): UpstreamMessageDto =
         messageTransformer.transform(this)
             .run {
                 UpstreamMessageDto(
@@ -127,7 +133,7 @@ internal class DtoMapping(
                     command = command,
                     html = html,
                     id = id,
-                    type = type,
+                    type = messageType ?: type,
                     mentioned_users = mentionedUsersIds,
                     parent_id = parentId,
                     pin_expires = pinExpires,

stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTest.kt

@@ -72,12 +72,14 @@ import io.getstream.chat.android.client.api2.model.requests.RejectInviteRequest
 import io.getstream.chat.android.client.api2.model.requests.ReminderRequest
 import io.getstream.chat.android.client.api2.model.requests.SendActionRequest
 import io.getstream.chat.android.client.api2.model.requests.SendEventRequest
+import io.getstream.chat.android.client.api2.model.requests.SendMessageRequest
 import io.getstream.chat.android.client.api2.model.requests.UnblockUserRequest
 import io.getstream.chat.android.client.api2.model.requests.UpdateChannelPartialRequest
 import io.getstream.chat.android.client.api2.model.requests.UpdateCooldownRequest
 import io.getstream.chat.android.client.api2.model.requests.UpdateLiveLocationRequest
 import io.getstream.chat.android.client.api2.model.requests.UpdateMemberPartialRequest
 import io.getstream.chat.android.client.api2.model.requests.UpdateMemberPartialResponse
+import io.getstream.chat.android.client.api2.model.requests.UpdateMessageRequest
 import io.getstream.chat.android.client.api2.model.requests.UpsertPushPreferencesRequest
 import io.getstream.chat.android.client.api2.model.requests.UpstreamOptionDto
 import io.getstream.chat.android.client.api2.model.requests.UpstreamVoteDto
@@ -180,6 +182,7 @@ import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
 import org.mockito.kotlin.any
 import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
@@ -314,6 +317,38 @@ internal class MoshiChatApiTest {
         verify(api, times(1)).updateMessage(eq(message.id), any())
     }
 
+    @ParameterizedTest
+    @MethodSource("io.getstream.chat.android.client.api2.MoshiChatApiTestArguments#uploadMessageTypeInput")
+    fun testSendMessageCoercesType(inputType: String, expectedWireType: String) = runTest {
+        val api = mock<MessageApi>()
+        val call = RetroSuccess(MessageResponse(message = Mother.randomDownstreamMessageDto())).toRetrofitCall()
+        whenever(api.sendMessage(any(), any(), any())).doReturn(call)
+        val sut = Fixture().withMessageApi(api).get()
+        val message = randomMessage(type = inputType)
+
+        sut.sendMessage(randomString(), randomString(), message).await()
+
+        val captor = argumentCaptor<SendMessageRequest>()
+        verify(api).sendMessage(any(), any(), captor.capture())
+        assertEquals(expectedWireType, captor.firstValue.message.type)
+    }
+
+    @ParameterizedTest
+    @MethodSource("io.getstream.chat.android.client.api2.MoshiChatApiTestArguments#uploadMessageTypeInput")
+    fun testUpdateMessageCoercesType(inputType: String, expectedWireType: String) = runTest {
+        val api = mock<MessageApi>()
+        val call = RetroSuccess(MessageResponse(message = Mother.randomDownstreamMessageDto())).toRetrofitCall()
+        whenever(api.updateMessage(any(), any())).doReturn(call)
+        val sut = Fixture().withMessageApi(api).get()
+        val message = randomMessage(type = inputType)
+
+        sut.updateMessage(message).await()
+
+        val captor = argumentCaptor<UpdateMessageRequest>()
+        verify(api).updateMessage(eq(message.id), captor.capture())
+        assertEquals(expectedWireType, captor.firstValue.message.type)
+    }
+
     @ParameterizedTest
     @MethodSource("io.getstream.chat.android.client.api2.MoshiChatApiTestArguments#partialUpdateMessageInput")
     fun testPartialUpdateMessage(call: RetrofitCall<MessageResponse>, expected: KClass<*>) = runTest {

stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTestArguments.kt

@@ -66,6 +66,7 @@ import io.getstream.chat.android.client.api2.model.response.UsersResponse
 import io.getstream.chat.android.client.utils.RetroError
 import io.getstream.chat.android.client.utils.RetroSuccess
 import io.getstream.chat.android.models.EventType
+import io.getstream.chat.android.models.MessageType
 import io.getstream.chat.android.models.QueryRemindersResult
 import io.getstream.chat.android.models.UnreadChannel
 import io.getstream.chat.android.models.UnreadChannelByType
@@ -111,6 +112,15 @@ internal object MoshiChatApiTestArguments {
     @JvmStatic
     fun updateMessageInput() = messageResponseArguments()
 
+    @JvmStatic
+    fun uploadMessageTypeInput() = listOf(
+        Arguments.of(MessageType.REGULAR, MessageType.REGULAR),
+        Arguments.of(MessageType.SYSTEM, MessageType.SYSTEM),
+        Arguments.of(MessageType.REPLY, ""),
+        Arguments.of(MessageType.ERROR, ""),
+        Arguments.of(MessageType.EPHEMERAL, ""),
+    )
+
     @JvmStatic
     fun partialUpdateMessageInput() = messageResponseArguments()
 

stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DtoMappingTest.kt

@@ -201,6 +201,16 @@ internal class DtoMappingTest {
         verify(messageTransformer, times(1)).transform(message)
     }
 
+    @Test
+    fun `Message toDto uses messageType parameter when provided`() {
+        val message = randomMessage(type = "reply")
+        val mapping = Fixture().get()
+
+        val dto = with(mapping) { message.toDto(messageType = "") }
+
+        dto.type shouldBeEqualTo ""
+    }
+
     @Test
     fun `Mute is correctly mapped to Dto`() {
         val mute = randomMute()