Merge pull request #180 from ouchadam/feature/allowing-canonical-alia…

…s-to-be-null Allowing canonical alias's to be null
ouchadam · Oct 2, 2022 · 9cb8b18 · 9cb8b18
2 parents 87fcf09 + 8f454e6
commit 9cb8b18
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ervices/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/request/ApiTimelineEvent.kt b/...ervices/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/request/ApiTimelineEvent.kt
@@ -65,7 +65,7 @@ internal sealed class ApiTimelineEvent {
 
         @Serializable
         internal data class Content(
-            @SerialName("alias") val alias: String
+            @SerialName("alias") val alias: String? = null
         )
     }
 

diff --git a/...vices/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/sync/RoomOverviewProcessor.kt b/...vices/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/sync/RoomOverviewProcessor.kt
@@ -66,7 +66,7 @@ internal class RoomOverviewProcessor(
 
     private suspend fun roomDisplayName(roomToProcess: RoomToProcess, combinedEvents: List<ApiTimelineEvent>): String? {
         val roomName = combinedEvents.filterIsInstance<ApiTimelineEvent.RoomName>().lastOrNull()?.content?.name
-            ?: combinedEvents.filterIsInstance<ApiTimelineEvent.CanonicalAlias>().lastOrNull()?.content?.alias
+            ?: combinedEvents.filterIsInstance<ApiTimelineEvent.CanonicalAlias>().lastOrNull()?.content?.alias?.takeIf { it.isNotEmpty() }
             ?: roomToProcess.heroes?.let {
                 roomMembersService.find(roomToProcess.roomId, it).joinToString { it.displayName ?: it.id.value }
             }