Reply : refactor so we can use ReplyToDetails in Composer and Timeline

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt

@@ -47,21 +47,10 @@ import io.element.android.features.messages.impl.timeline.components.customreact
 import io.element.android.features.messages.impl.timeline.components.reactionsummary.ReactionSummaryPresenter
 import io.element.android.features.messages.impl.timeline.components.receipt.bottomsheet.ReadReceiptBottomSheetPresenter
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
-import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAudioContent
-import io.element.android.features.messages.impl.timeline.model.event.TimelineItemCallNotifyContent
-import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEncryptedContent
-import io.element.android.features.messages.impl.timeline.model.event.TimelineItemFileContent
-import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
-import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLegacyCallInviteContent
-import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemPollContent
-import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStateContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStickerContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextBasedContent
-import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
-import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent
-import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVoiceContent
 import io.element.android.features.messages.impl.typing.TypingNotificationPresenter
 import io.element.android.features.messages.impl.utils.messagesummary.MessageSummaryFormatter
 import io.element.android.features.messages.impl.voicemessages.composer.VoiceMessageComposerPresenter
@@ -80,12 +69,13 @@ import io.element.android.libraries.designsystem.utils.snackbar.collectSnackbarM
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.permalink.PermalinkParser
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.MessageEventType
-import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailInfo
-import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailType
+import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
+import io.element.android.libraries.matrix.ui.messages.reply.map
 import io.element.android.libraries.matrix.ui.room.canCall
 import io.element.android.libraries.matrix.ui.room.canRedactOtherAsState
 import io.element.android.libraries.matrix.ui.room.canRedactOwnAsState
@@ -98,6 +88,7 @@ import kotlinx.coroutines.withContext
 import timber.log.Timber
 
 class MessagesPresenter @AssistedInject constructor(
+    @Assisted private val navigator: MessagesNavigator,
     private val room: MatrixRoom,
     private val composerPresenter: MessageComposerPresenter,
     private val voiceMessageComposerPresenter: VoiceMessageComposerPresenter,
@@ -109,15 +100,15 @@ class MessagesPresenter @AssistedInject constructor(
     private val readReceiptBottomSheetPresenter: ReadReceiptBottomSheetPresenter,
     private val networkMonitor: NetworkMonitor,
     private val snackbarDispatcher: SnackbarDispatcher,
-    private val messageSummaryFormatter: MessageSummaryFormatter,
     private val dispatchers: CoroutineDispatchers,
     private val clipboardHelper: ClipboardHelper,
     private val featureFlagsService: FeatureFlagService,
     private val htmlConverterProvider: HtmlConverterProvider,
-    @Assisted private val navigator: MessagesNavigator,
     private val buildMeta: BuildMeta,
     private val timelineController: TimelineController,
+    private val permalinkParser: PermalinkParser,
 ) : Presenter<MessagesState> {
+
     private val timelinePresenter = timelinePresenterFactory.create(navigator = navigator)
 
     @AssistedFactory
@@ -340,66 +331,20 @@ class MessagesPresenter @AssistedInject constructor(
         }
     }
 
-    private fun handleActionReply(targetEvent: TimelineItem.Event, composerState: MessageComposerState) {
+    private suspend fun handleActionReply(targetEvent: TimelineItem.Event, composerState: MessageComposerState) {
         if (targetEvent.eventId == null) return
-        val textContent = messageSummaryFormatter.format(targetEvent)
-        val attachmentThumbnailInfo = when (targetEvent.content) {
-            is TimelineItemImageContent -> AttachmentThumbnailInfo(
-                thumbnailSource = targetEvent.content.thumbnailSource ?: targetEvent.content.mediaSource,
-                textContent = targetEvent.content.body,
-                type = AttachmentThumbnailType.Image,
-                blurHash = targetEvent.content.blurhash,
-            )
-            is TimelineItemStickerContent -> AttachmentThumbnailInfo(
-                thumbnailSource = targetEvent.content.thumbnailSource ?: targetEvent.content.mediaSource,
-                textContent = targetEvent.content.body,
-                type = AttachmentThumbnailType.Image,
-                blurHash = targetEvent.content.blurhash,
-            )
-            is TimelineItemVideoContent -> AttachmentThumbnailInfo(
-                thumbnailSource = targetEvent.content.thumbnailSource,
-                textContent = targetEvent.content.body,
-                type = AttachmentThumbnailType.Video,
-                blurHash = targetEvent.content.blurHash,
-            )
-            is TimelineItemFileContent -> AttachmentThumbnailInfo(
-                thumbnailSource = targetEvent.content.thumbnailSource,
-                textContent = targetEvent.content.body,
-                type = AttachmentThumbnailType.File,
-            )
-            is TimelineItemAudioContent -> AttachmentThumbnailInfo(
-                textContent = targetEvent.content.body,
-                type = AttachmentThumbnailType.Audio,
-            )
-            is TimelineItemVoiceContent -> AttachmentThumbnailInfo(
-                textContent = textContent,
-                type = AttachmentThumbnailType.Voice,
-            )
-            is TimelineItemLocationContent -> AttachmentThumbnailInfo(
-                type = AttachmentThumbnailType.Location,
-            )
-            is TimelineItemPollContent -> AttachmentThumbnailInfo(
-                textContent = targetEvent.content.question,
-                type = AttachmentThumbnailType.Poll,
-            )
-            is TimelineItemTextBasedContent,
-            is TimelineItemRedactedContent,
-            is TimelineItemStateContent,
-            is TimelineItemEncryptedContent,
-            is TimelineItemLegacyCallInviteContent,
-            is TimelineItemCallNotifyContent,
-            is TimelineItemUnknownContent -> null
+        timelineController.invokeOnCurrentTimeline {
+            loadReplyDetails(targetEvent.eventId)
+                .onSuccess { inReplyTo ->
+                    val composerMode = MessageComposerMode.Reply(
+                        inReplyTo.map(permalinkParser)
+                    )
+                    composerState.eventSink(
+                        MessageComposerEvents.SetMode(composerMode)
+                    )
+                }
+                .onFailure { Timber.e(it) }
         }
-        val composerMode = MessageComposerMode.Reply(
-            isThreaded = targetEvent.isThreaded,
-            senderName = targetEvent.safeSenderName,
-            eventId = targetEvent.eventId,
-            attachmentThumbnailInfo = attachmentThumbnailInfo,
-            defaultContent = textContent,
-        )
-        composerState.eventSink(
-            MessageComposerEvents.SetMode(composerMode)
-        )
     }
 
     private fun handleShowDebugInfoAction(event: TimelineItem.Event) {

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt

@@ -184,9 +184,9 @@ class MessageComposerPresenter @Inject constructor(
             when (val modeValue = messageComposerContext.composerMode) {
                 is MessageComposerMode.Edit ->
                     if (showTextFormatting) {
-                        richTextEditorState.setHtml(modeValue.defaultContent)
+                        richTextEditorState.setHtml(modeValue.content)
                     } else {
-                        markdownTextEditorState.text.update(modeValue.defaultContent, true)
+                        markdownTextEditorState.text.update(modeValue.content, true)
                     }
                 else -> Unit
             }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt

@@ -16,7 +16,6 @@
 
 package io.element.android.features.messages.impl.timeline
 
-import io.element.android.features.messages.impl.timeline.components.aProfileTimelineDetailsReady
 import io.element.android.features.messages.impl.timeline.components.receipt.aReadReceiptData
 import io.element.android.features.messages.impl.timeline.model.NewEventState
 import io.element.android.features.messages.impl.timeline.model.ReadReceiptData
@@ -37,6 +36,7 @@ import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
+import io.element.android.libraries.matrix.ui.messages.reply.aProfileTimelineDetailsReady
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowDisambiguatedPreview.kt

@@ -20,8 +20,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
+import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetailsDisambiguatedProvider
 
 @PreviewsDayNight
 @Composable
@@ -33,18 +33,3 @@ internal fun TimelineItemEventRowDisambiguatedPreview(
         displayNameAmbiguous = true,
     )
 }
-
-class InReplyToDetailsDisambiguatedProvider : InReplyToDetailsProvider() {
-    override val values: Sequence<InReplyToDetails>
-        get() = sequenceOf(
-            aMessageContent(
-                body = "Message which are being replied.",
-                type = TextMessageType("Message which are being replied.", null)
-            ),
-        ).map {
-            aInReplyToDetails(
-                displayNameAmbiguous = true,
-                eventContent = it,
-            )
-        }
-}

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyInformativePreview.kt

@@ -20,9 +20,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.matrix.api.timeline.item.event.RedactedContent
-import io.element.android.libraries.matrix.api.timeline.item.event.UnableToDecryptContent
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
+import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetailsInformativeProvider
 
 @PreviewsDayNight
 @Composable
@@ -31,15 +30,3 @@ internal fun TimelineItemEventRowWithReplyInformativePreview(
 ) = ElementPreview {
     TimelineItemEventRowWithReplyContentToPreview(inReplyToDetails)
 }
-
-class InReplyToDetailsInformativeProvider : InReplyToDetailsProvider() {
-    override val values: Sequence<InReplyToDetails>
-        get() = sequenceOf(
-            RedactedContent,
-            UnableToDecryptContent(UnableToDecryptContent.Data.Unknown),
-        ).map {
-            aInReplyToDetails(
-                eventContent = it,
-            )
-        }
-}

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyOtherPreview.kt

@@ -20,8 +20,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
+import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetailsOtherProvider
 
 @PreviewsDayNight
 @Composable
@@ -30,11 +30,3 @@ internal fun TimelineItemEventRowWithReplyOtherPreview(
 ) = ElementPreview {
     TimelineItemEventRowWithReplyContentToPreview(inReplyToDetails)
 }
-
-class InReplyToDetailsOtherProvider : InReplyToDetailsProvider() {
-    override val values: Sequence<InReplyToDetails>
-        get() = sequenceOf(
-            InReplyToDetails.Loading(eventId = EventId("\$anEventId")),
-            InReplyToDetails.Error(eventId = EventId("\$anEventId"), message = "An error message."),
-        )
-}

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyPreview.kt

@@ -19,7 +19,6 @@ package io.element.android.features.messages.impl.timeline.components
 import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
 import io.element.android.features.messages.impl.timeline.aTimelineItemReactions
 import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition
@@ -27,28 +26,8 @@ import io.element.android.features.messages.impl.timeline.model.event.aTimelineI
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.media.MediaSource
-import io.element.android.libraries.matrix.api.poll.PollKind
-import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageType
-import io.element.android.libraries.matrix.api.timeline.item.event.EmoteMessageType
-import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
-import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
-import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageType
-import io.element.android.libraries.matrix.api.timeline.item.event.LocationMessageType
-import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
-import io.element.android.libraries.matrix.api.timeline.item.event.MessageType
-import io.element.android.libraries.matrix.api.timeline.item.event.NoticeMessageType
-import io.element.android.libraries.matrix.api.timeline.item.event.PollContent
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
-import io.element.android.libraries.matrix.api.timeline.item.event.StickerMessageType
-import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
-import io.element.android.libraries.matrix.api.timeline.item.event.VideoMessageType
-import io.element.android.libraries.matrix.api.timeline.item.event.VoiceMessageType
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.persistentMapOf
+import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetailsProvider
 
 @PreviewsDayNight
 @Composable
@@ -93,100 +72,3 @@ internal fun TimelineItemEventRowWithReplyContentToPreview(
         }
     }
 }
-
-open class InReplyToDetailsProvider : PreviewParameterProvider<InReplyToDetails> {
-    override val values: Sequence<InReplyToDetails>
-        get() = sequenceOf(
-            aMessageContent(
-                body = "Message which are being replied.",
-                type = TextMessageType("Message which are being replied.", null)
-            ),
-            aMessageContent(
-                body = "Message which are being replied, and which was long enough to be displayed on two lines (only!).",
-                type = TextMessageType("Message which are being replied, and which was long enough to be displayed on two lines (only!).", null)
-            ),
-            aMessageContent(
-                body = "Video",
-                type = VideoMessageType("Video", null, null, MediaSource("url"), null),
-            ),
-            aMessageContent(
-                body = "Audio",
-                type = AudioMessageType("Audio", MediaSource("url"), null),
-            ),
-            aMessageContent(
-                body = "Voice",
-                type = VoiceMessageType("Voice", MediaSource("url"), null, null),
-            ),
-            aMessageContent(
-                body = "Image",
-                type = ImageMessageType("Image", null, null, MediaSource("url"), null),
-            ),
-            aMessageContent(
-                body = "Sticker",
-                type = StickerMessageType("Image", MediaSource("url"), null),
-            ),
-            aMessageContent(
-                body = "File",
-                type = FileMessageType("File", MediaSource("url"), null),
-            ),
-            aMessageContent(
-                body = "Location",
-                type = LocationMessageType("Location", "geo:1,2", null),
-            ),
-            aMessageContent(
-                body = "Notice",
-                type = NoticeMessageType("Notice", null),
-            ),
-            aMessageContent(
-                body = "Emote",
-                type = EmoteMessageType("Emote", null),
-            ),
-            PollContent(
-                question = "Poll which are being replied.",
-                kind = PollKind.Disclosed,
-                maxSelections = 1u,
-                answers = persistentListOf(),
-                votes = persistentMapOf(),
-                endTime = null,
-                isEdited = false,
-            ),
-        ).map {
-            aInReplyToDetails(
-                eventContent = it,
-            )
-        }
-
-    protected fun aMessageContent(
-        body: String,
-        type: MessageType,
-    ) = MessageContent(
-        body = body,
-        inReplyTo = null,
-        isEdited = false,
-        isThreaded = false,
-        type = type,
-    )
-
-    protected fun aInReplyToDetails(
-        eventContent: EventContent,
-        displayNameAmbiguous: Boolean = false,
-    ) = InReplyToDetails.Ready(
-        eventId = EventId("\$event"),
-        eventContent = eventContent,
-        senderId = UserId("@Sender:domain"),
-        senderProfile = aProfileTimelineDetailsReady(
-            displayNameAmbiguous = displayNameAmbiguous,
-        ),
-        textContent = (eventContent as? MessageContent)?.body.orEmpty(),
-    )
-}
-
-internal fun aProfileTimelineDetailsReady(
-    displayName: String? = "Sender",
-    displayNameAmbiguous: Boolean = false,
-    avatarUrl: String? = null,
-) = ProfileTimelineDetails.Ready(
-    displayName = displayName,
-    displayNameAmbiguous = displayNameAmbiguous,
-    avatarUrl = avatarUrl,
-)