melod1n/fast-messenger
3
2
Fork 1
Code Issues Actions Packages Projects Releases Wiki Activity

* refactor Conversation -> Convo

Browse Source 
* extract Message and Convo mappers to core/domain module
* improve reply container text
This commit is contained in:
Danil Nikolaev
2025-12-17 17:16:02 +03:00
parent 7b6571f208
commit 45ee0acea5
125 changed files with 2361 additions and 2005 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/model/src/main/kotlin/dev/meloda/fast/model/ConversationFlags.kt → core/model/src/main/kotlin/dev/meloda/fast/model/ConvoFlags.kt
+4 -4
View File
@@ -1,6 +1,6 @@
package dev.meloda.fast.model
enum class ConversationFlags(val value: Int) {
enum class ConvoFlags(val value: Int) {
DISABLE_PUSH(16),
DISABLE_SOUND(32),
INCOMING_CHAT_REQUEST(256),
@@ -17,10 +17,10 @@ enum class ConversationFlags(val value: Int) {
companion object {
fun parse(mask: Int): List<ConversationFlags> {
val flags = mutableListOf<ConversationFlags>()
fun parse(mask: Int): List<ConvoFlags> {
val flags = mutableListOf<ConvoFlags>()
ConversationFlags.entries.forEach { flag ->
ConvoFlags.entries.forEach { flag ->
if (mask and flag.value > 0) {
flags.add(flag)
}
core/model/src/main/kotlin/dev/meloda/fast/model/ConversationsFilter.kt → core/model/src/main/kotlin/dev/meloda/fast/model/ConvosFilter.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package dev.meloda.fast.model
enum class ConversationsFilter {
enum class ConvosFilter {
ALL, UNREAD, ARCHIVE, BUSINESS_NOTIFY
}
core/model/src/main/kotlin/dev/meloda/fast/model/LongPollParsedEvent.kt
+2 -2
View File
@@ -1,6 +1,6 @@
package dev.meloda.fast.model
import dev.meloda.fast.model.api.domain.VkConversation
import dev.meloda.fast.model.api.domain.VkConvo
import dev.meloda.fast.model.api.domain.VkMessage
sealed interface LongPollParsedEvent {
@@ -92,7 +92,7 @@ sealed interface LongPollParsedEvent {
) : LongPollParsedEvent
data class ChatArchived(
val conversation: VkConversation,
val convo: VkConvo,
val archived: Boolean
) : LongPollParsedEvent
}
core/model/src/main/kotlin/dev/meloda/fast/model/api/PeerType.kt
+11
View File
@@ -1,5 +1,7 @@
package dev.meloda.fast.model.api
import dev.meloda.fast.model.api.domain.VkMessage
enum class PeerType(val value: String) {
USER("user"),
GROUP("group"),
@@ -13,5 +15,14 @@ enum class PeerType(val value: String) {
fun parse(type: String): PeerType {
return entries.first { it.value == type }
}
fun VkMessage.getPeerType(): PeerType {
return when {
peerId > 2_000_000_000 -> CHAT
peerId > 0 -> USER
peerId < 0 -> GROUP
else -> throw IllegalArgumentException("Unknown peer type for peerId: 0")
}
}
}
}
core/model/src/main/kotlin/dev/meloda/fast/model/api/data/VkAttachmentHistoryMessageData.kt
+2 -2
View File
@@ -8,7 +8,7 @@ import dev.meloda.fast.model.api.domain.VkAttachmentHistoryMessage
data class VkAttachmentHistoryMessageData(
@Json(name = "message_id") val messageId: Long,
@Json(name = "date") val date: Int,
@Json(name = "cmid") val conversationMessageId: Long,
@Json(name = "cmid") val cmId: Long,
@Json(name = "from_id") val fromId: Long,
@Json(name = "position") val position: Int,
@Json(name = "attachment") val attachment: VkAttachmentItemData
@@ -16,7 +16,7 @@ data class VkAttachmentHistoryMessageData(
fun toDomain(): VkAttachmentHistoryMessage = VkAttachmentHistoryMessage(
messageId = messageId,
conversationMessageId = conversationMessageId,
cmId = cmId,
date = date,
fromId = fromId,
position = position,
core/model/src/main/kotlin/dev/meloda/fast/model/api/data/VkConversationData.kt → core/model/src/main/kotlin/dev/meloda/fast/model/api/data/VkConvoData.kt
+9 -9
View File
@@ -3,19 +3,19 @@ package dev.meloda.fast.model.api.data
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import dev.meloda.fast.model.api.PeerType
import dev.meloda.fast.model.api.domain.VkConversation
import dev.meloda.fast.model.api.domain.VkConvo
import dev.meloda.fast.model.api.domain.VkMessage
@JsonClass(generateAdapter = true)
data class VkConversationData(
data class VkConvoData(
@Json(name = "peer") val peer: Peer,
@Json(name = "last_message_id") val lastMessageId: Long?,
@Json(name = "in_read") val inRead: Long,
@Json(name = "out_read") val outRead: Long,
@Json(name = "in_read_cmid") val inReadConversationMessageId: Long,
@Json(name = "out_read_cmid") val outReadConversationMessageId: Long,
@Json(name = "in_read_cmid") val inReadCmId: Long,
@Json(name = "out_read_cmid") val outReadCmId: Long,
@Json(name = "sort_id") val sortId: SortId,
@Json(name = "last_conversation_message_id") val lastConversationMessageId: Long,
@Json(name = "last_conversation_message_id") val lastCmId: Long,
@Json(name = "is_marked_unread") val isMarkedUnread: Boolean,
@Json(name = "important") val important: Boolean,
@Json(name = "push_settings") val pushSettings: PushSettings?,
@@ -111,7 +111,7 @@ data class VkConversationData(
fun asDomain(
lastMessage: VkMessage? = null,
): VkConversation = VkConversation(
): VkConvo = VkConvo(
id = peer.id,
localId = peer.localId,
title = chatSettings?.title,
@@ -120,7 +120,7 @@ data class VkConversationData(
photo200 = chatSettings?.photo?.photo200,
isCallInProgress = callInProgress != null,
isPhantom = chatSettings?.isDisappearing == true,
lastCmId = lastConversationMessageId,
lastCmId = lastCmId,
inRead = inRead,
outRead = outRead,
lastMessageId = lastMessageId,
@@ -132,8 +132,8 @@ data class VkConversationData(
canChangePin = chatSettings?.acl?.canChangePin == true,
canChangeInfo = chatSettings?.acl?.canChangeInfo == true,
pinnedMessageId = chatSettings?.pinnedMessage?.id,
inReadCmId = inReadConversationMessageId,
outReadCmId = outReadConversationMessageId,
inReadCmId = inReadCmId,
outReadCmId = outReadCmId,
interactionType = -1,
interactionIds = emptyList(),
peerType = PeerType.parse(peer.type),
core/model/src/main/kotlin/dev/meloda/fast/model/api/data/VkMessageData.kt
+2 -2
View File
@@ -56,7 +56,7 @@ data class VkMessageData(
@Json(name = "type") val type: String,
@Json(name = "member_id") val memberId: Long?,
@Json(name = "text") val text: String?,
@Json(name = "conversation_message_id") val conversationMessageId: Long?,
@Json(name = "conversation_message_id") val cmId: Long?,
@Json(name = "message") val message: String?
)
@@ -102,7 +102,7 @@ fun VkMessageData.asDomain(): VkMessage = VkMessage(
action = VkMessage.Action.parse(action?.type),
actionMemberId = action?.memberId,
actionText = action?.text,
actionConversationMessageId = action?.conversationMessageId,
actionCmId = action?.cmId,
actionMessage = action?.message,
geoType = geo?.type,
isImportant = important == true,
core/model/src/main/kotlin/dev/meloda/fast/model/api/data/VkPinnedMessageData.kt
+3 -3
View File
@@ -12,7 +12,7 @@ data class VkPinnedMessageData(
@Json(name = "from_id") val fromId: Long,
@Json(name = "out") val out: Boolean?,
@Json(name = "text") val text: String,
@Json(name = "conversation_message_id") val conversationMessageId: Long,
@Json(name = "conversation_message_id") val cmId: Long,
@Json(name = "fwd_messages") val forwards: List<VkMessageData>?,
@Json(name = "important") val important: Boolean = false,
@Json(name = "random_id") val randomId: Long = 0,
@@ -28,7 +28,7 @@ data class VkPinnedMessageData(
fun mapToDomain(): VkMessage = VkMessage(
id = id ?: -1,
cmId = conversationMessageId,
cmId = cmId,
text = text.ifBlank { null },
isOut = out == true,
peerId = peerId ?: -1,
@@ -38,7 +38,7 @@ data class VkPinnedMessageData(
action = VkMessage.Action.parse(action?.type),
actionMemberId = action?.memberId,
actionText = action?.text,
actionConversationMessageId = action?.conversationMessageId,
actionCmId = action?.cmId,
actionMessage = action?.message,
geoType = geo?.type,
isImportant = important,
core/model/src/main/kotlin/dev/meloda/fast/model/api/domain/VkAttachmentHistoryMessage.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package dev.meloda.fast.model.api.domain
data class VkAttachmentHistoryMessage(
val messageId: Long,
val conversationMessageId: Long,
val cmId: Long,
val date: Int,
val fromId: Long,
val position: Int,
core/model/src/main/kotlin/dev/meloda/fast/model/api/domain/VkConversation.kt → core/model/src/main/kotlin/dev/meloda/fast/model/api/domain/VkConvo.kt
+5 -5
View File
@@ -1,9 +1,9 @@
package dev.meloda.fast.model.api.domain
import dev.meloda.fast.model.api.PeerType
import dev.meloda.fast.model.database.VkConversationEntity
import dev.meloda.fast.model.database.VkConvoEntity
data class VkConversation(
data class VkConvo(
val id: Long,
val localId: Long,
val ownerId: Long?,
@@ -54,7 +54,7 @@ data class VkConversation(
}
companion object {
val EMPTY: VkConversation = VkConversation(
val EMPTY: VkConvo = VkConvo(
id = -1,
localId = -1,
ownerId = null,
@@ -90,7 +90,7 @@ data class VkConversation(
}
}
fun VkConversation.asEntity(): VkConversationEntity = VkConversationEntity(
fun VkConvo.asEntity(): VkConvoEntity = VkConvoEntity(
id = id,
localId = localId,
ownerId = ownerId,
@@ -99,7 +99,7 @@ fun VkConversation.asEntity(): VkConversationEntity = VkConversationEntity(
photo100 = photo100,
photo200 = photo200,
isPhantom = isPhantom,
lastConversationMessageId = lastCmId,
lastCmId = lastCmId,
inReadCmId = inReadCmId,
outReadCmId = outReadCmId,
inRead = inRead,
core/model/src/main/kotlin/dev/meloda/fast/model/api/domain/VkMessage.kt
+5 -5
View File
@@ -16,7 +16,7 @@ data class VkMessage(
val action: Action?,
val actionMemberId: Long?,
val actionText: String?,
val actionConversationMessageId: Long?,
val actionCmId: Long?,
val actionMessage: String?,
val updateTime: Int?,
@@ -44,9 +44,9 @@ data class VkMessage(
fun isGroup() = fromId < 0
fun isRead(conversation: VkConversation): Boolean = when {
fun isRead(convo: VkConvo): Boolean = when {
id <= 0 -> false
else -> conversation.isRead(this)
else -> convo.isRead(this)
}
fun hasAttachments(): Boolean = attachments.orEmpty().isNotEmpty()
@@ -98,7 +98,7 @@ data class VkMessage(
fun VkMessage.asEntity(): VkMessageEntity = VkMessageEntity(
id = id,
conversationMessageId = cmId,
cmId = cmId,
text = text,
isOut = isOut,
peerId = peerId,
@@ -108,7 +108,7 @@ fun VkMessage.asEntity(): VkMessageEntity = VkMessageEntity(
action = action?.value,
actionMemberId = actionMemberId,
actionText = actionText,
actionConversationMessageId = actionConversationMessageId,
actionCmId = actionCmId,
actionMessage = actionMessage,
updateTime = updateTime,
important = isImportant,
core/model/src/main/kotlin/dev/meloda/fast/model/api/requests/ConversationsRequest.kt → core/model/src/main/kotlin/dev/meloda/fast/model/api/requests/ConvosRequest.kt
+3 -3
View File
@@ -1,12 +1,12 @@
package dev.meloda.fast.model.api.requests
import dev.meloda.fast.model.ConversationsFilter
import dev.meloda.fast.model.ConvosFilter
data class ConversationsGetRequest(
data class ConvosGetRequest(
val count: Int? = null,
val offset: Int? = null,
val fields: String = "",
val filter: ConversationsFilter = ConversationsFilter.ALL,
val filter: ConvosFilter = ConvosFilter.ALL,
val extended: Boolean? = true,
val startMessageId: Long? = null
) {
core/model/src/main/kotlin/dev/meloda/fast/model/api/requests/MessagesRequest.kt
+7 -7
View File
@@ -115,7 +115,7 @@ data class MessagesGetLongPollServerRequest(
data class MessagesPinMessageRequest(
val peerId: Long,
val messageId: Long? = null,
val conversationMessageId: Long? = null
val cmId: Long? = null
) {
val map: Map<String, String>
@@ -123,7 +123,7 @@ data class MessagesPinMessageRequest(
"peer_id" to peerId.toString()
).apply {
messageId?.let { this["message_id"] = it.toString() }
conversationMessageId?.let { this["conversation_message_id"] = it.toString() }
cmId?.let { this["conversation_message_id"] = it.toString() }
}
}
@@ -136,7 +136,7 @@ data class MessagesUnpinMessageRequest(val peerId: Long) {
data class MessagesDeleteRequest(
val peerId: Long,
val messagesIds: List<Long>? = null,
val conversationsMessagesIds: List<Long>? = null,
val cmIds: List<Long>? = null,
val isSpam: Boolean? = null,
val deleteForAll: Boolean? = null
) {
@@ -149,7 +149,7 @@ data class MessagesDeleteRequest(
deleteForAll?.let { this["delete_for_all"] = it.asInt().toString() }
messagesIds?.let { this["message_ids"] = it.joinToString() }
conversationsMessagesIds?.let {
cmIds?.let {
this["conversation_message_ids"] = it.joinToString()
}
}
@@ -228,7 +228,7 @@ data class MessagesGetChatRequest(
}
data class MessagesGetConversationMembersRequest(
data class MessagesGetConvoMembersRequest(
val peerId: Long,
val offset: Int? = null,
val count: Int? = null,
@@ -267,14 +267,14 @@ data class MessagesGetHistoryAttachmentsRequest(
val offset: Int?,
val preserveOrder: Boolean?,
val attachmentTypes: List<String>,
val conversationMessageId: Long,
val cmId: Long,
val fields: String?
) {
val map = mutableMapOf(
"peer_id" to peerId.toString(),
"attachment_types" to attachmentTypes.joinToString(","),
"cmid" to conversationMessageId.toString()
"cmid" to cmId.toString()
).apply {
extended?.let { this["extended"] = it.toString() }
count?.let { this["count"] = it.toString() }
core/model/src/main/kotlin/dev/meloda/fast/model/api/responses/ConversationsResponse.kt → core/model/src/main/kotlin/dev/meloda/fast/model/api/responses/ConvosResponse.kt
+8 -8
View File
@@ -3,15 +3,15 @@ package dev.meloda.fast.model.api.responses
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import dev.meloda.fast.model.api.data.VkContactData
import dev.meloda.fast.model.api.data.VkConversationData
import dev.meloda.fast.model.api.data.VkConvoData
import dev.meloda.fast.model.api.data.VkGroupData
import dev.meloda.fast.model.api.data.VkMessageData
import dev.meloda.fast.model.api.data.VkUserData
@JsonClass(generateAdapter = true)
data class ConversationsGetResponse(
data class ConvosGetResponse(
@Json(name = "count") val count: Int,
@Json(name = "items") val items: List<ConversationsResponseItem>,
@Json(name = "items") val items: List<ConvosResponseItem>,
@Json(name = "unread_count") val unreadCount: Int?,
@Json(name = "profiles") val profiles: List<VkUserData>?,
@Json(name = "groups") val groups: List<VkGroupData>?,
@@ -19,21 +19,21 @@ data class ConversationsGetResponse(
)
@JsonClass(generateAdapter = true)
data class ConversationsGetByIdResponse(
data class ConvosGetByIdResponse(
@Json(name = "count") val count: Int,
@Json(name = "items") val items: List<VkConversationData>,
@Json(name = "items") val items: List<VkConvoData>,
@Json(name = "profiles") val profiles: List<VkUserData>?,
@Json(name = "groups") val groups: List<VkGroupData>?,
@Json(name = "contacts") val contacts: List<VkContactData>?
)
@JsonClass(generateAdapter = true)
data class ConversationsResponseItem(
@Json(name = "conversation") val conversation: VkConversationData,
data class ConvosResponseItem(
@Json(name = "conversation") val convo: VkConvoData,
@Json(name = "last_message") val lastMessage: VkMessageData?
)
@JsonClass(generateAdapter = true)
data class ConversationsDeleteResponse(
data class ConvosDeleteResponse(
@Json(name = "last_deleted_id") val lastDeletedId: Long
)
core/model/src/main/kotlin/dev/meloda/fast/model/api/responses/MessagesResponse.kt
+3 -3
View File
@@ -5,7 +5,7 @@ import com.squareup.moshi.JsonClass
import dev.meloda.fast.model.api.data.VkAttachmentHistoryMessageData
import dev.meloda.fast.model.api.data.VkChatMemberData
import dev.meloda.fast.model.api.data.VkContactData
import dev.meloda.fast.model.api.data.VkConversationData
import dev.meloda.fast.model.api.data.VkConvoData
import dev.meloda.fast.model.api.data.VkGroupData
import dev.meloda.fast.model.api.data.VkMessageData
import dev.meloda.fast.model.api.data.VkUserData
@@ -14,7 +14,7 @@ import dev.meloda.fast.model.api.data.VkUserData
data class MessagesGetHistoryResponse(
val count: Int,
val items: List<VkMessageData>,
val conversations: List<VkConversationData>?,
val convos: List<VkConvoData>?,
val profiles: List<VkUserData>?,
val groups: List<VkGroupData>?,
val contacts: List<VkContactData>?
@@ -30,7 +30,7 @@ data class MessagesGetByIdResponse(
)
@JsonClass(generateAdapter = true)
data class MessagesGetConversationMembersResponse(
data class MessagesGetConvoMembersResponse(
val count: Int,
val items: List<VkChatMemberData>?,
val profiles: List<VkUserData>?,
core/model/src/main/kotlin/dev/meloda/fast/model/database/ConversationWithMessage.kt → core/model/src/main/kotlin/dev/meloda/fast/model/database/ConvoWithMessage.kt
+2 -2
View File
@@ -3,8 +3,8 @@ package dev.meloda.fast.model.database
import androidx.room.Embedded
import androidx.room.Relation
data class ConversationWithMessage(
@Embedded val conversation: VkConversationEntity,
data class ConvoWithMessage(
@Embedded val convo: VkConvoEntity,
@Relation(
parentColumn = "lastMessageId",
entityColumn = "id"
core/model/src/main/kotlin/dev/meloda/fast/model/database/VkConversationEntity.kt → core/model/src/main/kotlin/dev/meloda/fast/model/database/VkConvoEntity.kt
+6 -6
View File
@@ -3,10 +3,10 @@ package dev.meloda.fast.model.database
import androidx.room.Entity
import androidx.room.PrimaryKey
import dev.meloda.fast.model.api.PeerType
import dev.meloda.fast.model.api.domain.VkConversation
import dev.meloda.fast.model.api.domain.VkConvo
@Entity(tableName = "conversations")
data class VkConversationEntity(
@Entity(tableName = "convos")
data class VkConvoEntity(
@PrimaryKey val id: Long,
val localId: Long,
val ownerId: Long?,
@@ -15,7 +15,7 @@ data class VkConversationEntity(
val photo100: String?,
val photo200: String?,
val isPhantom: Boolean,
val lastConversationMessageId: Long,
val lastCmId: Long,
val inReadCmId: Long,
val outReadCmId: Long,
val inRead: Long,
@@ -32,7 +32,7 @@ data class VkConversationEntity(
val isArchived: Boolean
)
fun VkConversationEntity.asExternalModel(): VkConversation = VkConversation(
fun VkConvoEntity.asExternalModel(): VkConvo = VkConvo(
id = id,
localId = localId,
ownerId = ownerId,
@@ -42,7 +42,7 @@ fun VkConversationEntity.asExternalModel(): VkConversation = VkConversation(
photo200 = photo200,
isCallInProgress = false,
isPhantom = isPhantom,
lastCmId = lastConversationMessageId,
lastCmId = lastCmId,
inReadCmId = inReadCmId,
outReadCmId = outReadCmId,
inRead = inRead,
core/model/src/main/kotlin/dev/meloda/fast/model/database/VkMessageEntity.kt
+4 -4
View File
@@ -8,7 +8,7 @@ import dev.meloda.fast.model.api.domain.VkUnknownAttachment
@Entity(tableName = "messages")
data class VkMessageEntity(
@PrimaryKey val id: Long,
val conversationMessageId: Long,
val cmId: Long,
val text: String?,
val isOut: Boolean,
val peerId: Long,
@@ -18,7 +18,7 @@ data class VkMessageEntity(
val action: String?,
val actionMemberId: Long?,
val actionText: String?,
val actionConversationMessageId: Long?,
val actionCmId: Long?,
val actionMessage: String?,
val updateTime: Int?,
val important: Boolean,
@@ -32,7 +32,7 @@ data class VkMessageEntity(
fun VkMessageEntity.asExternalModel(): VkMessage = VkMessage(
id = id,
cmId = conversationMessageId,
cmId = cmId,
text = text,
isOut = isOut,
peerId = peerId,
@@ -42,7 +42,7 @@ fun VkMessageEntity.asExternalModel(): VkMessage = VkMessage(
action = VkMessage.Action.parse(action),
actionMemberId = actionMemberId,
actionText = actionText,
actionConversationMessageId = actionConversationMessageId,
actionCmId = actionCmId,
actionMessage = actionMessage,
updateTime = updateTime,
isImportant = important,