fix(fc): handle read pointers while sitting at bottom of chat

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

ui/components/src/main/kotlin/com/getcode/ui/components/chat/MessageList.kt

@@ -28,16 +28,20 @@ import androidx.paging.compose.itemKey
 import com.getcode.model.ID
 import com.getcode.model.chat.MessageContent
 import com.getcode.model.chat.MessageStatus
+import com.getcode.model.uuid
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.components.chat.messagecontents.MessageControlAction
 import com.getcode.ui.components.chat.utils.ChatItem
 import com.getcode.ui.components.chat.utils.MessageTip
 import com.getcode.ui.components.text.markup.Markup
 import com.getcode.util.formatDateRelatively
+import com.getcode.utils.timestamp
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterNot
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 
 sealed interface MessageListEvent {
     data class AdvancePointer(val messageId: ID) : MessageListEvent
@@ -275,12 +279,18 @@ private fun HandleMessageReads(
             }.distinctUntilChanged(),
             snapshotFlow { listState.isScrollInProgress },
             snapshotFlow { listState.firstVisibleItemIndex },
-        ) { loadState, isScrolling, firstVisibleIndex ->
-            Triple(loadState, isScrolling, firstVisibleIndex)
-        }.filter { (loadStateIsNotLoading, isScrolling, _) ->
-            // Wait until scrolling stops, messages are not loading, and we are at the bottom
-            loadStateIsNotLoading && !isScrolling && messages.itemCount > 0 && hasSetAtUnread
-        }.collect { (_, _, firstVisibleIndex) ->
+            snapshotFlow { messages.itemCount },
+        ) { loadState, isScrolling, firstVisibleIndex, itemCount ->
+            Triple(loadState, isScrolling, firstVisibleIndex) to itemCount
+        }.filter { (state, itemCount) ->
+            val (loadStateIsNotLoading, isScrolling, firstVisibleIndex) = state
+            // Ensure we react to new messages while at the bottom
+            loadStateIsNotLoading && !isScrolling && hasSetAtUnread &&
+                    (firstVisibleIndex == 0 || firstVisibleIndex == itemCount - 1) && itemCount > 0
+        }.onEach { (state, _) ->
+
+            val (_, _, firstVisibleIndex) = state
+
             val closestChatMessage =
                 messages[firstVisibleIndex]?.let { it as? ChatItem.Message }
 
@@ -298,7 +308,7 @@ private fun HandleMessageReads(
                     }
                 }
             }
-        }
+        }.launchIn(this)
     }
 }
 

ui/components/src/main/kotlin/com/getcode/ui/components/chat/utils/HandleMessageChanges.kt

@@ -38,7 +38,7 @@ fun HandleMessageChanges(
             .filter { it.refresh is LoadState.NotLoading }
             .mapNotNull { items.itemSnapshotList.firstOrNull() }
             .filterIsInstance<ChatItem.Message>()
-            .distinctUntilChangedBy { it.date }
+            .distinctUntilChangedBy { it.chatMessageId }
             .collect { newMessage ->
                 if (newMessage.status.isOutgoing()) {
                     if (newMessage.date.toEpochMilliseconds() > lastMessageSent) {