improve initial loading

composeApp/src/androidMain/kotlin/su/reya/coop/screens/HomeScreen.kt

@@ -155,7 +155,7 @@ fun HomeScreen() {
         onPauseOrDispose { }
     }
 
-    LaunchedEffect(Unit) {
+    LaunchedEffect(authState.signerRequired) {
         chatViewModel.refreshChatRooms()
     }
 

shared/src/commonMain/kotlin/su/reya/coop/Room.kt

@@ -41,8 +41,7 @@ data class Room(
     }
 
     companion object {
-        fun new(rumor: UnsignedEvent, userPubkey: PublicKey): Room {
+        fun new(rumor: UnsignedEvent, userPubkey: PublicKey, id: Long = rumor.roomId()): Room {
-            val id = rumor.roomId()
             val createdAt = rumor.createdAt()
             val subject = rumor.tags().toVec().find { it.kind() == "subject" }?.content()
 

shared/src/commonMain/kotlin/su/reya/coop/nostr/Messaging.kt

@@ -170,32 +170,29 @@ class MessageManager(private val nostr: Nostr) {
 
             // Get all DM events
             val filter = Filter().kind(kind).customTags(kTag, listOf("14", "dm"))
-            val events = client?.database()?.query(filter)
+            val events = client?.database()?.query(filter)?.toVec() ?: return null
 
             // Collect rooms
             val roomsMap: MutableMap<Long, Room> = mutableMapOf()
 
             events
-                ?.toVec()
+                .map { UnsignedEvent.fromJson(it.content()) }
-                ?.map { UnsignedEvent.fromJson(it.content()) }
+                .filter { it.tags().publicKeys().isNotEmpty() }
-                ?.filter { it.tags().publicKeys().isNotEmpty() }
+                .forEach { rumor ->
-                ?.forEach { event ->
+                    val id = rumor.roomId()
-                    val newRoom = Room.new(rumor = event, userPubkey = userPubkey)
+                    val isFromMe = rumor.author() == userPubkey
-                    val existingRoom = roomsMap[newRoom.id]
+                    val existing = roomsMap[id]
+                    val createdAt = rumor.createdAt()
 
-                    // Check if the room already exists
+                    // If the room is new or the current rumor is newer than the existing one
-                    if (existingRoom == null || newRoom.createdAt.asSecs() > existingRoom.createdAt.asSecs()) {
+                    if (existing == null || createdAt.asSecs() > existing.createdAt.asSecs()) {
-                        val rTag = SingleLetterTag.lowercase(Alphabet.R)
+                        // A room is "Ongoing" if it was already marked as such or if the current rumor is from the user
-                        val filter = Filter().kind(kind).pubkey(userPubkey)
+                        val isOngoing = (existing?.kind == RoomKind.Ongoing) || isFromMe
-                            .customTag(rTag, newRoom.id.toString())
+                        val room = Room.new(rumor = rumor, userPubkey = userPubkey, id = id)
-
+                        roomsMap[id] = if (isOngoing) room.copy(kind = RoomKind.Ongoing) else room
-                        // Determine if it's an ongoing room
+                    } else if (isFromMe && existing.kind != RoomKind.Ongoing) {
-                        val isOngoing =
+                        // If it's an older rumor but sent by the user, mark the room as Ongoing
-                            client?.database()?.query(filter)?.toVec()?.isNotEmpty() ?: false
+                        roomsMap[id] = existing.copy(kind = RoomKind.Ongoing)
-
-                        // Append room to map
-                        roomsMap[newRoom.id] =
-                            if (isOngoing) newRoom.copy(kind = RoomKind.Ongoing) else newRoom
                     }
                 }
 

shared/src/commonMain/kotlin/su/reya/coop/viewmodel/ChatViewModel.kt

@@ -69,8 +69,8 @@ class ChatViewModel(private val nostr: Nostr) : BaseViewModel() {
                         _state.update { it.copy(isPartialProcessedGiftWrap = true) }
                     }
 
-                    // Refresh UI every 10 messages OR when sync is fully done
+                    // Refresh UI every 100 messages OR when sync is fully done
-                    if (syncState.processedCount % 10 == 0 || !syncState.isSyncing) {
+                    if (syncState.processedCount % 100 == 0 || !syncState.isSyncing) {
                         refreshChatRooms()
                     }
                 }
@@ -97,9 +97,6 @@ class ChatViewModel(private val nostr: Nostr) : BaseViewModel() {
                     _newEvents.emit(event)
                 }
             }
-
-            // Initial load of rooms
-            refreshChatRooms()
         }
     }
 
@@ -149,9 +146,7 @@ class ChatViewModel(private val nostr: Nostr) : BaseViewModel() {
             _state.update { currentState ->
                 val merged = currentState.rooms.associateBy { it.id }.toMutableMap()
                 // Add or update rooms from the database
-                rooms.forEach { room ->
+                rooms.forEach { room -> merged[room.id] = room }
-                    merged[room.id] = room
-                }
                 // Return as a sorted set to maintain UI consistency
                 currentState.copy(rooms = merged.values.sortedDescending().toSet())
             }