Merge branch 'develop' into feature/fga/draft_support

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomInfo.kt

@@ -20,6 +20,7 @@ import androidx.compose.runtime.Immutable
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap
 
@@ -49,5 +50,6 @@ data class MatrixRoomInfo(
     val notificationCount: Long,
     val userDefinedNotificationMode: RoomNotificationMode?,
     val hasRoomCall: Boolean,
-    val activeRoomCallParticipants: ImmutableList<String>
+    val activeRoomCallParticipants: ImmutableList<String>,
+    val heroes: ImmutableList<MatrixUser>,
 )

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomMembersState.kt

@@ -39,3 +39,7 @@ fun MatrixRoomMembersState.roomMembers(): List<RoomMember>? {
 fun MatrixRoomMembersState.joinedRoomMembers(): List<RoomMember> {
     return roomMembers().orEmpty().filter { it.membership == RoomMembershipState.JOIN }
 }
+
+fun MatrixRoomMembersState.activeRoomMembers(): List<RoomMember> {
+    return roomMembers().orEmpty().filter { it.membership.isActive() }
+}

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/MatrixRoomMembersWithRole.kt

@@ -18,7 +18,7 @@ package io.element.android.libraries.matrix.api.room.powerlevels
 
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.joinedRoomMembers
+import io.element.android.libraries.matrix.api.room.activeRoomMembers
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toPersistentList
 import kotlinx.coroutines.flow.Flow
@@ -27,14 +27,13 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 
 /**
- * Return a flow of the list of room members who are still in the room (with membership == RoomMembershipState.JOIN)
- * and who have the given role.
+ * Return a flow of the list of active room members who have the given role.
  */
 fun MatrixRoom.usersWithRole(role: RoomMember.Role): Flow<ImmutableList<RoomMember>> {
     return roomInfoFlow
         .map { it.userPowerLevels.filter { (_, powerLevel) -> RoomMember.Role.forPowerLevel(powerLevel) == role } }
         .combine(membersStateFlow) { powerLevels, membersState ->
-            membersState.joinedRoomMembers()
+            membersState.activeRoomMembers()
                 .filter { powerLevels.containsKey(it.userId) }
                 .toPersistentList()
         }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt

@@ -22,6 +22,7 @@ import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.message.RoomMessage
+import io.element.android.libraries.matrix.api.user.MatrixUser
 
 sealed interface RoomSummary {
     data class Empty(val identifier: String) : RoomSummary
@@ -52,6 +53,7 @@ data class RoomSummaryDetails(
     val isDm: Boolean,
     val isFavorite: Boolean,
     val currentUserMembership: CurrentUserMembership,
+    val heroes: List<MatrixUser>,
 ) {
     val lastMessageTimestamp = lastMessage?.originServerTs
 }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/LocalEventSendState.kt

@@ -22,11 +22,10 @@ import io.element.android.libraries.matrix.api.core.EventId
 @Immutable
 sealed interface LocalEventSendState {
     data object NotSentYet : LocalEventSendState
-
-    data class SendingFailed(
-        val error: String
-    ) : LocalEventSendState
-
+    sealed class SendingFailed(open val error: String) : LocalEventSendState {
+        data class Recoverable(override val error: String) : SendingFailed(error)
+        data class Unrecoverable(override val error: String) : SendingFailed(error)
+    }
     data class Sent(
         val eventId: EventId
     ) : LocalEventSendState