Fix room state events not actionable on tap

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

@@ -10,6 +10,7 @@ package io.element.android.features.messages.impl
 
 import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
 import io.element.android.libraries.matrix.api.user.MatrixUser
 
@@ -18,6 +19,7 @@ sealed interface MessagesEvent {
     data class ToggleReaction(val emoji: String, val eventOrTransactionId: EventOrTransactionId) : MessagesEvent
     data class InviteDialogDismissed(val action: InviteDialogAction) : MessagesEvent
     data class OnUserClicked(val user: MatrixUser) : MessagesEvent
+    data class OnMemberClicked(val userId: UserId) : MessagesEvent
     data object MarkAsFullyReadAndExit : MessagesEvent
 }
 

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

@@ -279,6 +279,10 @@ class MessagesNode(
                     }
                 },
                 onUserDataClick = callback::navigateToRoomMemberDetails,
+                onMemberClick = { userId ->
+                    state.eventSink(MessagesEvent.OnMemberClicked(userId))
+                },
+                onRoomStateClick = callback::navigateToRoomDetails,
                 onLinkClick = { url, customTab ->
                     onLinkClick(
                         activity = activity,

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

@@ -79,7 +79,9 @@ import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
 import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
+import io.element.android.libraries.matrix.api.room.roomMembers
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
+import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.messages.reply.map
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.matrix.ui.room.getDirectRoomMember
@@ -262,6 +264,14 @@ class MessagesPresenter(
                 is MessagesEvent.OnUserClicked -> {
                     roomMemberModerationState.eventSink(RoomMemberModerationEvents.ShowActionsForUser(event.user))
                 }
+                is MessagesEvent.OnMemberClicked -> {
+                    val userId = event.userId
+                    val member = membersState.roomMembers()?.firstOrNull { it.userId == userId }
+                    val matrixUser = member?.let {
+                        MatrixUser(userId = it.userId, displayName = it.displayName, avatarUrl = it.avatarUrl)
+                    } ?: MatrixUser(userId = userId)
+                    roomMemberModerationState.eventSink(RoomMemberModerationEvents.ShowActionsForUser(matrixUser))
+                }
                 is MessagesEvent.MarkAsFullyReadAndExit -> if (!markingAsReadAndExiting.getAndSet(true)) {
                     coroutineScope.launch {
                         val latestEventId = room.liveTimeline.getLatestEventId().getOrElse {

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

@@ -135,6 +135,8 @@ fun MessagesView(
     onRoomDetailsClick: () -> Unit,
     onEventContentClick: (isLive: Boolean, event: TimelineItem.Event) -> Boolean,
     onUserDataClick: (UserId) -> Unit,
+    @Suppress("UNUSED_PARAMETER") onMemberClick: (UserId) -> Unit,
+    onRoomStateClick: () -> Unit,
     onLinkClick: (String, Boolean) -> Unit,
     onSendLocationClick: () -> Unit,
     onCreatePollClick: () -> Unit,
@@ -284,6 +286,12 @@ fun MessagesView(
                             forceJumpToBottomVisibility = forceJumpToBottomVisibility,
                             onJoinCallClick = onJoinCallClick,
                             onViewAllPinnedMessagesClick = onViewAllPinnedMessagesClick,
+                            onMemberClick = { userId ->
+                                hidingKeyboard {
+                                    state.eventSink(MessagesEvent.OnMemberClicked(userId))
+                                }
+                            },
+                            onRoomStateClick = onRoomStateClick,
                             knockRequestsBannerView = knockRequestsBannerView,
                         )
 
@@ -464,6 +472,8 @@ private fun MessagesViewContent(
     onViewAllPinnedMessagesClick: () -> Unit,
     forceJumpToBottomVisibility: Boolean,
     onSwipeToReply: (TimelineItem.Event) -> Unit,
+    onMemberClick: (UserId) -> Unit,
+    onRoomStateClick: () -> Unit,
     modifier: Modifier = Modifier,
     knockRequestsBannerView: @Composable () -> Unit,
 ) {
@@ -518,6 +528,8 @@ private fun MessagesViewContent(
                 onReadReceiptClick = onReadReceiptClick,
                 forceJumpToBottomVisibility = forceJumpToBottomVisibility,
                 onJoinCallClick = onJoinCallClick,
+                onMemberClick = onMemberClick,
+                onRoomStateClick = onRoomStateClick,
                 nestedScrollConnection = scrollBehavior.nestedScrollConnection,
                 floatingDateTopOffset = pinnedBannerHeightDp,
             )
@@ -630,6 +642,8 @@ internal fun MessagesViewPreview(@PreviewParameter(MessagesStateProvider::class)
         onRoomDetailsClick = {},
         onEventContentClick = { _, _ -> false },
         onUserDataClick = {},
+        onMemberClick = {},
+        onRoomStateClick = {},
         onLinkClick = { _, _ -> },
         onSendLocationClick = {},
         onCreatePollClick = {},
@@ -685,6 +699,8 @@ internal fun MessagesViewA11yPreview() = ElementPreview {
         onRoomDetailsClick = {},
         onEventContentClick = { _, _ -> false },
         onUserDataClick = {},
+        onMemberClick = {},
+        onRoomStateClick = {},
         onLinkClick = { _, _ -> },
         onSendLocationClick = {},
         onCreatePollClick = {},

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/MessagesViewWithIdentityChangePreview.kt

@@ -43,5 +43,7 @@ internal fun MessagesViewWithIdentityChangePreview(
         onViewAllPinnedMessagesClick = {},
         knockRequestsBannerView = {},
         onThreadsListClick = {},
+        onMemberClick = {},
+        onRoomStateClick = {},
     )
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListNode.kt

@@ -115,6 +115,7 @@ class PinnedMessagesListNode(
                 onBackClick = ::navigateUp,
                 onEventClick = callback::handleEventClick,
                 onUserDataClick = { callback.navigateToRoomMemberDetails(it.userId) },
+                onMemberClick = {},
                 onLinkClick = { link -> onLinkClick(context, link.url) },
                 onLinkLongClick = {
                     view.performHapticFeedback(

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListView.kt

@@ -48,6 +48,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -61,6 +62,7 @@ fun PinnedMessagesListView(
     onBackClick: () -> Unit,
     onEventClick: (event: TimelineItem.Event) -> Unit,
     onUserDataClick: (MatrixUser) -> Unit,
+    onMemberClick: (UserId) -> Unit,
     onLinkClick: (Link) -> Unit,
     onLinkLongClick: (Link) -> Unit,
     modifier: Modifier = Modifier,
@@ -82,6 +84,7 @@ fun PinnedMessagesListView(
                 state = state,
                 onEventClick = onEventClick,
                 onUserDataClick = onUserDataClick,
+                onMemberClick = onMemberClick,
                 onLinkClick = onLinkClick,
                 onLinkLongClick = onLinkLongClick,
                 onErrorDismiss = onBackClick,
@@ -112,6 +115,7 @@ private fun PinnedMessagesListContent(
     state: PinnedMessagesListState,
     onEventClick: (event: TimelineItem.Event) -> Unit,
     onUserDataClick: (MatrixUser) -> Unit,
+    onMemberClick: (UserId) -> Unit,
     onLinkClick: (Link) -> Unit,
     onLinkLongClick: (Link) -> Unit,
     onErrorDismiss: () -> Unit,
@@ -134,6 +138,7 @@ private fun PinnedMessagesListContent(
                 onUserDataClick = onUserDataClick,
                 onLinkClick = onLinkClick,
                 onLinkLongClick = onLinkLongClick,
+                onMemberClick = onMemberClick,
             )
             PinnedMessagesListState.Loading -> {
                 Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
@@ -172,6 +177,7 @@ private fun PinnedMessagesListLoaded(
     onUserDataClick: (MatrixUser) -> Unit,
     onLinkClick: (Link) -> Unit,
     onLinkLongClick: (Link) -> Unit,
+    onMemberClick: (UserId) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     fun onActionSelected(timelineItemAction: TimelineItemAction, event: TimelineItem.Event) {
@@ -236,6 +242,8 @@ private fun PinnedMessagesListLoaded(
                 onReadReceiptClick = {},
                 onSwipeToReply = {},
                 onJoinCallClick = {},
+                onMemberClick = onMemberClick,
+                onRoomStateClick = {},
                 eventSink = { timelineItemEvent ->
                     when (timelineItemEvent) {
                         is TimelineEvent.OpenThread -> state.eventSink(PinnedMessagesListEvent.OpenThread(timelineItemEvent.threadRootEventId))
@@ -307,6 +315,7 @@ internal fun PinnedMessagesListViewPreview(@PreviewParameter(PinnedMessagesListS
             onBackClick = {},
             onEventClick = { },
             onUserDataClick = {},
+            onMemberClick = {},
             onLinkClick = {},
             onLinkLongClick = {},
         )

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

@@ -72,6 +72,7 @@ import io.element.android.libraries.designsystem.theme.components.FloatingAction
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.utils.animateScrollToItemCenter
 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.timeline.Timeline
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.testtags.TestTags
@@ -104,6 +105,8 @@ fun TimelineView(
     onMoreReactionsClick: (TimelineItem.Event) -> Unit,
     onReadReceiptClick: (TimelineItem.Event) -> Unit,
     onJoinCallClick: (isAudioCall: Boolean) -> Unit,
+    onMemberClick: (UserId) -> Unit = {},
+    onRoomStateClick: () -> Unit = {},
     modifier: Modifier = Modifier,
     lazyListState: LazyListState = rememberLazyListState(),
     forceJumpToBottomVisibility: Boolean = false,
@@ -188,6 +191,8 @@ fun TimelineView(
                         onReadReceiptClick = onReadReceiptClick,
                         onSwipeToReply = onSwipeToReply,
                         onJoinCallClick = onJoinCallClick,
+                        onMemberClick = onMemberClick,
+                        onRoomStateClick = onRoomStateClick,
                         eventSink = state.eventSink,
                     )
                 }
@@ -432,6 +437,8 @@ internal fun TimelineViewPreview(
             onMoreReactionsClick = {},
             onReadReceiptClick = {},
             onJoinCallClick = {},
+            onMemberClick = {},
+            onRoomStateClick = {},
             forceJumpToBottomVisibility = true,
         )
     }

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

@@ -32,6 +32,7 @@ import io.element.android.features.messages.impl.timeline.protection.aTimelinePr
 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.timeline.Timeline
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.ui.utils.time.isTalkbackActive
@@ -57,6 +58,8 @@ fun TimelineItemGroupedEventsRow(
     onReactionLongClick: (key: String, TimelineItem.Event) -> Unit,
     onMoreReactionsClick: (TimelineItem.Event) -> Unit,
     onReadReceiptClick: (TimelineItem.Event) -> Unit,
+    onMemberClick: (UserId) -> Unit,
+    onRoomStateClick: () -> Unit,
     eventSink: (TimelineEvent.TimelineItemEvent) -> Unit,
     modifier: Modifier = Modifier,
     eventContentView: @Composable (TimelineItem.Event, Modifier, (ContentAvoidingLayoutData) -> Unit) -> Unit =
@@ -102,6 +105,8 @@ fun TimelineItemGroupedEventsRow(
         onReactionLongClick = onReactionLongClick,
         onMoreReactionsClick = onMoreReactionsClick,
         onReadReceiptClick = onReadReceiptClick,
+        onMemberClick = onMemberClick,
+        onRoomStateClick = onRoomStateClick,
         eventSink = eventSink,
         modifier = modifier,
         eventContentView = eventContentView,
@@ -130,6 +135,8 @@ private fun TimelineItemGroupedEventsRowContent(
     onReactionLongClick: (key: String, TimelineItem.Event) -> Unit,
     onMoreReactionsClick: (TimelineItem.Event) -> Unit,
     onReadReceiptClick: (TimelineItem.Event) -> Unit,
+    onMemberClick: (UserId) -> Unit,
+    onRoomStateClick: () -> Unit,
     eventSink: (TimelineEvent.TimelineItemEvent) -> Unit,
     modifier: Modifier = Modifier,
     eventContentView: @Composable (TimelineItem.Event, Modifier, (ContentAvoidingLayoutData) -> Unit) -> Unit =
@@ -189,6 +196,8 @@ private fun TimelineItemGroupedEventsRowContent(
                         onReadReceiptClick = onReadReceiptClick,
                         onSwipeToReply = {},
                         onJoinCallClick = {},
+                        onMemberClick = onMemberClick,
+                        onRoomStateClick = onRoomStateClick,
                         eventSink = eventSink,
                         eventContentView = eventContentView,
                     )
@@ -233,6 +242,8 @@ internal fun TimelineItemGroupedEventsRowContentExpandedPreview() = ElementPrevi
         onReactionLongClick = { _, _ -> },
         onMoreReactionsClick = {},
         onReadReceiptClick = {},
+        onMemberClick = {},
+        onRoomStateClick = {},
         eventSink = {},
     )
 }
@@ -261,6 +272,8 @@ internal fun TimelineItemGroupedEventsRowContentCollapsePreview() = ElementPrevi
         onReactionLongClick = { _, _ -> },
         onMoreReactionsClick = {},
         onReadReceiptClick = {},
+        onMemberClick = {},
+        onRoomStateClick = {},
         eventSink = {},
     )
 }

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

@@ -33,6 +33,8 @@ import io.element.android.features.messages.impl.timeline.components.layout.Cont
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLegacyCallInviteContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemPollContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemProfileChangeContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRoomMembershipContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRtcNotificationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStateContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVoiceContent
@@ -44,6 +46,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.toPx
 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.timeline.Timeline
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -73,6 +76,8 @@ internal fun TimelineItemRow(
     onReadReceiptClick: (TimelineItem.Event) -> Unit,
     onSwipeToReply: (TimelineItem.Event) -> Unit,
     onJoinCallClick: (isAudioCall: Boolean) -> Unit,
+    onMemberClick: (UserId) -> Unit = {},
+    onRoomStateClick: () -> Unit = {},
     eventSink: (TimelineEvent.TimelineItemEvent) -> Unit,
     modifier: Modifier = Modifier,
     eventContentView: @Composable (TimelineItem.Event, Modifier, (ContentAvoidingLayoutData) -> Unit) -> Unit =
@@ -111,13 +116,29 @@ internal fun TimelineItemRow(
                 )
             }
             is TimelineItem.Event -> {
+                val onStateEventClick: () -> Unit = when {
+                    timelineItem.content is TimelineItemRoomMembershipContent -> {
+                        val targetUserId = timelineItem.content.targetUserId
+                        { onMemberClick(targetUserId ?: timelineItem.senderId) }
+                    }
+                    timelineItem.content is TimelineItemProfileChangeContent -> {
+                        { onMemberClick(timelineItem.senderId) }
+                    }
+                    timelineItem.content is TimelineItemStateContent ||
+                    timelineItem.content is TimelineItemLegacyCallInviteContent -> {
+                        { onRoomStateClick() }
+                    }
+                    else -> {
+                        { onContentClick(timelineItem) }
+                    }
+                }
                 when (timelineItem.content) {
                     is TimelineItemStateContent, is TimelineItemLegacyCallInviteContent -> {
                         TimelineItemStateEventRow(
                             event = timelineItem,
                             renderReadReceipts = renderReadReceipts,
                             isLastOutgoingMessage = isLastOutgoingMessage,
-                            onClick = { onContentClick(timelineItem) },
+                            onClick = onStateEventClick,
                             onReadReceiptsClick = onReadReceiptClick,
                             onLongClick = { onLongClick(timelineItem) },
                             eventSink = eventSink,
@@ -209,6 +230,8 @@ internal fun TimelineItemRow(
                     onReactionLongClick = onReactionLongClick,
                     onMoreReactionsClick = onMoreReactionsClick,
                     onReadReceiptClick = onReadReceiptClick,
+                    onMemberClick = onMemberClick,
+                    onRoomStateClick = onRoomStateClick,
                     eventSink = eventSink,
                 )
             }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentRoomMembershipFactory.kt

@@ -14,14 +14,17 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.libraries.core.extensions.orEmpty
 import io.element.android.libraries.eventformatter.api.TimelineEventFormatter
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
+import io.element.android.libraries.matrix.api.timeline.item.event.RoomMembershipContent
 
 @Inject
 class TimelineItemContentRoomMembershipFactory(
     private val timelineEventFormatter: TimelineEventFormatter,
 ) {
-    fun create(eventContent: EventContent, isOutgoing: Boolean, sender: UserId, senderDisambiguatedDisplayName: String): TimelineItemEventContent {
+    fun create(eventContent: RoomMembershipContent, isOutgoing: Boolean, sender: UserId, senderDisambiguatedDisplayName: String): TimelineItemEventContent {
         val text = timelineEventFormatter.format(eventContent, isOutgoing, sender, senderDisambiguatedDisplayName)
-        return TimelineItemRoomMembershipContent(text.orEmpty().toString())
+        return TimelineItemRoomMembershipContent(
+            body = text.orEmpty().toString(),
+            targetUserId = eventContent.userId,
+        )
     }
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRoomMembershipContent.kt

@@ -8,8 +8,11 @@
 
 package io.element.android.features.messages.impl.timeline.model.event
 
+import io.element.android.libraries.matrix.api.core.UserId
+
 data class TimelineItemRoomMembershipContent(
     override val body: String,
+    val targetUserId: UserId? = null,
 ) : TimelineItemStateContent {
     override val type: String = "TimelineItemRoomMembershipContent"
 }