From c5c7f8e9da5fa933e9a0e7aaf9518e4c974d0c41 Mon Sep 17 00:00:00 2001
From: Infi <infi@infi.sh>
Date: Sun, 1 Dec 2024 15:32:39 +0100
Subject: [PATCH] fix: include format in rqr cbor

Signed-off-by: Infi <infi@infi.sh>
---
 app/src/main/java/chat/revolt/api/internals/UserQR.kt        | 3 ++-
 app/src/main/java/chat/revolt/components/profile/UserCard.kt | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/chat/revolt/api/internals/UserQR.kt b/app/src/main/java/chat/revolt/api/internals/UserQR.kt
index 312dcb00..58b4c14e 100644
--- a/app/src/main/java/chat/revolt/api/internals/UserQR.kt
+++ b/app/src/main/java/chat/revolt/api/internals/UserQR.kt
@@ -9,7 +9,7 @@ import kotlin.io.encoding.ExperimentalEncodingApi
 
 @Serializable
 data class UserQRContents(
-    val format: String = "rqr\$user\$0",
+    val format: String,
     val avatar: String,
     val displayName: String,
     val username: String,
@@ -24,6 +24,7 @@ object UserQR {
             RevoltCbor.encodeToByteArray(
                 UserQRContents.serializer(),
                 UserQRContents(
+                    format = "rqr\$user\$0",
                     avatar = user.avatar?.id
                         ?: "01JDZRBY95P8AY4CFVX16FFVWS", // Sentinel value for missing avatar
                     displayName = user.displayName
diff --git a/app/src/main/java/chat/revolt/components/profile/UserCard.kt b/app/src/main/java/chat/revolt/components/profile/UserCard.kt
index 795fd36b..fae8a8b0 100644
--- a/app/src/main/java/chat/revolt/components/profile/UserCard.kt
+++ b/app/src/main/java/chat/revolt/components/profile/UserCard.kt
@@ -46,7 +46,6 @@ import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontVariation
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.rememberTextMeasurer
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.constraintlayout.compose.ConstraintLayout
@@ -77,8 +76,6 @@ fun UserCard(
 ) {
     val context = LocalContext.current
 
-    val textMeasurer = rememberTextMeasurer()
-
     var palette by remember { mutableStateOf<Palette?>(null) }
     LaunchedEffect(user) {
         val avatarUrl = ResourceLocations.userAvatarUrl(user)
@@ -196,7 +193,7 @@ fun UserCard(
                         ?: Color(0xFFFF005C), shape = MaterialTheme.shapes.medium)
                     .padding(16.dp)
             ) {
-                val (heading, nameLabel, name, usernameLabel, username, tagLabel, tag, joinDateLabel, joinDate, qrLabel, qr, photoLabel, photo, url) = createRefs()
+                val (heading, nameLabel, name, usernameLabel, username, joinDateLabel, joinDate, qrLabel, qr, photoLabel, photo, url) = createRefs()
 
                 Image(
                     painter = painterResource(R.drawable.usercard_heading),