Профиль, редактирование без аватара

client-mobile/chats/data/remote/api/ChatApi.kt

@@ -54,6 +54,9 @@ interface ChatApi {
     @POST("messages/{messageId}/reactions")
     suspend fun addReaction(@Path("messageId") messageId: String, @Query("emoji") emoji: String)
 
+    @POST("chats/personal")
+    suspend fun createPersonalChat(@Body request: CreatePersonalChatRequest): ChatDto
+
     @POST("chats/{chatId}/typing")
     suspend fun sendTypingStatus(@Path("chatId") chatId: String)
 
@@ -61,6 +64,10 @@ interface ChatApi {
     suspend fun markMessagesAsRead(@Path("chatId") chatId: String, @Body lastMessageId: String)
 }
 
+data class CreatePersonalChatRequest(
+    val userId: String
+)
+
 data class KlipyResponse(
     val data: KlipyDataWrapper
 )

client-mobile/chats/data/remote/signalr/SignalRNotificationObserver.kt

@@ -8,6 +8,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -19,35 +20,74 @@ class SignalRNotificationObserver @Inject constructor(
     private val signalrClient: ChatHubClient,
     private val activeChatTracker: ActiveChatTracker,
     private val tokenManager: TokenManager,
+    private val chatRepository: chats.domain.repository.ChatRepository,
     @ApplicationContext private val context: Context
 ) {
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
     private var isStarted = false
+    private val processedMessageIds = mutableSetOf<String>()
+
+    fun refresh() {
+        scope.launch {
+            try {
+                val chats = chatRepository.getChats()
+                val total = chats.sumOf { it.unreadCount }
+                activeChatTracker.setTotalUnreadCount(total)
+            } catch (e: Exception) {
+                // Ignore load error
+            }
+        }
+    }
 
     fun start() {
         if (isStarted) return
         isStarted = true
         
+        // Initial count load
+        refresh()
+
         signalrClient.events
-            .filterIsInstance<ChatEvent.NewMessage>()
             .onEach { event ->
-                val currentUserId = tokenManager.getUserId()
-                val message = event.message
-                
-                // Don't show if it's our message
-                if (message.senderId == currentUserId) return@onEach
-                
-                // Don't show if this chat is currently open
-                if (activeChatTracker.currentChatId.value == message.chatId) return@onEach
-                
-                NotificationHelper.showNotification(
-                    context = context,
-                    title = message.sender?.displayName ?: "Новое сообщение",
-                    body = message.content ?: "Вам прислали вложение",
-                    type = "chat",
-                    chatId = message.chatId,
-                    notificationId = message.id.hashCode()
-                )
+                when (event) {
+                    is ChatEvent.NewMessage -> {
+                        val currentUserId = tokenManager.getUserId()
+                        val message = event.message
+                        
+                        // Don't show if it's our message or already processed
+                        if (message.senderId == currentUserId) return@onEach
+                        if (processedMessageIds.contains(message.id)) return@onEach
+                        
+                        // Mark as processed
+                        processedMessageIds.add(message.id)
+                        if (processedMessageIds.size > 200) {
+                            processedMessageIds.remove(processedMessageIds.first())
+                        }
+                        
+                        // Increment immediately for UI feedback
+                        activeChatTracker.incrementUnreadCount()
+
+                        // Refresh total count from source of truth in background
+                        refresh()
+                        
+                        // Don't show if this chat is currently open
+                        if (activeChatTracker.currentChatId.value == message.chatId) return@onEach
+                        
+                        NotificationHelper.showNotification(
+                            context = context,
+                            title = message.sender?.displayName ?: "Новое сообщение",
+                            body = message.content ?: "Вам прислали вложение",
+                            type = "chat",
+                            chatId = message.chatId,
+                            notificationId = message.id.hashCode(),
+                            totalCount = activeChatTracker.totalUnreadCount.value
+                        )
+                    }
+                    is ChatEvent.MessagesRead -> {
+                        // If anyone read messages, sync our total count
+                        refresh()
+                    }
+                    else -> Unit
+                }
             }
             .launchIn(scope)
     }

client-mobile/chats/data/repository/ChatRepositoryImpl.kt

@@ -131,4 +131,11 @@ class ChatRepositoryImpl @Inject constructor(
     override suspend fun getGifCategories(): List<chats.data.remote.api.GifCategoryDto> {
         return api.getGifCategories().data.categories
     }
+
+    override suspend fun createPersonalChat(userId: String): Chat {
+        val currentUserId = tokenManager.getUserId() ?: ""
+        val baseUrl = serverConfig.getBaseUrl().removeSuffix("/api/")
+        val request = chats.data.remote.api.CreatePersonalChatRequest(userId)
+        return api.createPersonalChat(request).toDomain(currentUserId, baseUrl)
+    }
 }