chore(fc): add message content modeling for reactions and replies

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

Author: bmc08gt

libs/models/src/main/kotlin/com/getcode/model/chat/MessageContent.kt

@@ -2,6 +2,7 @@ package com.getcode.model.chat
 
 import com.getcode.model.EncryptedData
 import com.getcode.model.GenericAmount
+import com.getcode.model.ID
 import com.getcode.utils.base64
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
@@ -209,6 +210,74 @@ sealed interface MessageContent {
         override val content: String = data
     }
 
+    @Serializable
+    data class Reaction(
+        val emoji: String,
+        val originalMessageId: ID,
+        override val isFromSelf: Boolean,
+    ) : MessageContent {
+        override val kind: Int = 7
+
+        override fun hashCode(): Int {
+            var result = emoji.hashCode()
+            result += originalMessageId.hashCode()
+            result += isFromSelf.hashCode()
+            result += kind.hashCode()
+
+            return result
+        }
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (javaClass != other?.javaClass) return false
+
+            other as Reaction
+
+            if (emoji != other.emoji) return false
+            if (originalMessageId != other.originalMessageId) return false
+            if (isFromSelf != other.isFromSelf) return false
+            if (kind != other.kind) return false
+
+            return true
+        }
+
+        override val content: String = emoji
+    }
+
+    @Serializable
+    data class Reply(
+        val text: String,
+        val originalMessageId: ID,
+        override val isFromSelf: Boolean,
+    ) : MessageContent {
+        override val kind: Int = 8
+
+        override fun hashCode(): Int {
+            var result = text.hashCode()
+            result += originalMessageId.hashCode()
+            result += isFromSelf.hashCode()
+            result += kind.hashCode()
+
+            return result
+        }
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (javaClass != other?.javaClass) return false
+
+            other as Reaction
+
+            if (text != other.emoji) return false
+            if (originalMessageId != other.originalMessageId) return false
+            if (isFromSelf != other.isFromSelf) return false
+            if (kind != other.kind) return false
+
+            return true
+        }
+
+        override val content: String = text
+    }
+
     companion object {
         fun fromData(type: Int, content: String, isFromSelf: Boolean): MessageContent {
             return when (type) {
@@ -218,6 +287,8 @@ sealed interface MessageContent {
                 3 -> Json.decodeFromString(content)
                 4 -> Announcement(content, isFromSelf)
                 6 -> Decrypted(content, isFromSelf)
+                7 -> Json.decodeFromString(content)
+                8 -> Json.decodeFromString(content)
                 else -> throw IllegalArgumentException()
             }
         }

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

@@ -26,7 +26,8 @@ fun ChatMessage.decryptingUsing(keyPair: Ed25519.KeyPair): ChatMessage {
                     }
                 }
 
-
+                is MessageContent.Reaction -> it
+                is MessageContent.Reply -> it
             }
         }
     )

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

@@ -37,7 +37,7 @@ interface ConversationMessageDao {
 
     LEFT JOIN members ON messages.senderIdBase58 = members.memberIdBase58 
                        AND messages.conversationIdBase58 = members.conversationIdBase58
-    WHERE messages.conversationIdBase58 = :id
+    WHERE messages.conversationIdBase58 = :id AND type IN (1, 4)
     ORDER BY messages.dateMillis DESC
     LIMIT :limit OFFSET :offset
 """)

services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/protomapping/MessageContent.kt

@@ -15,63 +15,23 @@ operator fun MessageContent.Companion.invoke(
             value = proto.localizedAnnouncement.keyOrText
         )
 
-//        Model.Content.TypeCase.EXCHANGE_DATA -> {
-//            val verb = com.getcode.model.chat.Verb(proto.exchangeData.verb)
-//            when (proto.exchangeData.exchangeDataCase) {
-//                ChatService.ExchangeDataContent.ExchangeDataCase.EXACT -> {
-//                    val exact = proto.exchangeData.exact
-//                    val currency =
-//                        com.getcode.model.CurrencyCode.tryValueOf(exact.currency) ?: return null
-//                    val kinAmount = KinAmount.newInstance(
-//                        kin = Kin.fromQuarks(exact.quarks),
-//                        rate = Rate(
-//                            fx = exact.exchangeRate,
-//                            currency = currency
-//                        )
-//                    )
-//
-//
-//                    val reference = com.getcode.model.chat.Reference(proto.exchangeData)
-//                    MessageContent.Exchange(
-//                        isFromSelf = isFromSelf,
-//                        amount = GenericAmount.Exact(kinAmount),
-//                        verb = verb,
-//                        reference = reference,
-//                        hasInteracted = false,
-//                    )
-//                }
-//
-//                ChatService.ExchangeDataContent.ExchangeDataCase.PARTIAL -> {
-//                    val partial = proto.exchangeData.partial
-//                    val currency =
-//                        com.getcode.model.CurrencyCode.tryValueOf(partial.currency) ?: return null
-//
-//                    val fiat = Fiat(
-//                        currency = currency,
-//                        amount = partial.nativeAmount
-//                    )
-//
-//                    val reference = com.getcode.model.chat.Reference(proto.exchangeData)
-//
-//                    MessageContent.Exchange(
-//                        isFromSelf = isFromSelf,
-//                        amount = GenericAmount.Partial(fiat),
-//                        verb = verb,
-//                        reference = reference,
-//                        hasInteracted = false
-//                    )
-//                }
-//
-//                ChatService.ExchangeDataContent.ExchangeDataCase.EXCHANGEDATA_NOT_SET -> return null
-//                else -> return null
-//            }
-//        }
-
         Model.Content.TypeCase.TEXT -> MessageContent.RawText(
             isFromSelf = isFromSelf,
             value = proto.text.text
         )
 
+        Model.Content.TypeCase.REACTION -> MessageContent.Reaction(
+            emoji = proto.reaction.emoji,
+            originalMessageId = proto.reaction.originalMessageId.value.toList(),
+            isFromSelf = isFromSelf
+        )
+
+        Model.Content.TypeCase.REPLY -> MessageContent.Reply(
+            text = proto.reply.replyText,
+            originalMessageId = proto.reply.originalMessageId.value.toList(),
+            isFromSelf = isFromSelf
+        )
+
         Model.Content.TypeCase.TYPE_NOT_SET -> return null
         else -> return null
     }

services/flipchat/payments/src/main/kotlin/com/getcode/model/extensions/ChatMessage.kt

@@ -5,7 +5,6 @@ import androidx.compose.animation.core.exponentialDecay
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.animation.rememberSplineBasedDecay
 import androidx.compose.animation.scaleIn
 import androidx.compose.animation.scaleOut
 import androidx.compose.foundation.ExperimentalFoundationApi
@@ -15,7 +14,6 @@ import androidx.compose.foundation.gestures.AnchoredDraggableState
 import androidx.compose.foundation.gestures.DraggableAnchors
 import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.gestures.anchoredDraggable
-import androidx.compose.foundation.gestures.animateTo
 import androidx.compose.foundation.gestures.snapTo
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -46,7 +44,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.CompositingStrategy
@@ -394,6 +391,9 @@ fun MessageNode(
                                     text = contents.localizedText
                                 )
                             }
+
+                            is MessageContent.Reaction -> Unit
+                            is MessageContent.Reply -> Unit
                         }
                     }
                 }

ui/components/src/main/kotlin/com/getcode/ui/components/chat/MessageNode.kt

@@ -109,6 +109,9 @@ fun MessageContent.localizedText(
 
             resources.getString(resId, "some username")
         }
+
+        is MessageContent.Reaction -> content.emoji
+        is MessageContent.Reply -> content.text
     }
 }
 
@@ -187,6 +190,9 @@ val MessageContent.localizedText: String
             is MessageContent.RawText -> content.value
             is MessageContent.Announcement -> { content.value
             }
+
+            is MessageContent.Reaction -> content.emoji
+            is MessageContent.Reply -> content.text
         }
     }