chore(fc): only store custom room titles; derive titles when needed

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

Author: bmc08gt

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

@@ -2,7 +2,6 @@ package xyz.flipchat.app.features.chat.conversation
 
 import android.content.ClipData
 import android.content.ClipboardManager
-import android.provider.CalendarContract.EventDays
 import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.foundation.text.input.clearText
 import androidx.compose.runtime.snapshotFlow
@@ -163,6 +162,7 @@ class ConversationViewModel @Inject constructor(
             Event
 
         data class OnInitialUnreadCountDetermined(val count: Int) : Event
+        data class OnTitlesChanged(val title: String, val roomCardTitle: String): Event
         data class OnUserActivity(val activity: Instant) : Event
         data object SendCash : Event
         data object SendMessage : Event
@@ -321,6 +321,18 @@ class ConversationViewModel @Inject constructor(
             }
             .launchIn(viewModelScope)
 
+        eventFlow
+            .filterIsInstance<Event.OnConversationChanged>()
+            .map { it.conversationWithPointers.conversation }
+            .distinctUntilChanged()
+            .map {
+                val title = it.titleOrFallback(resources, includePrefix = true)
+                val roomCardTitle = it.titleOrFallback(resources, includePrefix = false)
+                title to roomCardTitle
+            }.distinctUntilChanged()
+            .onEach { dispatchEvent(Event.OnTitlesChanged(it.first, it.second)) }
+            .launchIn(viewModelScope)
+
         eventFlow
             .filterIsInstance<Event.MarkRead>()
             .onEach { delay(300) }
@@ -637,10 +649,7 @@ class ConversationViewModel @Inject constructor(
                             val roomInfo = RoomInfoArgs(
                                 roomId = room.id,
                                 roomNumber = room.roomNumber,
-                                roomTitle = room.titleOrFallback(
-                                    resources,
-                                    includeRoomPrefix = false
-                                ),
+                                roomTitle = room.titleOrFallback(resources),
                                 memberCount = members.count(),
                                 ownerId = room.ownerId,
                                 hostName = moderator?.identity?.displayName,
@@ -1105,21 +1114,23 @@ class ConversationViewModel @Inject constructor(
 
                 is Event.OnInitialUnreadCountDetermined -> { state -> state.copy(unreadCount = event.count) }
 
+                is Event.OnTitlesChanged -> { state ->
+                    state.copy(
+                        title = event.title,
+                        roomInfoArgs = state.roomInfoArgs.copy(
+                            roomTitle = event.roomCardTitle
+                        )
+                    )
+                }
+
                 is Event.OnConversationChanged -> { state ->
                     val (conversation, _, _) = event.conversationWithPointers
                     val members = event.conversationWithPointers.members
                     val host = members.firstOrNull { it.isHost }
 
-//                    val cardTitle = if (conversation.title.startsWith("Room")) {
-//                        "#${conversation.roomNumber}"
-//                    } else {
-//                        conversation.title
-//                    }
-
                     state.copy(
                         conversationId = conversation.id,
                         imageUri = conversation.imageUri.orEmpty().takeIf { it.isNotEmpty() },
-                        title = conversation.title,
                         pointers = event.conversationWithPointers.pointers,
                         lastReadMessage = state.lastReadMessage
                             ?: findLastReadMessage(event.conversationWithPointers.pointers),
@@ -1135,7 +1146,6 @@ class ConversationViewModel @Inject constructor(
                         roomInfoArgs = RoomInfoArgs(
                             roomId = conversation.id,
                             roomNumber = conversation.roomNumber,
-                            roomTitle = conversation.title,
                             ownerId = conversation.ownerId,
                             hostName = host?.memberName,
                             memberCount = members.count(),

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/info/ChatInfoViewModel.kt

@@ -23,6 +23,7 @@ import xyz.flipchat.app.beta.Labs
 import xyz.flipchat.chat.RoomController
 import xyz.flipchat.app.data.RoomInfo
 import xyz.flipchat.app.util.IntentUtils
+import xyz.flipchat.services.extensions.titleOrFallback
 import xyz.flipchat.services.user.UserManager
 import javax.inject.Inject
 
@@ -79,9 +80,9 @@ class ChatInfoViewModel @Inject constructor(
             .mapNotNull { it.args.roomId }
             .flatMapLatest { roomController.observeConversation(it) }
             .mapNotNull { it }
-            .map { Triple(it.conversation.title, it.members.count(), it.conversation.coverCharge) }
-            .onEach { (name, members, cover) ->
-                dispatchEvent(Event.OnNameChanged(name))
+            .map { Triple(it.conversation, it.members.count(), it.conversation.coverCharge) }
+            .onEach { (conversation, members, cover) ->
+                dispatchEvent(Event.OnNameChanged(conversation.titleOrFallback(resources)))
                 dispatchEvent(Event.OnMembersUpdated(members))
                 dispatchEvent(Event.OnCoverChanged(cover))
             }.launchIn(viewModelScope)

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

@@ -3,6 +3,7 @@ package xyz.flipchat.app.features.chat.list
 import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
+import androidx.paging.map
 import com.getcode.manager.TopBarManager
 import com.getcode.model.ID
 import com.getcode.model.KinAmount
@@ -25,7 +26,6 @@ import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.take
 import xyz.flipchat.app.R
-import xyz.flipchat.app.features.chat.conversation.ConversationViewModel.Event
 import xyz.flipchat.app.features.login.register.onError
 import xyz.flipchat.controllers.ChatsController
 import xyz.flipchat.controllers.ProfileController
@@ -35,6 +35,7 @@ import xyz.flipchat.services.data.StartGroupChatPaymentMetadata
 import xyz.flipchat.services.data.erased
 import xyz.flipchat.services.data.typeUrl
 import xyz.flipchat.services.domain.model.chat.ConversationWithMembersAndLastMessage
+import xyz.flipchat.services.extensions.titleOrFallback
 import xyz.flipchat.services.user.AuthState
 import xyz.flipchat.services.user.UserManager
 import javax.inject.Inject
@@ -63,7 +64,7 @@ class ChatListViewModel @Inject constructor(
 
     sealed interface Event {
         data class OnSelfIdChanged(val id: ID?) : Event
-        data class OnLoggedInStateChanged(val loggedIn: Boolean): Event
+        data class OnLoggedInStateChanged(val loggedIn: Boolean) : Event
         data class ShowFullScreenSpinner(
             val showScrim: Boolean = true,
             val showSpinner: Boolean = true
@@ -224,6 +225,17 @@ class ChatListViewModel @Inject constructor(
                 } else {
                     flowOf(PagingData.empty())
                 }
+            }.map { page ->
+                page.map {
+                    it.copy(
+                        conversation = it.conversation.copy(
+                            title = it.conversation.titleOrFallback(
+                                resources = resources,
+                                includePrefix = true
+                            )
+                        )
+                    )
+                }
             }
             .cachedIn(viewModelScope)
 

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/lookup/LookupRoomViewModel.kt

@@ -120,7 +120,7 @@ class LookupRoomViewModel @Inject constructor(
 
                         val confirmJoinArgs = RoomInfoArgs(
                             roomId = it.room.id,
-                            roomTitle = it.room.titleOrFallback(resources, includeRoomPrefix = false),
+                            roomTitle = it.room.titleOrFallback(resources),
                             roomNumber = it.room.roomNumber,
                             memberCount = it.members.count(),
                             ownerId = it.room.ownerId,

flipchatApp/src/main/kotlin/xyz/flipchat/app/util/Router.kt

@@ -116,10 +116,7 @@ class RouterImpl(
                             val args = RoomInfoArgs(
                                 roomId = room.id,
                                 roomNumber = room.roomNumber,
-                                roomTitle = room.titleOrFallback(
-                                    resources,
-                                    includeRoomPrefix = false
-                                ),
+                                roomTitle = room.titleOrFallback(resources,),
                                 memberCount = members.count(),
                                 ownerId = room.ownerId,
                                 hostName = moderator?.identity?.displayName,

services/code/src/main/java/com/getcode/model/extensions/ChatMessage.kt

@@ -29,6 +29,7 @@ fun ChatMessage.decryptingUsing(keyPair: Ed25519.KeyPair): ChatMessage {
                 is MessageContent.Reaction -> it
                 is MessageContent.Reply -> it
                 is MessageContent.DeletedMessage -> it
+                is MessageContent.Unknown -> it
             }
         }
     )

services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/mapper/RoomConversationMapper.kt

@@ -8,14 +8,12 @@ import com.getcode.util.resources.ResourceHelper
 import com.getcode.utils.base58
 import javax.inject.Inject
 
-class RoomConversationMapper @Inject constructor(
-    private val resources: ResourceHelper,
-) : Mapper<Room, Conversation> {
+class RoomConversationMapper @Inject constructor() : Mapper<Room, Conversation> {
     override fun map(from: Room): Conversation {
         return Conversation(
             idBase58 = from.id.base58,
             ownerIdBase58 = from.ownerId.base58,
-            title = from.titleOrFallback(resources),
+            title = from.title.orEmpty(),
             imageUri = from.imageData,
             unreadCount = from.unreadCount,
             hasMoreUnread = from.hasMoreUnread,

services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/extensions/Conversation.kt

@@ -2,27 +2,42 @@ package xyz.flipchat.services.extensions
 
 import com.getcode.util.resources.ResourceHelper
 import xyz.flipchat.services.chat.R
+import xyz.flipchat.services.data.Room
 import xyz.flipchat.services.domain.model.chat.Conversation
 
-fun Conversation.titleOrFallback(resources: ResourceHelper): String {
-    if (title.startsWith("Room")) {
-        return title
-    }
-
-    if (title.startsWith("#")) {
-        return title
+fun Conversation.titleOrFallback(resources: ResourceHelper, includePrefix: Boolean = false): String {
+    return if (title.isEmpty()) {
+        if (includePrefix) {
+            resources.getString(
+                R.string.title_implicitRoomTitle,
+                roomNumber
+            )
+        } else {
+            resources.getString(
+                R.string.title_implicitRoomTitleWithoutPrefix,
+                roomNumber
+            )
+        }
+    } else {
+        resources.getString(
+            R.string.title_explicitRoomTitle,
+            roomNumber,
+            title
+        )
     }
+}
 
-    return if (title.isEmpty()) {
+fun Room.titleOrFallback(resources: ResourceHelper): String {
+    return if (title == null) {
         resources.getString(
-            R.string.title_implicitRoomTitle,
+            R.string.title_implicitRoomTitleWithoutPrefix,
             roomNumber
         )
     } else {
         resources.getString(
             R.string.title_explicitRoomTitle,
             roomNumber,
-            title
+            title!!
         )
     }
 }

services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/extensions/Room.kt

@@ -221,8 +221,7 @@ class RoomController @Inject constructor(
             .onSuccess {
                 val conversation = db.conversationDao().findConversation(conversationId)?.conversation?.copy(title = displayName)
                 if (conversation != null) {
-                    val title = conversation.titleOrFallback(resources)
-                    db.conversationDao().setDisplayName(conversationId, title)
+                    db.conversationDao().setDisplayName(conversationId, displayName)
                 }
             }
     }