chore(fc): parse sender out of notification payloads; update routing for room by id or number

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

Author: bmc08gt

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

@@ -78,7 +78,7 @@ import xyz.flipchat.app.features.home.TabbedHomeScreen
 @Parcelize
 data class ConversationScreen(
     val chatId: ID? = null,
-    val intentId: ID? = null
+    val roomNumber: Long? = null
 ) : AppScreen(), Parcelable {
     @IgnoredOnParcel
     override val key: ScreenKey = uniqueScreenKey
@@ -100,6 +100,14 @@ data class ConversationScreen(
             }
         }
 
+        LaunchedEffect(chatId) {
+            if (chatId != null) {
+                vm.dispatchEvent(
+                    ConversationViewModel.Event.OnChatIdChanged(chatId)
+                )
+            }
+        }
+
         LaunchedEffect(vm) {
             vm.eventFlow
                 .filterIsInstance<ConversationViewModel.Event.NeedsAccountCreated>()

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

@@ -152,6 +152,7 @@ class ConversationViewModel @Inject constructor(
     sealed interface Event {
         data class OnSelfChanged(val id: ID?, val displayName: String?) : Event
         data class OnChatIdChanged(val chatId: ID?) : Event
+        data class OnRoomNumberChanged(val roomNumber: Long): Event
         data class OnConversationChanged(val conversationWithPointers: ConversationWithMembersAndLastPointers) :
             Event
 
@@ -1077,6 +1078,7 @@ class ConversationViewModel @Inject constructor(
                     state.copy(isSelfTyping = false)
                 }
 
+                is Event.OnRoomNumberChanged,
                 is Event.OnJoinRoom,
                 is Event.OnAccountCreated,
                 is Event.NeedsAccountCreated,

flipchatApp/src/main/kotlin/xyz/flipchat/app/notifications/NotificationHelper.kt

@@ -31,8 +31,8 @@ internal fun NotificationManagerCompat.buildChatNotification(
     content: String,
     canReply: Boolean,
 ): Pair<Int, NotificationCompat.Builder> {
-    val sender = content.substringBefore(":")
-    val messageBody = content.substringAfter(":")
+    val sender = content.substringBefore(":").trim().ifEmpty { type.sender } ?: "Sender"
+    val messageBody = content.substringAfter(":").trim()
     val person = Person.Builder()
         .setName(sender)
         .build()
@@ -137,7 +137,7 @@ internal fun NotificationManagerCompat.getActiveNotification(notificationId: Int
 internal fun Context.buildContentIntent(type: FcNotificationType): PendingIntent {
     val launchIntent = when (type) {
         is FcNotificationType.ChatMessage -> Intent(Intent.ACTION_VIEW).apply {
-            data = Uri.parse("https://app.flipchat.xyz/room?r=${type.id?.base58}")
+            data = Uri.parse("https://app.flipchat.xyz/room/${type.id?.base58}")
         }
 
         FcNotificationType.Unknown -> Intent(this, MainActivity::class.java).apply {

flipchatApp/src/main/kotlin/xyz/flipchat/app/ui/navigation/AppScreenContent.kt

@@ -86,7 +86,7 @@ fun AppScreenContent(content: @Composable () -> Unit) {
         register<NavScreenProvider.Room.Messages> {
             ConversationScreen(
                 chatId = it.chatId,
-                intentId = it.intentId,
+                roomNumber = it.roomNumber,
             )
         }
 

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

@@ -34,7 +34,8 @@ enum class FcTab {
 
 sealed interface DeeplinkType {
     data class Login(val entropy: String) : DeeplinkType
-    data class OpenRoom(val roomId: ID) : DeeplinkType
+    data class OpenRoomById(val roomId: ID) : DeeplinkType
+    data class OpenRoomByNumber(val number: Long) : DeeplinkType
 }
 
 class RouterImpl(
@@ -90,9 +91,14 @@ class RouterImpl(
             val type = processType(deeplink) ?: return emptyList()
             when (type) {
                 is DeeplinkType.Login -> listOf(ScreenRegistry.get(NavScreenProvider.AppHomeScreen(deeplink)))
-                is DeeplinkType.OpenRoom ->  listOf(
+                is DeeplinkType.OpenRoomById ->  listOf(
                     ScreenRegistry.get(NavScreenProvider.AppHomeScreen()),
-                    ScreenRegistry.get(NavScreenProvider.Room.Messages(type.roomId))
+                    ScreenRegistry.get(NavScreenProvider.Room.Messages(chatId = type.roomId))
+                )
+
+                is DeeplinkType.OpenRoomByNumber -> listOf(
+                    ScreenRegistry.get(NavScreenProvider.AppHomeScreen()),
+                    ScreenRegistry.get(NavScreenProvider.Room.Messages(roomNumber = type.number))
                 )
             }
         } ?: emptyList()
@@ -123,7 +129,20 @@ class RouterImpl(
                                 deeplink.data.toUri().getQueryParameter("r")
                             }.getOrNull() ?: return null
                             val roomId =  Base58.decode(id).toList()
-                            DeeplinkType.OpenRoom(roomId = roomId)
+                            DeeplinkType.OpenRoomById(roomId = roomId)
+                        }
+
+                        else -> null
+                    }
+                }
+
+                2 -> {
+                    when {
+                        room.contains(deeplink.pathSegments[0]) -> {
+                            val number = runCatching {
+                                deeplink.pathSegments[1].toLongOrNull()
+                            }.getOrNull() ?: return null
+                            DeeplinkType.OpenRoomByNumber(number = number)
                         }
 
                         else -> null

services/flipchat/sdk/src/main/kotlin/xyz/flipchat/notifications/FcNotification.kt

@@ -25,7 +25,7 @@ sealed interface FcNotificationType {
         override val name: String = "Misc"
     }
 
-    data class ChatMessage(val id: ID?): FcNotificationType, Notifiable {
+    data class ChatMessage(val id: ID?, val sender: String?): FcNotificationType, Notifiable {
         override val ordinal: Int = 1
         override val name: String = "Chat Messages"
     }
@@ -35,6 +35,8 @@ sealed interface FcNotificationType {
     companion object {
         private const val TYPE = "type"
         private const val CHAT_ID = "chat_id"
+        private const val SENDER = "sender"
+
         fun resolve(value: MutableMap<String, String>): FcNotificationType {
             val type = value[TYPE]
             var notificationType = runCatching { TypeValue.valueOf(type.orEmpty()) }.getOrNull()
@@ -46,7 +48,8 @@ sealed interface FcNotificationType {
             return when (notificationType) {
                 TypeValue.ChatMessage -> {
                     val chatId = value[CHAT_ID]?.decodeBase64()?.toList()
-                    ChatMessage(chatId)
+                    val sender = value[SENDER]
+                    ChatMessage(chatId, sender)
                 }
                 else -> Unknown
             }

ui/navigation/src/main/kotlin/com/getcode/navigation/NavScreenProvider.kt

@@ -38,7 +38,7 @@ sealed class NavScreenProvider : ScreenProvider {
 
         data class Messages(
             val chatId: ID? = null,
-            val intentId: ID? = null
+            val roomNumber: Long? = null,
         ) : NavScreenProvider()
 
         data class Info(