chore: add missing verified state handling for sorting

bmc08gt · bmc08gt · commit 68e26e755745 · 2025-03-17T16:25:03.000-04:00
Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/libs/models/src/main/kotlin/com/getcode/model/chat/Sender.kt b/libs/models/src/main/kotlin/com/getcode/model/chat/Sender.kt
@@ -75,6 +75,7 @@ data class LinkedSocialProfile(
     val platformType: String,
     val username: String,
     val profileImageUrl: String?,
+    val isVerifiedOnPlatform: Boolean,
     val rawMetadata: String?,
 ) {
     inline fun <reified M> metadata(): M? = runCatching {
diff --git a/libs/models/src/main/kotlin/com/getcode/model/social/user/SocialProfile.kt b/libs/models/src/main/kotlin/com/getcode/model/social/user/SocialProfile.kt
@@ -69,6 +69,7 @@ sealed interface SocialProfile {
                     platformType = "x",
                     username = username,
                     profileImageUrl = profilePicUrl,
+                    isVerifiedOnPlatform = verificationType != X.VerificationType.NONE,
                     rawMetadata = Json.encodeToString(metadata)
                 )
             }
diff --git a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/Conversation.kt b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/Conversation.kt
@@ -119,5 +119,8 @@ data class ConversationWithMembersAndLastMessage(
 
     val messageContentPreview: MessageContent?
         get() = lastMessage?.let { MessageContent.fromData(it.type, it.content, false) }
+
+    @Ignore
+    var pageIndex: Int? = null
 }
 
diff --git a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/profile/MemberSocialProfile.kt b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/profile/MemberSocialProfile.kt
@@ -25,6 +25,7 @@ fun MemberSocialProfile.toLinked(): LinkedSocialProfile? {
                 platformType = platformType,
                 username = username,
                 profileImageUrl = profileImageUrl,
+                isVerifiedOnPlatform = verified,
                 rawMetadata = extraData
             )
         }
diff --git a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationMessageDao.kt b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationMessageDao.kt
@@ -346,8 +346,6 @@ interface ConversationMessageDao {
             tipperIdBase58 = tipContent.tipperId.base58
         )
 
-        incrementTipCount(tipContent.originalMessageId)
-
         addTip(tip)
     }
 
@@ -362,8 +360,6 @@ interface ConversationMessageDao {
             emoji = reactionContent.emoji,
         )
 
-        incrementReactionCount(reactionContent.originalMessageId)
-
         addReaction(reaction)
     }
 
diff --git a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/MemberSocialProfileDao.kt b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/MemberSocialProfileDao.kt
@@ -49,6 +49,7 @@ interface MemberSocialProfileDao {
                         username = profile.username,
                         profileImageUrl = profile.profilePicUrl,
                         platformType = "x",
+                        verified = profile.verificationType != SocialProfile.X.VerificationType.NONE,
                         extraData = Json.encodeToString(metadata)
                     )
                 }
diff --git a/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/RoomController.kt b/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/RoomController.kt
@@ -215,7 +215,11 @@ class RoomController @Inject constructor(
                 userId = { userManager.userId }
             )
         ) {
-            MessagingPagingSource(conversationId, { userManager.userId }, db)
+            MessagingPagingSource(
+                chatId = conversationId,
+                userId = { userManager.userId },
+                db = db,
+            )
         }
 
     fun observeTyping(conversationId: ID) = messagingRepository.observeTyping(conversationId)
diff --git a/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/paging/ChatsPagingSource.kt b/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/paging/ChatsPagingSource.kt
@@ -0,0 +1,51 @@
+package xyz.flipchat.chat.paging
+
+import android.annotation.SuppressLint
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import androidx.room.paging.util.ThreadSafeInvalidationObserver
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import xyz.flipchat.internal.db.FcAppDatabase
+import xyz.flipchat.services.domain.model.chat.ConversationWithMembersAndLastMessage
+
+internal 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? {
+        val anchorPos = state.anchorPosition ?: return null
+        val anchorItem = state.closestItemToPosition(anchorPos) ?: return null
+        // The anchor item *knows* which page it was loaded from:
+        return anchorItem.pageIndex
+    }
+
+    @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
+
+        return withContext(Dispatchers.IO) {
+            try {
+                val conversations = db.conversationDao().getPagedConversations(pageSize, offset)
+                    .map { it.apply { pageIndex = currentPage } }
+
+                val prevKey = null
+                val nextKey = if (conversations.size < pageSize) null else currentPage + 1
+
+
+                LoadResult.Page(conversations, prevKey, nextKey)
+            } catch (e: Exception) {
+                LoadResult.Error(e)
+            }
+        }
+    }
+}
diff --git a/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/paging/ChatsRemoteMediator.kt b/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/paging/ChatsRemoteMediator.kt
@@ -0,0 +1,94 @@
+package xyz.flipchat.chat.paging
+
+import androidx.paging.ExperimentalPagingApi
+import androidx.paging.LoadType
+import androidx.paging.PagingState
+import androidx.paging.RemoteMediator
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import xyz.flipchat.internal.db.FcAppDatabase
+import xyz.flipchat.services.data.Room
+import xyz.flipchat.services.domain.mapper.RoomConversationMapper
+import xyz.flipchat.services.domain.model.chat.ConversationWithMembersAndLastMessage
+import xyz.flipchat.services.domain.model.query.QueryOptions
+import xyz.flipchat.services.internal.network.repository.chat.ChatRepository
+
+@OptIn(ExperimentalPagingApi::class)
+internal class ChatsRemoteMediator(
+    private val repository: ChatRepository,
+    private val conversationMapper: RoomConversationMapper,
+) : RemoteMediator<Int, ConversationWithMembersAndLastMessage>() {
+
+    private val db = FcAppDatabase.requireInstance()
+
+    override suspend fun initialize(): InitializeAction {
+        return InitializeAction.SKIP_INITIAL_REFRESH
+    }
+
+    private var lastResult = listOf<Room>()
+
+    override suspend fun load(
+        loadType: LoadType,
+        state: PagingState<Int, ConversationWithMembersAndLastMessage>
+    ): MediatorResult {
+        return try {
+            val loadKey = when (loadType) {
+                LoadType.REFRESH -> {
+                    null
+                }
+
+                LoadType.PREPEND -> {
+                    return MediatorResult.Success(true)  // Don't load newer messages
+                }
+
+                LoadType.APPEND -> {
+                    // Get the last item from our data
+                    val lastItem = state.lastItemOrNull()
+                        ?: return MediatorResult.Success(
+                            // If we don't have any items, only signal end of pagination
+                            // if we've had a refresh
+                            endOfPaginationReached = state.pages.isNotEmpty()
+                        )
+
+                    lastItem.conversation.id
+                }
+            }
+
+            val limit = state.config.pageSize
+
+            val query = QueryOptions(
+                limit = limit,
+                token = loadKey,
+                descending = true
+            )
+
+            val response = repository.getChats(query)
+            val rooms = response.getOrNull().orEmpty()
+
+            if (rooms.isEmpty() || lastResult.any { it.id == rooms.firstOrNull()?.id.orEmpty() }) {
+                lastResult = emptyList()
+                return MediatorResult.Success(true)
+            }
+
+            lastResult = rooms
+
+            // Map the rooms to your Room entities
+            val conversations = rooms.map { conversationMapper.map(it) }
+
+            // Update the database with the new data (upsert)
+            withContext(Dispatchers.IO) {
+                if (loadType == LoadType.REFRESH) {
+                    // Clear all conversations before loading the fresh data
+                    db.conversationDao().clearConversations()
+                }
+
+                // Insert or update the conversations
+                db.conversationDao().upsertConversations(*conversations.toTypedArray())
+            }
+
+            MediatorResult.Success(endOfPaginationReached = rooms.size < limit)
+        } catch (e: Exception) {
+            MediatorResult.Error(e)
+        }
+    }
+}
diff --git a/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/paging/MessagingPagingSource.kt b/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/paging/MessagingPagingSource.kt
@@ -6,14 +6,15 @@ import androidx.paging.PagingState
 import androidx.room.paging.util.ThreadSafeInvalidationObserver
 import com.getcode.model.ID
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import xyz.flipchat.internal.db.FcAppDatabase
 import xyz.flipchat.services.domain.model.chat.InflatedConversationMessage
 
 internal class MessagingPagingSource(
     private val chatId: ID,
     private val userId: () -> ID?,
-    private val db: FcAppDatabase
+    private val db: FcAppDatabase,
 ) : PagingSource<Int, InflatedConversationMessage>() {
 
     @SuppressLint("RestrictedApi")
@@ -38,15 +39,15 @@ internal class MessagingPagingSource(
 
         return withContext(Dispatchers.Default) {
             try {
-                val messages =
-                    db.conversationMessageDao()
+                val messages = db.conversationMessageDao()
                         .getPagedMessagesWithDetails(chatId, pageSize, offset, userId())
+                        .map { it.copy(pageIndex = currentPage) }
 
                 val prevKey = if (currentPage > 0 && messages.isNotEmpty()) currentPage - 1 else null
                 val nextKey = if (messages.size < pageSize) null else currentPage + 1
 
                 LoadResult.Page(
-                    data = messages.map { if (prevKey == null) it.copy(pageIndex = currentPage) else it },
+                    data = messages,
                     prevKey = prevKey,
                     nextKey = nextKey,
                 )
diff --git a/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/controllers/ChatsController.kt b/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/controllers/ChatsController.kt

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ sealed interface SocialProfile {`
`69`	`69`	`platformType = "x",`
`70`	`70`	`username = username,`
`71`	`71`	`profileImageUrl = profilePicUrl,`
	`72`	`+ isVerifiedOnPlatform = verificationType != X.VerificationType.NONE,`
`72`	`73`	`rawMetadata = Json.encodeToString(metadata)`
`73`	`74`	`)`
`74`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,5 +119,8 @@ data class ConversationWithMembersAndLastMessage(`
`119`	`119`
`120`	`120`	`val messageContentPreview: MessageContent?`
`121`	`121`	`get() = lastMessage?.let { MessageContent.fromData(it.type, it.content, false) }`
	`122`	`+`
	`123`	`+ @Ignore`
	`124`	`+ var pageIndex: Int? = null`
`122`	`125`	`}`
`123`	`126`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ fun MemberSocialProfile.toLinked(): LinkedSocialProfile? {`
`25`	`25`	`platformType = platformType,`
`26`	`26`	`username = username,`
`27`	`27`	`profileImageUrl = profileImageUrl,`
	`28`	`+ isVerifiedOnPlatform = verified,`
`28`	`29`	`rawMetadata = extraData`
`29`	`30`	`)`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -346,8 +346,6 @@ interface ConversationMessageDao {`
`346`	`346`	`tipperIdBase58 = tipContent.tipperId.base58`
`347`	`347`	`)`
`348`	`348`
`349`		`- incrementTipCount(tipContent.originalMessageId)`
`350`		`-`
`351`	`349`	`addTip(tip)`
`352`	`350`	`}`
`353`	`351`
`@@ -362,8 +360,6 @@ interface ConversationMessageDao {`
`362`	`360`	`emoji = reactionContent.emoji,`
`363`	`361`	`)`
`364`	`362`
`365`		`- incrementReactionCount(reactionContent.originalMessageId)`
`366`		`-`
`367`	`363`	`addReaction(reaction)`
`368`	`364`	`}`
`369`	`365`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ interface MemberSocialProfileDao {`
`49`	`49`	`username = profile.username,`
`50`	`50`	`profileImageUrl = profile.profilePicUrl,`
`51`	`51`	`platformType = "x",`
	`52`	`+ verified = profile.verificationType != SocialProfile.X.VerificationType.NONE,`
`52`	`53`	`extraData = Json.encodeToString(metadata)`
`53`	`54`	`)`
`54`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,11 @@ class RoomController @Inject constructor(`
`215`	`215`	`userId = { userManager.userId }`
`216`	`216`	`)`
`217`	`217`	`) {`
`218`		`- MessagingPagingSource(conversationId, { userManager.userId }, db)`
	`218`	`+ MessagingPagingSource(`
	`219`	`+ chatId = conversationId,`
	`220`	`+ userId = { userManager.userId },`
	`221`	`+ db = db,`
	`222`	`+ )`
`219`	`223`	`}`
`220`	`224`
`221`	`225`	`fun observeTyping(conversationId: ID) = messagingRepository.observeTyping(conversationId)`