meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor: replace user with node in Message model

Browse source
This commit is contained in:
andrekir 2024-12-05 19:50:15 -03:00
parent 746f155a99
commit 4a1319a645
7 changed files with 52 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/com/geeksville/mesh/database/entity/Packet.kt
View file

@ -33,18 +33,18 @@ data class PacketEntity(
@Relation(entity = ReactionEntity::class, parentColumn = "packet_id", entityColumn = "reply_id")
val reactions: List<ReactionEntity> = emptyList(),
) {
suspend fun toMessage(getUser: suspend (userId: String?) -> User) = with(packet) {
suspend fun toMessage(getNode: suspend (userId: String?) -> NodeEntity) = with(packet) {
Message(
uuid = uuid,
receivedTime = received_time,
user = getUser(data.from),
node = getNode(data.from),
text = data.text.orEmpty(),
time = getShortDateTime(data.time),
read = read,
status = data.status,
routingError = routingError,
packetId = packetId,
emojis = reactions.toReaction(getUser),
emojis = reactions.toReaction(getNode),
)
}
}
@ -101,14 +101,14 @@ data class ReactionEntity(
)
private suspend fun ReactionEntity.toReaction(
getUser: suspend (userId: String?) -> User
getNode: suspend (userId: String?) -> NodeEntity
) = Reaction(
replyId = replyId,
user = getUser(userId),
user = getNode(userId).user,
emoji = emoji,
timestamp = timestamp,
)
private suspend fun List<ReactionEntity>.toReaction(
getUser: suspend (userId: String?) -> User
) = this.map { it.toReaction(getUser) }
getNode: suspend (userId: String?) -> NodeEntity
) = this.map { it.toReaction(getNode) }