From 35b7b661f2f3f8415bc2b049b321c9972ba7fca9 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 5 Oct 2023 15:28:38 +0200 Subject: [PATCH] Code review: improve API. --- .../factories/event/TimelineItemContentMessageFactory.kt | 2 +- .../features/messages/impl/timeline/util/toHtmlDocument.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 index 98853f01cd..8e6561543c 100644 --- 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 @@ -52,7 +52,7 @@ class TimelineItemContentMessageFactory @Inject constructor( return when (val messageType = content.type ?: UnknownMessageType) { is EmoteMessageType -> TimelineItemEmoteContent( body = "* $senderDisplayName ${messageType.body}", - htmlDocument = messageType.formatted?.toHtmlDocument(senderDisplayName), + htmlDocument = messageType.formatted?.toHtmlDocument(prefix = "* senderDisplayName"), isEdited = content.isEdited, ) is ImageMessageType -> { diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/util/toHtmlDocument.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/util/toHtmlDocument.kt index 02a7af4a5a..a38b631eb2 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/util/toHtmlDocument.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/util/toHtmlDocument.kt @@ -21,10 +21,10 @@ import io.element.android.libraries.matrix.api.timeline.item.event.MessageFormat import org.jsoup.Jsoup import org.jsoup.nodes.Document -fun FormattedBody.toHtmlDocument(senderDisplayNamePrefix: String? = null): Document? { +fun FormattedBody.toHtmlDocument(prefix: String? = null): Document? { return takeIf { it.format == MessageFormat.HTML }?.body?.let { formattedBody -> - if (senderDisplayNamePrefix != null) { - Jsoup.parse("* $senderDisplayNamePrefix $formattedBody") + if (prefix != null) { + Jsoup.parse("$prefix $formattedBody") } else { Jsoup.parse(formattedBody) }