FromChat/app
1
0
Fork 0
mirror of https://github.com/fromchat-messenger/app.git synced 2026-09-22 19:15:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix editing & replying in DMs

Browse Source 
Signed-off-by: denis0001-dev <denis0001.dev@ya.ru>
This commit is contained in:
denis0001-dev
2026-02-12 12:21:15 +03:00
Unverified
parent 56054aae8c
commit 9fa3b31744
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/shared/src/commonMain/kotlin/ru/fromchat/api/Models.kt
+1 -1
View File
@@ -174,7 +174,7 @@ data class DmEnvelope(
@SerialName("ciphertext_b64") val ciphertextB64: String, @SerialName("ciphertext_b64") val ciphertextB64: String,
@SerialName("wrapped_mek_b64") val wrappedMekB64: String? = null, @SerialName("wrapped_mek_b64") val wrappedMekB64: String? = null,
val timestamp: String, val timestamp: String,
val replyToId: Int? = null, @SerialName("reply_to_id") val replyToId: Int? = null,
val files: List<DmFile>? = null val files: List<DmFile>? = null
) )
app/shared/src/commonMain/kotlin/ru/fromchat/ui/dm/DmPanel.kt
+37 -2
View File
@@ -66,7 +66,7 @@ class DmPanel(
} }
override suspend fun sendMessage(content: String, replyToId: Int?, clientMessageId: String?) { override suspend fun sendMessage(content: String, replyToId: Int?, clientMessageId: String?) {
ApiClient.sendDm(recipientId = otherUserId, plaintext = content) ApiClient.sendDm(recipientId = otherUserId, plaintext = content, replyToId = replyToId)
} }
override suspend fun loadMessages() { override suspend fun loadMessages() {
@@ -80,6 +80,12 @@ class DmPanel(
createMessage(envelope, plaintext) createMessage(envelope, plaintext)
} }
}.forEach { addMessage(it) } }.forEach { addMessage(it) }
response.messages.forEach { envelope ->
if (envelope.replyToId != null) {
val replyTo = _state.messages.find { it.id == envelope.replyToId }
updateMessage(envelope.id) { it.copy(reply_to = replyTo) }
}
}
setHasMoreMessages(false) setHasMoreMessages(false)
}.onFailure { error -> }.onFailure { error ->
Logger.e("DmPanel", "Failed to load DM history: ${error.message}", error) Logger.e("DmPanel", "Failed to load DM history: ${error.message}", error)
@@ -94,6 +100,7 @@ class DmPanel(
override suspend fun handleWebSocketMessage(message: WebSocketMessage) { override suspend fun handleWebSocketMessage(message: WebSocketMessage) {
when (message.type) { when (message.type) {
"dmNew" -> message.data?.let { processEnvelope(it) } "dmNew" -> message.data?.let { processEnvelope(it) }
"dmEdited" -> message.data?.let { processEditedEnvelope(it) }
"dmTyping" -> message.data?.let { data -> "dmTyping" -> message.data?.let { data ->
val obj = data.jsonObject val obj = data.jsonObject
val userId = obj["userId"]?.jsonPrimitive?.content?.toIntOrNull() val userId = obj["userId"]?.jsonPrimitive?.content?.toIntOrNull()
@@ -112,6 +119,7 @@ class DmPanel(
val type = obj["type"]?.jsonPrimitive?.content val type = obj["type"]?.jsonPrimitive?.content
when (type) { when (type) {
"dmNew" -> obj["data"]?.let { processEnvelope(it) } "dmNew" -> obj["data"]?.let { processEnvelope(it) }
"dmEdited" -> obj["data"]?.let { processEditedEnvelope(it) }
"dmTyping" -> obj["data"]?.let { data -> "dmTyping" -> obj["data"]?.let { data ->
val dataObj = data.jsonObject val dataObj = data.jsonObject
val userId = dataObj["userId"]?.jsonPrimitive?.content?.toIntOrNull() val userId = dataObj["userId"]?.jsonPrimitive?.content?.toIntOrNull()
@@ -139,6 +147,25 @@ class DmPanel(
val plaintext = runCatching { decryptEnvelope(envelope, currentUserId) }.getOrNull() val plaintext = runCatching { decryptEnvelope(envelope, currentUserId) }.getOrNull()
if (plaintext != null) { if (plaintext != null) {
addMessage(createMessage(envelope, plaintext)) addMessage(createMessage(envelope, plaintext))
if (envelope.replyToId != null) {
val replyTo = _state.messages.find { it.id == envelope.replyToId }
updateMessage(envelope.id) { it.copy(reply_to = replyTo) }
}
}
}
}
private fun processEditedEnvelope(element: JsonElement) {
val envelope = runCatching {
json.decodeFromJsonElement(DmEnvelope.serializer(), element)
}.getOrNull() ?: return
if (envelope.senderId != otherUserId && envelope.recipientId != otherUserId) return
scope.launch(Dispatchers.Default) {
val plaintext = runCatching { decryptEnvelope(envelope, currentUserId) }.getOrNull()
if (plaintext != null) {
updateMessage(envelope.id) { it.copy(content = plaintext, is_edited = true) }
} else {
updateMessage(envelope.id) { it.copy(is_edited = true) }
} }
} }
} }
@@ -165,7 +192,15 @@ class DmPanel(
) )
} }
override suspend fun handleEditMessage(messageId: Int, content: String) {} override suspend fun handleEditMessage(messageId: Int, content: String) {
runCatching {
ApiClient.editDm(messageId = messageId, recipientId = otherUserId, plaintext = content)
}.onSuccess {
updateMessage(messageId) { msg ->
msg.copy(content = content, is_edited = true)
}
}
}
override suspend fun handleDeleteMessage(messageId: Int) {} override suspend fun handleDeleteMessage(messageId: Int) {}