Fix attachment sending

Author: hypergonial

composeApp/src/commonMain/kotlin/com/hypergonial/chat/model/ChatClient.kt

@@ -486,8 +486,7 @@ class ChatClient(scope: CoroutineScope, override val maxReconnectAttempts: Int =
         scope.launch {
             try {
                 withTimeout(5000) { gatewayConnectedJob.join() }
-            }
-            catch(e: TimeoutCancellationException) {
+            } catch (e: TimeoutCancellationException) {
                 gatewaySession?.cancel()
                 gatewayConnectedJob = Job()
                 _reconnectAttempts++
@@ -945,15 +944,19 @@ class ChatClient(scope: CoroutineScope, override val maxReconnectAttempts: Int =
 
     override suspend fun sendMessage(
         channelId: Snowflake,
-        content: String,
+        content: String?,
         nonce: String?,
         attachments: List<PlatformFile>,
     ): Message {
+        require(!content.isNullOrBlank() || attachments.isNotEmpty()) { "One of content or attachments must be set" }
+
         // See https://stackoverflow.com/questions/69830965/ktor-client-post-multipart-form-data
         val json =
             FormPart(
                 "json",
-                Json.encodeToString<MessageCreateRequest>(MessageCreateRequest(content, nonce)),
+                Json.encodeToString<MessageCreateRequest>(
+                    MessageCreateRequest(content.let { if (it.isNullOrBlank()) null else it }, nonce)
+                ),
                 Headers.build { append(HttpHeaders.ContentType, ContentType.Application.Json.toString()) },
             )
 
@@ -1000,7 +1003,7 @@ class ChatClient(scope: CoroutineScope, override val maxReconnectAttempts: Int =
         return http
             .patch("channels/$channelId/messages/$messageId") {
                 contentType(ContentType.Application.Json)
-                setBody(MessageUpdateRequest(content))
+                setBody(MessageUpdateRequest(content.let { if (it.isNullOrBlank()) null else it }))
             }
             .body<Message>()
     }

composeApp/src/commonMain/kotlin/com/hypergonial/chat/model/Client.kt

@@ -241,7 +241,7 @@ interface Client : InstanceKeeper.Instance, EventManagerAware, CacheAware {
      */
     suspend fun sendMessage(
         channelId: Snowflake,
-        content: String,
+        content: String?,
         nonce: String? = null,
         attachments: List<PlatformFile> = emptyList(),
     ): Message

composeApp/src/commonMain/kotlin/com/hypergonial/chat/model/payloads/rest/MessageCreateRequest.kt

@@ -10,4 +10,4 @@ import kotlinx.serialization.Serializable
  * @param content The content of the message.
  * @param nonce A nonce to identify the message.
  */
-@Serializable data class MessageCreateRequest(val content: String, val nonce: String? = null)
+@Serializable data class MessageCreateRequest(val content: String? = null, val nonce: String? = null)

composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/composables/MessageList.kt

@@ -331,8 +331,12 @@ private fun MessageContent(component: MessageComponent, modifier: Modifier = Mod
                 else if (state.isPending) Color.Gray else MaterialTheme.colorScheme.onBackground
 
             Row(modifier = modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+                if (state.message.content.isNullOrBlank()) {
+                    return@Row
+                }
+
                 Markdown(
-                    state.message.content ?: "TODO: No content - HANDLEME",
+                    state.message.content ?: "",
                     imageTransformer = ChatImageTransformer,
                     modifier = Modifier.fillMaxHeight().fillMaxWidth(0.9f),
                     components =