Merge pull request #1802 from vector-im/feature/bma/emoteHtml

bmarty · web-flow · commit 1df3f6113adb · 2023-11-14T14:58:31.000+01:00
Fix rendering of emote when the message contains some formatting.
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt
@@ -61,7 +61,7 @@ class TimelineItemContentMessageFactory @Inject constructor(
         return when (val messageType = content.type) {
             is EmoteMessageType -> TimelineItemEmoteContent(
                 body = "* $senderDisplayName ${messageType.body}",
-                htmlDocument = messageType.formatted?.toHtmlDocument(prefix = "* senderDisplayName"),
+                htmlDocument = messageType.formatted?.toHtmlDocument(prefix = "* $senderDisplayName"),
                 isEdited = content.isEdited,
             )
             is ImageMessageType -> {

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class TimelineItemContentMessageFactory @Inject constructor(`
`61`	`61`	`return when (val messageType = content.type) {`
`62`	`62`	`is EmoteMessageType -> TimelineItemEmoteContent(`
`63`	`63`	`body = "* $senderDisplayName ${messageType.body}",`
`64`		`- htmlDocument = messageType.formatted?.toHtmlDocument(prefix = "* senderDisplayName"),`
	`64`	`+ htmlDocument = messageType.formatted?.toHtmlDocument(prefix = "* $senderDisplayName"),`
`65`	`65`	`isEdited = content.isEdited,`
`66`	`66`	`)`
`67`	`67`	`is ImageMessageType -> {`