devol/smalltalk-matrix
1
0
Fork 0
mirror of https://github.com/ouchadam/small-talk.git synced 2025-02-10 17:10:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

allowing the canonical alias to be null when parsing the sync response

Browse Source
This commit is contained in:
Adam Brown 2022-10-02 14:14:22 +01:00
parent ae693f7ee8
commit 2f9bcb8ccf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix/services/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/request/ApiTimelineEvent.kt
View File

@ -65,7 +65,7 @@ internal sealed class ApiTimelineEvent {
@Serializable @Serializable
internal data class Content( internal data class Content(
@SerialName("alias") val alias: String @SerialName("alias") val alias: String? = null
) )
} }

2
matrix/services/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/sync/RoomOverviewProcessor.kt
View File

@ -66,7 +66,7 @@ internal class RoomOverviewProcessor(
private suspend fun roomDisplayName(roomToProcess: RoomToProcess, combinedEvents: List<ApiTimelineEvent>): String? { private suspend fun roomDisplayName(roomToProcess: RoomToProcess, combinedEvents: List<ApiTimelineEvent>): String? {
val roomName = combinedEvents.filterIsInstance<ApiTimelineEvent.RoomName>().lastOrNull()?.content?.name 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 { ?: roomToProcess.heroes?.let {
roomMembersService.find(roomToProcess.roomId, it).joinToString { it.displayName ?: it.id.value } roomMembersService.find(roomToProcess.roomId, it).joinToString { it.displayName ?: it.id.value }
} }