Merge pull request #219 from ouchadam/bug/dendrite-sync-error

Allow SyncResponse state events to be optional
ouchadam · Oct 22, 2022 · 3517cf4 · 3517cf4
2 parents f7f4c89 + 1f3c62e
commit 3517cf4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...services/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/request/ApiSyncResponse.kt b/...services/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/request/ApiSyncResponse.kt
@@ -53,7 +53,7 @@ internal data class ApiInviteEvents(
 @Serializable
 internal data class ApiSyncRoom(
     @SerialName("timeline") val timeline: ApiSyncRoomTimeline,
-    @SerialName("state") val state: ApiSyncRoomState,
+    @SerialName("state") val state: ApiSyncRoomState? = null,
     @SerialName("account_data") val accountData: ApiAccountData? = null,
     @SerialName("ephemeral") val ephemeral: ApiEphemeral? = null,
     @SerialName("summary") val summary: ApiRoomSummary? = 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
@@ -13,7 +13,7 @@ internal class RoomOverviewProcessor(
 ) {
 
     suspend fun process(roomToProcess: RoomToProcess, previousState: RoomOverview?, lastMessage: LastMessage?): RoomOverview? {
-        val combinedEvents = roomToProcess.apiSyncRoom.state.stateEvents + roomToProcess.apiSyncRoom.timeline.apiTimelineEvents
+        val combinedEvents = (roomToProcess.apiSyncRoom.state?.stateEvents.orEmpty()) + roomToProcess.apiSyncRoom.timeline.apiTimelineEvents
         val isEncrypted = combinedEvents.any { it is ApiTimelineEvent.Encryption }
         val readMarker = roomToProcess.apiSyncRoom.accountData?.events?.filterIsInstance<ApiAccountEvent.FullyRead>()?.firstOrNull()?.content?.eventId
         return when (previousState) {

diff --git a/matrix/services/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/sync/RoomProcessor.kt b/matrix/services/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/sync/RoomProcessor.kt
@@ -50,7 +50,7 @@ internal class RoomProcessor(
 }
 
 private fun ApiSyncRoom.collectMembers(userCredentials: UserCredentials): List<RoomMember> {
-    return (this.state.stateEvents + this.timeline.apiTimelineEvents)
+    return (this.state?.stateEvents.orEmpty() + this.timeline.apiTimelineEvents)
         .filterIsInstance<ApiTimelineEvent.RoomMember>()
         .mapNotNull {
             when {

diff --git a/matrix/services/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/sync/SyncReducer.kt b/matrix/services/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/sync/SyncReducer.kt
@@ -70,7 +70,7 @@ internal class SyncReducer(
     }
 
     private fun findRoomsLeft(response: ApiSyncResponse, userCredentials: UserCredentials) = response.rooms?.leave?.filter {
-        it.value.state.stateEvents.filterIsInstance<ApiTimelineEvent.RoomMember>().any {
+        it.value.state?.stateEvents.orEmpty().filterIsInstance<ApiTimelineEvent.RoomMember>().any {
             it.content.membership.isLeave() && it.senderId == userCredentials.userId
         }
     }?.map { it.key } ?: emptyList()
@@ -91,7 +91,7 @@ internal class SyncReducer(
 }
 
 private fun Map<RoomId, ApiSyncRoom>.keepRoomsWithChanges() = this.filter {
-    it.value.state.stateEvents.isNotEmpty() ||
+    it.value.state?.stateEvents.orEmpty().isNotEmpty() ||
             it.value.timeline.apiTimelineEvents.isNotEmpty() ||
             it.value.accountData?.events?.isNotEmpty() == true ||
             it.value.ephemeral?.events?.isNotEmpty() == true