From 735338135654f15e8c5727aefe655d6ea8ca7be8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 15 May 2024 10:06:54 +0200
Subject: [PATCH] Add `MatrixRoomInfo.rawName`.

---
 .../android/libraries/matrix/api/room/MatrixRoomInfo.kt        | 3 +++
 .../android/libraries/matrix/impl/room/MatrixRoomInfoMapper.kt | 1 +
 .../android/libraries/matrix/test/room/FakeMatrixRoom.kt       | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomInfo.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomInfo.kt
index eea1cc9c1b..8379d30781 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomInfo.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomInfo.kt
@@ -27,7 +27,10 @@ import kotlinx.collections.immutable.ImmutableMap
 @Immutable
 data class MatrixRoomInfo(
     val id: RoomId,
+    /** The room's name from the room state event if received from sync, or one that's been computed otherwise. */
     val name: String?,
+    /** Room name as defined by the room state event only. */
+    val rawName: String?,
     val topic: String?,
     val avatarUrl: String?,
     val isDirect: Boolean,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapper.kt
index 3fe4dcf1b7..8063c67069 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapper.kt
@@ -39,6 +39,7 @@ class MatrixRoomInfoMapper(
         return MatrixRoomInfo(
             id = RoomId(it.id),
             name = it.displayName,
+            rawName = it.rawName,
             topic = it.topic,
             avatarUrl = it.avatarUrl,
             isDirect = it.isDirect,
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
index fff0ce8247..a780d33ecd 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
@@ -735,6 +735,7 @@ data class EndPollInvocation(
 fun aRoomInfo(
     id: RoomId = A_ROOM_ID,
     name: String? = A_ROOM_NAME,
+    rawName: String? = name,
     topic: String? = "A topic",
     avatarUrl: String? = AN_AVATAR_URL,
     isDirect: Boolean = false,
@@ -759,6 +760,7 @@ fun aRoomInfo(
 ) = MatrixRoomInfo(
     id = id,
     name = name,
+    rawName = rawName,
     topic = topic,
     avatarUrl = avatarUrl,
     isDirect = isDirect,