Add intentional mentions (#1843)

* Add intentional mentions

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

@@ -47,6 +47,7 @@ import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.core.ProgressCallback
 import io.element.android.libraries.matrix.api.permalink.PermalinkBuilder
 import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.Mention
 import io.element.android.libraries.matrix.api.user.CurrentSessionIdHolder
 import io.element.android.libraries.mediapickers.api.PickerProvider
 import io.element.android.libraries.mediaupload.api.MediaSender
@@ -327,15 +328,25 @@ class MessageComposerPresenter @Inject constructor(
         richTextEditorState: RichTextEditorState,
     ) = launch {
         val capturedMode = messageComposerContext.composerMode
+        val mentions = richTextEditorState.mentionsState?.let { state ->
+            buildList {
+                if (state.hasAtRoomMention) {
+                    add(Mention.AtRoom)
+                }
+                for (userId in state.userIds) {
+                    add(Mention.User(userId))
+                }
+            }
+        }.orEmpty()
         // Reset composer right away
         richTextEditorState.setHtml("")
         updateComposerMode(MessageComposerMode.Normal)
         when (capturedMode) {
-            is MessageComposerMode.Normal -> room.sendMessage(body = message.markdown, htmlBody = message.html)
+            is MessageComposerMode.Normal -> room.sendMessage(body = message.markdown, htmlBody = message.html, mentions = mentions)
             is MessageComposerMode.Edit -> {
                 val eventId = capturedMode.eventId
                 val transactionId = capturedMode.transactionId
-                room.editMessage(eventId, transactionId, message.markdown, message.html)
+                room.editMessage(eventId, transactionId, message.markdown, message.html, mentions)
             }
 
             is MessageComposerMode.Quote -> TODO()
@@ -343,6 +354,7 @@ class MessageComposerPresenter @Inject constructor(
                 capturedMode.eventId,
                 message.markdown,
                 message.html,
+                mentions
             )
         }
         analyticsService.capture(

features/messages/impl/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt

@@ -26,12 +26,12 @@ import app.cash.turbine.ReceiveTurbine
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.Composer
+import io.element.android.features.messages.impl.mentions.MentionSuggestion
 import io.element.android.features.messages.impl.messagecomposer.AttachmentsState
 import io.element.android.features.messages.impl.messagecomposer.MessageComposerContextImpl
 import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvents
 import io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenter
 import io.element.android.features.messages.impl.messagecomposer.MessageComposerState
-import io.element.android.features.messages.impl.mentions.MentionSuggestion
 import io.element.android.features.messages.media.FakeLocalMediaFactory
 import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
@@ -44,6 +44,7 @@ import io.element.android.libraries.matrix.api.media.ImageInfo
 import io.element.android.libraries.matrix.api.media.VideoInfo
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.Mention
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.api.user.CurrentSessionIdHolder
 import io.element.android.libraries.matrix.test.ANOTHER_MESSAGE
@@ -79,10 +80,12 @@ import io.element.android.tests.testutils.waitForPredicate
 import io.mockk.mockk
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import okhttp3.internal.immutableListOf
 import org.junit.Rule
 import org.junit.Test
+import uniffi.wysiwyg_composer.MentionsState
 import java.io.File
 
 @Suppress("LargeClass")
@@ -835,6 +838,67 @@ class MessageComposerPresenterTest {
         }
     }
 
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun `present - send messages with intentional mentions`() = runTest {
+        val room = FakeMatrixRoom()
+        val presenter = createPresenter(room = room, coroutineScope = this)
+        moleculeFlow(RecompositionMode.Immediate) {
+            presenter.present()
+        }.test {
+            skipItems(1)
+            val initialState = awaitItem()
+
+            // Check intentional mentions on message sent
+            val mentionUser1 = listOf(A_USER_ID.value)
+            initialState.richTextEditorState.mentionsState = MentionsState(
+                userIds = mentionUser1,
+                roomIds = emptyList(),
+                roomAliases = emptyList(),
+                hasAtRoomMention = false
+            )
+            initialState.richTextEditorState.setHtml(A_MESSAGE)
+            initialState.eventSink(MessageComposerEvents.SendMessage(A_MESSAGE.toMessage()))
+
+            advanceUntilIdle()
+
+            assertThat(room.sendMessageMentions).isEqualTo(listOf(Mention.User(A_USER_ID.value)))
+
+            // Check intentional mentions on reply sent
+            initialState.eventSink(MessageComposerEvents.SetMode(aReplyMode()))
+            val mentionUser2 = listOf(A_USER_ID_2.value)
+            awaitItem().richTextEditorState.mentionsState = MentionsState(
+                userIds = mentionUser2,
+                roomIds = emptyList(),
+                roomAliases = emptyList(),
+                hasAtRoomMention = false
+            )
+
+            initialState.eventSink(MessageComposerEvents.SendMessage(A_MESSAGE.toMessage()))
+            advanceUntilIdle()
+
+            assertThat(room.sendMessageMentions).isEqualTo(listOf(Mention.User(A_USER_ID_2.value)))
+
+            // Check intentional mentions on edit message
+            skipItems(1)
+            initialState.eventSink(MessageComposerEvents.SetMode(anEditMode()))
+            val mentionUser3 = listOf(A_USER_ID_3.value)
+            awaitItem().richTextEditorState.mentionsState = MentionsState(
+                userIds = mentionUser3,
+                roomIds = emptyList(),
+                roomAliases = emptyList(),
+                hasAtRoomMention = false
+            )
+
+            initialState.eventSink(MessageComposerEvents.SendMessage(A_MESSAGE.toMessage()))
+            advanceUntilIdle()
+
+            assertThat(room.sendMessageMentions).isEqualTo(listOf(Mention.User(A_USER_ID_3.value)))
+
+            skipItems(1)
+        }
+    }
+
     private suspend fun ReceiveTurbine<MessageComposerState>.backToNormalMode(state: MessageComposerState, skipCount: Int = 0): MessageComposerState {
         state.eventSink.invoke(MessageComposerEvents.CloseSpecialMode)
         skipItems(skipCount)