🐛 Fix errors with body annotations (#464)

Traewelldroid · Dec 22, 2024 · be44795 · be44795
1 parent 85e339d
commit be44795
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/kotlin/de/hbch/traewelling/api/models/status/Status.kt b/app/src/main/kotlin/de/hbch/traewelling/api/models/status/Status.kt
@@ -105,7 +105,7 @@ data class Status(
                     val emoji = match.groupValues.getOrElse(1) { "" }
                     val customEmoji = mastodonEmoji.firstOrNull { it.shortcode == emoji }
                     if (customEmoji != null) {
-                        builder.appendInlineContent(customEmoji.shortcode, customEmoji.shortcode)
+                        builder.appendInlineContent(customEmoji.shortcode, ":${customEmoji.shortcode}:")
                         inlineTextContent[customEmoji.shortcode] = InlineTextContent(
                             Placeholder(24.sp, 24.sp, PlaceholderVerticalAlign.TextCenter)
                         ) {

diff --git a/app/src/main/kotlin/de/hbch/traewelling/ui/include/status/CheckInCard.kt b/app/src/main/kotlin/de/hbch/traewelling/ui/include/status/CheckInCard.kt
@@ -389,7 +389,7 @@ fun CheckInCardContent(
                     text = message.first!!,
                     onClick = {
                         val annotations = message.first!!.getStringAnnotations(it - 1, it + 1)
-                        if (annotations.isNotEmpty()) {
+                        if (annotations.isNotEmpty() && annotations.any { annotation -> annotation.tag == "userMention" }) {
                             userSelected(annotations.first().item, false, false)
                         } else {
                             textClicked()
@@ -716,7 +716,7 @@ private fun CheckInCardFooter(
                 contentDescription = null
             )
             Text(
-                text = status.event.name,
+                text = status.event!!.name,
                 style = LocalFont.current.labelMedium
             )
         }