Ignore/Unignore: makes more sense to be at the client level than room

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

@@ -35,6 +35,8 @@ interface MatrixClient : Closeable {
     val invitesDataSource: RoomSummaryDataSource
     fun getRoom(roomId: RoomId): MatrixRoom?
     fun findDM(userId: UserId): MatrixRoom?
+    suspend fun ignoreUser(userId: UserId): Result<Unit>
+    suspend fun unignoreUser(userId: UserId): Result<Unit>
     suspend fun createRoom(createRoomParams: CreateRoomParameters): Result<RoomId>
     suspend fun createDM(userId: UserId): Result<RoomId>
     fun startSync()

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

@@ -68,10 +68,6 @@ interface MatrixRoom : Closeable {
 
     suspend fun redactEvent(eventId: EventId, reason: String? = null): Result<Unit>
 
-    suspend fun ignoreUser(userId: UserId): Result<Unit>
-
-    suspend fun unignoreUser(userId: UserId): Result<Unit>
-
     suspend fun leave(): Result<Unit>
 
     suspend fun acceptInvitation(): Result<Unit>

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt

@@ -212,6 +212,18 @@ class RustMatrixClient constructor(
         return roomId?.let { getRoom(it) }
     }
 
+    override suspend fun ignoreUser(userId: UserId): Result<Unit> = withContext(dispatchers.io) {
+        runCatching {
+            client.ignoreUser(userId.value)
+        }
+    }
+
+    override suspend fun unignoreUser(userId: UserId): Result<Unit> = withContext(dispatchers.io) {
+        runCatching {
+            client.unignoreUser(userId.value)
+        }
+    }
+
     override suspend fun createRoom(createRoomParams: CreateRoomParameters): Result<RoomId> = withContext(dispatchers.io) {
         runCatching {
             val rustParams = RustCreateRoomParameters(

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt

@@ -38,6 +38,7 @@ import org.matrix.rustcomponents.sdk.SlidingSyncRoom
 import org.matrix.rustcomponents.sdk.UpdateSummary
 import org.matrix.rustcomponents.sdk.genTransactionId
 import org.matrix.rustcomponents.sdk.messageEventContentFromMarkdown
+import org.matrix.rustcomponents.sdk.use
 import org.matrix.rustcomponents.sdk.RoomMember as RustRoomMember
 
 class RustMatrixRoom(
@@ -200,19 +201,10 @@ class RustMatrixRoom(
         }
     }
 
-    override suspend fun ignoreUser(userId: UserId): Result<Unit> {
-        return runCatching {
-            getRustMember(userId)?.ignore() ?: error("No member with userId $userId exists in room $roomId")
-        }
-    }
-
-    override suspend fun unignoreUser(userId: UserId): Result<Unit> {
-        return runCatching {
-            getRustMember(userId)?.unignore() ?: error("No member with userId $userId exists in room $roomId")
-        }
-    }
-
-    private fun getRustMember(userId: UserId): RustRoomMember? {
-        return innerRoom.members().find { it.userId() == userId.value }
+    private fun findRoomMember(userId: UserId, action: (RustRoomMember).() -> Unit) {
+        return innerRoom.members()
+            .find { it.userId() == userId.value }
+            ?.use(action)
+            ?: error("No member with userId $userId exists in room $roomId")
     }
 }

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt

@@ -47,6 +47,8 @@ class FakeMatrixClient(
     private val notificationService: FakeNotificationService = FakeNotificationService(),
 ) : MatrixClient {
 
+    private var ignoreUserResult: Result<Unit> = Result.success(Unit)
+    private var unignoreUserResult: Result<Unit> = Result.success(Unit)
     private var createRoomResult: Result<RoomId> = Result.success(A_ROOM_ID)
     private var createDmResult: Result<RoomId> = Result.success(A_ROOM_ID)
     private var createDmFailure: Throwable? = null
@@ -62,6 +64,14 @@ class FakeMatrixClient(
         return findDmResult
     }
 
+    override suspend fun ignoreUser(userId: UserId): Result<Unit> {
+        return ignoreUserResult
+    }
+
+    override suspend fun unignoreUser(userId: UserId): Result<Unit> {
+        return unignoreUserResult
+    }
+
     override suspend fun createRoom(createRoomParams: CreateRoomParameters): Result<RoomId> {
         delay(100)
         return createRoomResult
@@ -130,6 +140,14 @@ class FakeMatrixClient(
         createDmResult = result
     }
 
+    fun givenIgnoreUserResult(result: Result<Unit>) {
+        ignoreUserResult = result
+    }
+
+    fun givenUnignoreUserResult(result: Result<Unit>) {
+        unignoreUserResult = result
+    }
+
     fun givenCreateDmError(failure: Throwable?) {
         createDmFailure = failure
     }

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt

@@ -117,10 +117,6 @@ class FakeMatrixRoom(
         return Result.success(Unit)
     }
 
-    override suspend fun ignoreUser(userId: UserId): Result<Unit> = ignoreResult
-
-    override suspend fun unignoreUser(userId: UserId): Result<Unit> = unignoreResult
-
     override suspend fun leave(): Result<Unit> = leaveRoomError?.let { Result.failure(it) } ?: Result.success(Unit)
     override suspend fun acceptInvitation(): Result<Unit> {
         isInviteAccepted = true