chore: add back thread invalidation for database until a proper solution is worked out

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/conversation/ConversationViewModel.kt

@@ -909,7 +909,7 @@ class ConversationViewModel @Inject constructor(
                         profileImage = member?.imageUri.takeIf { it.orEmpty().isNotEmpty() },
                         displayName = member?.memberName ?: "Deleted",
                         isSelf = contents.isFromSelf,
-                        isHost = member?.isHost ?: false,
+                        isHost = message.senderId == currentState.hostId,
                         isBlocked = member?.isBlocked == true,
                     ),
                     originalMessage = anchor,

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/list/RoomListScreen.kt

@@ -122,7 +122,7 @@ private fun ChatListScreenContent(
         ) {
             items(
                 count = chats.itemCount,
-                key = chats.itemKey { it.id },
+//                key = chats.itemKey { it.id },
                 contentType = chats.itemContentType { "chat" }
             ) { index ->
                 chats[index]?.let {

services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationDao.kt

@@ -1,5 +1,6 @@
 package xyz.flipchat.services.internal.db
 
+import androidx.paging.PagingSource
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
@@ -54,22 +55,19 @@ interface ConversationDao {
 
     @Query(
         """
-            SELECT * FROM (
-                SELECT * 
-                FROM messages 
-                WHERE conversationIdBase58 = :id AND type IN (1, 8)
-                ORDER BY dateMillis DESC 
-                LIMIT 1
-            ) 
-            UNION ALL 
-            SELECT * FROM (
-                SELECT * 
-                FROM messages 
-                WHERE conversationIdBase58 = :id
-                ORDER BY dateMillis DESC 
-                LIMIT 1
-            ) 
-            LIMIT 1
+        WITH prioritized_messages AS (
+            SELECT *, 
+                   CASE 
+                       WHEN type IN (1, 8) THEN 1
+                       ELSE 2
+                   END AS priority
+            FROM messages
+            WHERE conversationIdBase58 = :id
+        )
+        SELECT *
+        FROM prioritized_messages
+        ORDER BY priority, dateMillis DESC
+        LIMIT 1;
         """
     )
     suspend fun getLatestMessage(id: String): ConversationMessage?

services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/RoomController.kt

@@ -9,6 +9,7 @@ import androidx.paging.PagingConfig
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
 import androidx.paging.RemoteMediator
+import androidx.room.paging.util.ThreadSafeInvalidationObserver
 import androidx.room.withTransaction
 import com.getcode.model.ID
 import com.getcode.model.KinAmount
@@ -197,7 +198,7 @@ class RoomController @Inject constructor(
     }
 
     private val pagingConfig =
-        PagingConfig(pageSize = 25, initialLoadSize = 25, prefetchDistance = 10) // TODO: decrease once this pager stops auto paging
+        PagingConfig(pageSize = 25, initialLoadSize = 25, prefetchDistance = 10)
 
     @OptIn(ExperimentalPagingApi::class)
     fun messages(conversationId: ID): Pager<Int, ConversationMessageWithMemberAndContentAndReplyAndTips> =
@@ -342,21 +343,20 @@ private class MessagingPagingSource(
     private val userId: () -> ID?,
     private val db: FcAppDatabase
 ) : PagingSource<Int, ConversationMessageWithMemberAndContentAndReplyAndTips>() {
-//
-//    @SuppressLint("RestrictedApi")
-//    private val observer =
-//        ThreadSafeInvalidationObserver(arrayOf("conversations", "messages", "members")) {
-//            println("ROOM -- PagingSource invalidated")
-//            invalidate()
-//        }
+
+    @SuppressLint("RestrictedApi")
+    private val observer =
+        ThreadSafeInvalidationObserver(arrayOf("conversations", "messages", "members")) {
+            invalidate()
+        }
 
     override fun getRefreshKey(state: PagingState<Int, ConversationMessageWithMemberAndContentAndReplyAndTips>): Int? {
         return null
     }
 
     @SuppressLint("RestrictedApi")
     override suspend fun load(params: LoadParams<Int>): LoadResult<Int, ConversationMessageWithMemberAndContentAndReplyAndTips> {
-//        observer.registerIfNecessary(db)
+        observer.registerIfNecessary(db)
         val currentPage = params.key ?: 0
         val pageSize = params.loadSize
         val offset = currentPage * pageSize

services/flipchat/sdk/src/main/kotlin/xyz/flipchat/controllers/ChatsController.kt

@@ -8,6 +8,7 @@ import androidx.paging.PagingConfig
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
 import androidx.paging.RemoteMediator
+import androidx.room.paging.util.ThreadSafeInvalidationObserver
 import androidx.room.withTransaction
 import com.getcode.model.ID
 import com.getcode.model.chat.MessageContent
@@ -352,6 +353,12 @@ private class ChatsPagingSource(
     private val db: FcAppDatabase
 ) : PagingSource<Int, ConversationWithMembersAndLastMessage>() {
 
+    @SuppressLint("RestrictedApi")
+    private val observer =
+        ThreadSafeInvalidationObserver(arrayOf("conversations", "messages", "members")) {
+            invalidate()
+        }
+
     override fun getRefreshKey(state: PagingState<Int, ConversationWithMembersAndLastMessage>): Int? {
         return state.anchorPosition?.let { anchorPosition ->
             val anchorPage = state.closestPageToPosition(anchorPosition)
@@ -361,6 +368,7 @@ private class ChatsPagingSource(
 
     @SuppressLint("RestrictedApi")
     override suspend fun load(params: LoadParams<Int>): LoadResult<Int, ConversationWithMembersAndLastMessage> {
+        observer.registerIfNecessary(db)
         val currentPage = params.key ?: 0
         val pageSize = params.loadSize
         val offset = currentPage * pageSize

ui/components/src/main/kotlin/com/getcode/ui/components/chat/messagecontents/DateWithStatus.kt

@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
@@ -46,7 +47,7 @@ internal fun DateWithStatus(
 ) {
     Row(
         modifier = modifier,
-        horizontalArrangement = Arrangement.spacedBy(DateWithStatusDefaults.Spacing),
+        horizontalArrangement = Arrangement.spacedBy(DateWithStatusDefaults.Spacing, Alignment.End),
     ) {
         if (showTimestamp) {
             Text(

ui/components/src/main/kotlin/com/getcode/ui/components/chat/messagecontents/MessageReplyContent.kt

@@ -118,13 +118,33 @@ internal fun MessageNodeScope.MessageReplyContent(
                 // Determine the final width based on the longer of the two components
                 val finalWidth = maxOf(messageContentPlaceable.width, replyPreviewPlaceable.width)
 
+                // Remeasure MessageContent with the updated width
+                val remeasuredMessageContentPlaceable = subcompose("MessageContentRemeasured") {
+                    MessageContent(
+                        maxWidth = finalWidth,
+                        minWidth = finalWidth,
+                        message = content,
+                        date = date,
+                        status = status,
+                        isFromSelf = isFromSelf,
+                        isFromBlockedMember = isFromBlockedMember,
+                        options = options,
+                        tips = tips,
+                        openTipModal = showTips,
+                        onLongPress = showControls,
+                        onDoubleClick = showTipSelection,
+                    )
+                }.first().measure(
+                    constraints.copy(minWidth = finalWidth, maxWidth = finalWidth)
+                )
+
                 // Calculate the total height
-                val totalHeight = replyPreviewPlaceable.height + spacing + messageContentPlaceable.height
+                val totalHeight = replyPreviewPlaceable.height + spacing + remeasuredMessageContentPlaceable.height
 
                 // Layout the components
                 layout(finalWidth, totalHeight) {
                     replyPreviewPlaceable.place(0, 0)
-                    messageContentPlaceable.place(0, replyPreviewPlaceable.height + spacing)
+                    remeasuredMessageContentPlaceable.place(0, replyPreviewPlaceable.height + spacing)
                 }
             }
         }

ui/components/src/main/kotlin/com/getcode/ui/components/chat/messagecontents/MessageTextContent.kt

@@ -65,6 +65,7 @@ import com.getcode.ui.components.chat.utils.MessageTip
 import com.getcode.ui.components.text.markup.Markup
 import com.getcode.ui.components.text.markup.MarkupTextHelper
 import com.getcode.ui.utils.addIf
+import com.getcode.ui.utils.debugBounds
 import com.getcode.ui.utils.rememberedLongClickable
 import kotlinx.datetime.Instant
 
@@ -266,7 +267,7 @@ internal fun MessageContent(
     when (alignmentRule) {
         AlignmentRule.Column -> {
             Column(
-                modifier = modifier,
+                modifier = modifier.width(IntrinsicSize.Max),
                 verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x1)
             ) {
                 MarkupTextHandler(
@@ -278,13 +279,16 @@ internal fun MessageContent(
                 )
 
                 Row(
-                    modifier = Modifier.width(IntrinsicSize.Max),
+                    modifier = Modifier.fillMaxWidth(),
                     horizontalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2)
                 ) {
-                    Tips(tips) { openTipModal() }
+                    if (tips.isNotEmpty()) {
+                        Tips(tips) { openTipModal() }
+                    }
                     Spacer(Modifier.weight(1f))
                     DateWithStatus(
                         modifier = Modifier
+                            .weight(1f)
                             .align(Alignment.Bottom)
                             .pointerInput(Unit) {
                                 detectTapGestures(
@@ -307,7 +311,7 @@ internal fun MessageContent(
 
         AlignmentRule.ParagraphLastLine -> {
             Column(
-                modifier = modifier.padding(CodeTheme.dimens.grid.x1)
+                modifier = modifier.padding(CodeTheme.dimens.grid.x1),
             ) {
                 MarkupTextHandler(
                     text = annotatedMessage,
@@ -337,7 +341,7 @@ internal fun MessageContent(
 
         AlignmentRule.SingleLineEnd -> {
             Row(
-                modifier = modifier,
+                modifier = modifier.width(IntrinsicSize.Max),
                 horizontalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x1)
             ) {
                 MarkupTextHandler(
@@ -347,6 +351,7 @@ internal fun MessageContent(
                     isFromBlockedMember = isFromBlockedMember,
                     onDoubleClick = onDoubleClick,
                 )
+                Spacer(Modifier.weight(1f))
                 DateWithStatus(
                     modifier = Modifier
                         .padding(top = CodeTheme.dimens.grid.x1 + 2.dp)