chore(fc): improve performance loading chats; tweak deleted message body styling

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

Author: bmc08gt

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

@@ -57,6 +57,7 @@ import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
+import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import timber.log.Timber
 import xyz.flipchat.app.R
@@ -78,6 +79,7 @@ import xyz.flipchat.services.domain.model.chat.ConversationMember
 import xyz.flipchat.services.domain.model.chat.ConversationMessage
 import xyz.flipchat.services.domain.model.chat.ConversationWithMembersAndLastPointers
 import xyz.flipchat.services.extensions.titleOrFallback
+import xyz.flipchat.services.internal.data.mapper.nullIfEmpty
 import xyz.flipchat.services.user.AuthState
 import xyz.flipchat.services.user.UserManager
 import java.util.UUID
@@ -818,67 +820,63 @@ class ConversationViewModel @Inject constructor(
         .filterNotNull()
         .distinctUntilChanged()
         .flatMapLatest { roomController.messages(it).flow }
+        .distinctUntilChanged()
         .map { page ->
             val currentState = stateFlow.value // Cache state upfront
             val pointerRefs = currentState.pointerRefs // cache expensive pointer ref map upfront
             val enableReply =
                 currentState.replyEnabled && currentState.chattableState is ChattableState.Enabled
 
             page.map { indice ->
-                val (message, member, contents) = indice
+                val (message, member, contents, reply, tipInfo) = indice
 
                 val status = findClosestMessageStatus(
                     timestamp = message.id.uuid?.timestamp,
                     statusMap = pointerRefs,
                     fallback = if (contents.isFromSelf) MessageStatus.Sent else MessageStatus.Unknown
                 )
 
-                val anchor = if (contents is MessageContent.Reply) {
-                    val originalMessage = roomController.getMessage(contents.originalMessageId)
-                    originalMessage?.let { container ->
-                        ReplyMessageAnchor(
-                            id = contents.originalMessageId,
-                            message = container.content,
-                            isDeleted = container.message.isDeleted,
-                            deletedBy = container.message.deletedBy?.let { id ->
-                                Deleter(
-                                    id = id,
-                                    isSelf = userManager.isSelf(id),
-                                    isHost = currentState.hostId == message.deletedBy
-                                )
-                            },
-                            sender = Sender(
-                                id = container.message.senderId,
-                                profileImage = container.member?.imageUri.takeIf {
-                                    it.orEmpty().isNotEmpty()
-                                },
-                                displayName = container.member?.memberName ?: "Deleted",
-                                isSelf = container.content.isFromSelf,
-                                isBlocked = container.member?.isBlocked == true,
-                                isHost = container.message.senderId == currentState.hostId && !contents.isFromSelf,
+                val anchor = if (reply != null) {
+                    ReplyMessageAnchor(
+                        id = reply.message.id,
+                        message = reply.content,
+                        isDeleted = reply.message.isDeleted,
+                        deletedBy = reply.message.deletedBy?.let { id ->
+                            Deleter(
+                                id = id,
+                                isSelf = userManager.isSelf(id),
+                                isHost = currentState.hostId == message.deletedBy
                             )
+                        },
+                        sender = Sender(
+                            id = reply.message.senderId,
+                            profileImage = reply.member?.imageUri.takeIf {
+                                it.orEmpty().isNotEmpty()
+                            },
+                            displayName = reply.member?.memberName ?: "Deleted",
+                            isSelf = reply.content.isFromSelf,
+                            isBlocked = reply.member?.isBlocked == true,
+                            isHost = reply.message.senderId == currentState.hostId && !contents.isFromSelf,
                         )
-                    }
+                    )
                 } else {
                     null
                 }
 
                 val tippingEnabled =
                     currentState.isTippingEnabled && !userManager.isSelf(message.senderId)
 
-                val tips = if (currentState.isTippingEnabled) {
-                    roomController.getTipsForMessage(message.id).map { tip ->
-                        val amount = KinAmount.fromQuarks(tip.amountInQuarks)
-                        val tipper = roomController.getMemberForId(tip.tipperId)
+                val tips = if (currentState.isTippingEnabled && tipInfo.isNotEmpty()) {
+                    tipInfo.map { (amount, member) ->
                         MessageTip(
                             amount = amount,
                             tipper = Sender(
-                                id = tip.tipperId,
-                                profileImage = tipper?.imageUri,
-                                displayName = tipper?.memberName,
-                                isHost = tipper?.isHost ?: false,
-                                isSelf = userManager.isSelf(tip.tipperId),
-                                isBlocked = tipper?.isBlocked ?: false,
+                                id = member?.id,
+                                profileImage = member?.imageUri.nullIfEmpty(),
+                                displayName = member?.memberName,
+                                isHost = member?.isHost ?: false,
+                                isSelf = userManager.isSelf(member?.id),
+                                isBlocked = member?.isBlocked ?: false,
                             )
                         )
                     }
@@ -911,7 +909,7 @@ class ConversationViewModel @Inject constructor(
                         profileImage = member?.imageUri.takeIf { it.orEmpty().isNotEmpty() },
                         displayName = member?.memberName ?: "Deleted",
                         isSelf = contents.isFromSelf,
-                        isHost = message.senderId == currentState.hostId && !contents.isFromSelf,
+                        isHost = member?.isHost ?: false,
                         isBlocked = member?.isBlocked == true,
                     ),
                     originalMessage = anchor,

services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/ConversationMessage.kt

@@ -8,7 +8,9 @@ import androidx.room.Index
 import androidx.room.PrimaryKey
 import androidx.room.Relation
 import com.getcode.model.ID
+import com.getcode.model.KinAmount
 import com.getcode.model.chat.MessageContent
+import com.getcode.model.chat.Sender
 import com.getcode.vendor.Base58
 import kotlinx.serialization.Serializable
 
@@ -63,8 +65,33 @@ data class ConversationMessageWithMember(
     val member: ConversationMember?
 )
 
+data class ConversationMessageWithMemberAndReplyAndTips(
+    @Embedded val message: ConversationMessage,
+    @Relation(
+        parentColumn = "senderIdBase58",
+        entityColumn = "memberIdBase58",
+        entity = ConversationMember::class,
+    )
+    val member: ConversationMember?,
+    val reply: ConversationMessageWithMemberAndContent?,
+    val tips: List<MessageTipInfo>
+)
+
 data class ConversationMessageWithMemberAndContent(
     @Embedded val message: ConversationMessage,
     val member: ConversationMember?,
     val content: MessageContent
+)
+
+data class ConversationMessageWithMemberAndContentAndReplyAndTips(
+    val message: ConversationMessage,
+    val member: ConversationMember?,
+    val content: MessageContent,
+    val reply: ConversationMessageWithMemberAndContent?,
+    val tips: List<MessageTipInfo>
+)
+
+data class MessageTipInfo(
+    val kinAmount: KinAmount,
+    val tipper: ConversationMember?
 )

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

@@ -1,17 +1,22 @@
 package xyz.flipchat.services.internal.db
 
+import androidx.paging.PagingSource
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.RewriteQueriesToDropUnusedColumns
 import androidx.room.Transaction
 import com.getcode.model.ID
+import com.getcode.model.KinAmount
 import com.getcode.model.chat.MessageContent
 import com.getcode.utils.base58
+import xyz.flipchat.services.domain.model.chat.ConversationMember
 import xyz.flipchat.services.domain.model.chat.ConversationMessage
 import xyz.flipchat.services.domain.model.chat.ConversationMessageWithMember
 import xyz.flipchat.services.domain.model.chat.ConversationMessageWithMemberAndContent
+import xyz.flipchat.services.domain.model.chat.ConversationMessageWithMemberAndReplyAndTips
+import xyz.flipchat.services.domain.model.chat.MessageTipInfo
 
 @Dao
 interface ConversationMessageDao {
@@ -36,7 +41,12 @@ interface ConversationMessageDao {
         messages.deletedByBase58 AS deletedByBase58,
         messages.content AS content,
         members.memberIdBase58 AS memberIdBase58,
-        members.memberName AS memberName
+        members.memberName AS memberName,
+        members.isHost AS isHost,
+        members.imageUri AS imageUri,
+        members.isBlocked AS isBlocked,
+        members.isFullMember AS isFullMember,
+        members.isMuted AS isMuted
     FROM messages
 
     LEFT JOIN members ON messages.senderIdBase58 = members.memberIdBase58 
@@ -50,6 +60,39 @@ interface ConversationMessageDao {
         return getPagedMessages(id.base58, limit, offset)
     }
 
+    @Query("SELECT * FROM members WHERE memberIdBase58 = :memberId")
+    suspend fun getMemberInternal(memberId: String): ConversationMember?
+    suspend fun getMemberInternal(memberId: ID): ConversationMember? {
+        return getMemberInternal(memberId.base58)
+    }
+
+    suspend fun getPagedMessagesWithRepliesAndTips(id: ID, limit: Int, offset: Int, selfId: ID?): List<ConversationMessageWithMemberAndReplyAndTips> {
+        val messages = getPagedMessages(id.base58, limit, offset)
+
+        return messages.map {
+            val content = MessageContent.fromData(it.message.type, it.message.content, isFromSelf = false)
+            val replyMessage = if (content is MessageContent.Reply) {
+                getMessageWithContentById(content.originalMessageId, selfId)
+            } else {
+                null
+            }
+
+            val tips = getTips(it.message.id, selfId).map { (_, tipperId, amountInQuarks) ->
+                MessageTipInfo(
+                    kinAmount = KinAmount.fromQuarks(amountInQuarks),
+                    tipper = getMemberInternal(tipperId)
+                )
+            }
+
+            ConversationMessageWithMemberAndReplyAndTips(
+                message = it.message,
+                member = it.member,
+                reply = replyMessage,
+                tips = tips
+            )
+        }
+    }
+
     @Query("SELECT COUNT(*) FROM messages WHERE conversationIdBase58 = :conversationId")
     suspend fun getTotalMessageCountFor(conversationId: String): Int
     suspend fun getTotalMessageCountFor(conversationId: ID): Int {
@@ -140,7 +183,6 @@ interface ConversationMessageDao {
     suspend fun markDeleted(messageId: String, by: String)
 
     suspend fun markDeleted(messageId: ID, by: ID) {
-        println("markdeleted ${messageId.base58} by ${by.base58}")
         markDeleted(messageId.base58, by.base58)
     }