Рабочие счетчики и переработка чата

2026-04-15 01:14:55 +03:00
parent 58fdf1aca1
commit 487cb1b12b
18 changed files with 725 additions and 292 deletions
@@ -108,11 +108,24 @@ class ChatListViewModel @Inject constructor(
        
        _state.update { currentState ->
            val updatedChats = currentState.chats.map { chat ->
-                if (chat.id == event.message.chatId) {
+                if (chat.id.equals(event.message.chatId, ignoreCase = true)) {
                    val isMyMessage = event.message.senderId == currentUserId
+                    val isAlreadySeen = chat.lastMessage?.id == event.message.id
+                    
+                    val lastMsgDomain = event.message.toDomain(currentUserId, baseUrl)
+                    val newCount = if (isMyMessage || isAlreadySeen) {
+                        chat.unreadCount 
+                    } else {
+                        chat.unreadCount + 1
+                    }
+                    
+                    if (!isAlreadySeen) {
+                        android.util.Log.d("ChatListVM", "Message ${event.message.id} -> Count ${chat.unreadCount} -> $newCount")
+                    }
+                    
                    chat.copy(
-                        lastMessage = event.message.toDomain(baseUrl),
-                        unreadCount = if (isMyMessage) chat.unreadCount else chat.unreadCount + 1
+                        lastMessage = lastMsgDomain,
+                        unreadCount = newCount
                    )
                } else chat
            }